Merge branch '10.5'

sebastianbergmann · Nov 30, 2023 · 856c54b · 856c54b
2 parents 86ebc8e + ac6421c
commit 856c54b
Show file tree

Hide file tree

Showing 103 changed files with 24 additions and 532 deletions.
diff --git a/tests/end-to-end/cli/fail-on/fail-on-deprecation.phpt b/tests/end-to-end/cli/fail-on/fail-on-deprecation.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test triggered a deprecation
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/fail-on/fail-on-incomplete.phpt b/tests/end-to-end/cli/fail-on/fail-on-incomplete.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test was marked incomplete
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/fail-on/fail-on-notice.phpt b/tests/end-to-end/cli/fail-on/fail-on-notice.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test triggered a notice
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/fail-on/fail-on-risky.phpt b/tests/end-to-end/cli/fail-on/fail-on-risky.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test was considered risky
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/fail-on/fail-on-skipped.phpt b/tests/end-to-end/cli/fail-on/fail-on-skipped.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test was skipped
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/fail-on/fail-on-warning.phpt b/tests/end-to-end/cli/fail-on/fail-on-warning.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Test Runner exits with shell exit code indicating failure when all tests are successful but at least one warning was triggered
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/filter/filter-class-match-argument.phpt b/tests/end-to-end/cli/filter/filter-class-match-argument.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter FooTest tests/FooTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/filter/filter-class-match-configuration.phpt b/tests/end-to-end/cli/filter/filter-class-match-configuration.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter FooTest
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
@@ -34,7 +29,7 @@ Test Runner Started
 Test Suite Sorted
 Test Suite Filtered (3 tests)
 Test Runner Execution Started (3 tests)
-Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 3 tests)
+Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 3 tests)
 Test Suite Started (default, 3 tests)
 Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 3 tests)
 Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
@@ -54,7 +49,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testThree)
 Test Finished (PHPUnit\TestFixture\Groups\FooTest::testThree)
 Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 3 tests)
 Test Suite Finished (default, 3 tests)
-Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 3 tests)
+Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 3 tests)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)
diff --git a/tests/end-to-end/cli/filter/filter-class-nomatch-argument.phpt b/tests/end-to-end/cli/filter/filter-class-nomatch-argument.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter BarTest tests/FooTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/filter/filter-class-nomatch-configuration.phpt b/tests/end-to-end/cli/filter/filter-class-nomatch-configuration.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter BarTest
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/filter/filter-method-match-argument.phpt b/tests/end-to-end/cli/filter/filter-method-match-argument.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter testOne tests/FooTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/filter/filter-method-match-configuration.phpt b/tests/end-to-end/cli/filter/filter-method-match-configuration.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter testOne
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
@@ -34,7 +29,7 @@ Test Runner Started
 Test Suite Sorted
 Test Suite Filtered (1 test)
 Test Runner Execution Started (1 test)
-Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
+Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
 Test Suite Started (default, 1 test)
 Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
 Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
@@ -44,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testOne)
 Test Finished (PHPUnit\TestFixture\Groups\FooTest::testOne)
 Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
 Test Suite Finished (default, 1 test)
-Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
+Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)
diff --git a/tests/end-to-end/cli/filter/filter-method-nomatch-argument.phpt b/tests/end-to-end/cli/filter/filter-method-nomatch-argument.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter testFoo tests/FooTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/filter/filter-method-nomatch-configuration.phpt b/tests/end-to-end/cli/filter/filter-method-nomatch-configuration.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --filter testFoo
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/group/exclude-group-argument.phpt b/tests/end-to-end/cli/group/exclude-group-argument.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --exclude-group one,two tests/FooTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/group/exclude-group-configuration.phpt b/tests/end-to-end/cli/group/exclude-group-configuration.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --exclude-group one,two
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
@@ -34,7 +29,7 @@ Test Runner Started
 Test Suite Sorted
 Test Suite Filtered (1 test)
 Test Runner Execution Started (1 test)
-Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
+Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
 Test Suite Started (default, 1 test)
 Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
 Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testThree)
@@ -44,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testThree)
 Test Finished (PHPUnit\TestFixture\Groups\FooTest::testThree)
 Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
 Test Suite Finished (default, 1 test)
-Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
+Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)
diff --git a/tests/end-to-end/cli/group/group-argument.phpt b/tests/end-to-end/cli/group/group-argument.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --group one tests/FooTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/group/group-configuration.phpt b/tests/end-to-end/cli/group/group-configuration.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --group one
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
@@ -34,7 +29,7 @@ Test Runner Started
 Test Suite Sorted
 Test Suite Filtered (1 test)
 Test Runner Execution Started (1 test)
-Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
+Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
 Test Suite Started (default, 1 test)
 Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
 Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
@@ -44,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testOne)
 Test Finished (PHPUnit\TestFixture\Groups\FooTest::testOne)
 Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
 Test Suite Finished (default, 1 test)
-Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
+Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)
diff --git a/tests/end-to-end/cli/log-events-text.phpt b/tests/end-to-end/cli/log-events-text.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --no-output --log-events-text logfile.txt
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/log-events-verbose-text.phpt b/tests/end-to-end/cli/log-events-verbose-text.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit --no-output --log-events-verbose-text logfile.txt
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/no-log-no-cc.phpt b/tests/end-to-end/cli/no-log-no-cc.phpt
@@ -1,10 +1,5 @@
 --TEST--
 phpunit -c _files/phpunit.xml --no-logging --log-junit php://stdout _files/NoLogNoCcTest.php
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $logfile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-defect-for-error.phpt b/tests/end-to-end/cli/stop-on/stop-on-defect-for-error.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first error works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-defect-for-failure.phpt b/tests/end-to-end/cli/stop-on/stop-on-defect-for-failure.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first failure works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-defect-for-risky.phpt b/tests/end-to-end/cli/stop-on/stop-on-defect-for-risky.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first risky test works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-defect-for-warning.phpt b/tests/end-to-end/cli/stop-on/stop-on-defect-for-warning.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first warning works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-deprecation.phpt b/tests/end-to-end/cli/stop-on/stop-on-deprecation.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first deprecation works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-error.phpt b/tests/end-to-end/cli/stop-on/stop-on-error.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first error works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-failure.phpt b/tests/end-to-end/cli/stop-on/stop-on-failure.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first failure works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);

diff --git a/tests/end-to-end/cli/stop-on/stop-on-incomplete.phpt b/tests/end-to-end/cli/stop-on/stop-on-incomplete.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Stopping test execution after first incomplete test works
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
 --FILE--
 <?php declare(strict_types=1);
 $traceFile = tempnam(sys_get_temp_dir(), __FILE__);