diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e5172c8d7e1..bf1db6629c9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -203,7 +203,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 coverage: xdebug extensions: none, ctype, curl, dom, json, libxml, mbstring, pdo, phar, soap, tokenizer, xml, xmlwriter ini-values: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On diff --git a/.phive/phars.xml b/.phive/phars.xml index e4f96812c31..4d492874283 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 45d44c93658..b3ab8225e9c 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -16,6 +16,8 @@ ->in(__DIR__ . '/tests/unit') // DeprecatedPhpFeatureTest.php must not use declare(strict_types=1); ->notName('DeprecatedPhpFeatureTest.php') + // UseBaselineTest.php must not use declare(strict_types=1); + ->notName('UseBaselineTest.php') // Issue5795Test.php contains required whitespace that would be cleaned up ->notName('Issue5795Test.php') ->notName('*.phpt'); diff --git a/ChangeLog-11.4.md b/ChangeLog-11.4.md index ad7cd3946f7..a41c3275eae 100644 --- a/ChangeLog-11.4.md +++ b/ChangeLog-11.4.md @@ -2,6 +2,16 @@ All notable changes of the PHPUnit 11.4 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [11.4.1] - 2024-10-08 + +### Changed + +* Updated regular expressions used by `StringMatchesFormatDescription` constraint to be consistent with PHP's `run-tests.php` + +### Fixed + +* [#5977](https://github.com/sebastianbergmann/phpunit/pull/5977): TestDox result collector does not correctly handle baseline-ignored `E_DEPRECATED` issues + ## [11.4.0] - 2024-10-05 ### Changed @@ -23,4 +33,5 @@ All notable changes of the PHPUnit 11.4 release series are documented in this fi * [#5958](https://github.com/sebastianbergmann/phpunit/issues/5958): Support for `#[CoversTrait]` and `#[UsesTrait]` attributes * [#5960](https://github.com/sebastianbergmann/phpunit/issues/5960): Support for targeting trait methods with the `#[CoversMethod]` and `#[UsesMethod]` attributes (and respective annotations) +[11.4.1]: https://github.com/sebastianbergmann/phpunit/compare/11.4.0...11.4.1 [11.4.0]: https://github.com/sebastianbergmann/phpunit/compare/11.3.6...11.4.0 diff --git a/composer.json b/composer.json index e38ef9968fc..0483ee8ad28 100644 --- a/composer.json +++ b/composer.json @@ -71,10 +71,27 @@ }, "autoload-dev": { "classmap": [ - "tests/" + "tests/_files" ], "files": [ "tests/_files/deprecation-trigger/trigger_deprecation.php", + "tests/unit/Event/AbstractEventTestCase.php", + "tests/unit/Framework/MockObject/TestDoubleTestCase.php", + "tests/unit/Metadata/Parser/AnnotationParserTestCase.php", + "tests/unit/Metadata/Parser/AttributeParserTestCase.php", + "tests/unit/Framework/Assert/assertDirectoryExistsTest.php", + "tests/unit/Framework/Assert/assertFileExistsTest.php", + "tests/unit/Framework/Assert/assertIsNumericTest.php", + "tests/unit/Framework/Assert/assertIsObjectTest.php", + "tests/unit/Framework/Assert/assertIsReadableTest.php", + "tests/unit/Framework/Assert/assertIsResourceTest.php", + "tests/unit/Framework/Assert/assertIsScalarTest.php", + "tests/unit/Framework/Assert/assertIsStringTest.php", + "tests/unit/Framework/Assert/assertIsWritableTest.php", + "tests/unit/Framework/Assert/assertMatchesRegularExpressionTest.php", + "tests/unit/Framework/Assert/assertNullTest.php", + "tests/unit/Framework/Assert/assertSameSizeTest.php", + "tests/unit/Framework/Assert/assertSameTest.php", "tests/_files/CoverageNamespacedFunctionTest.php", "tests/_files/CoveredFunction.php", "tests/_files/Generator.php", diff --git a/src/Framework/Constraint/String/StringMatchesFormatDescription.php b/src/Framework/Constraint/String/StringMatchesFormatDescription.php index e2ba9ff2253..f9659e2e8f9 100644 --- a/src/Framework/Constraint/String/StringMatchesFormatDescription.php +++ b/src/Framework/Constraint/String/StringMatchesFormatDescription.php @@ -87,17 +87,18 @@ private function regularExpressionForFormatDescription(string $string): string preg_quote($string, '/'), [ '%%' => '%', - '%e' => '\\' . DIRECTORY_SEPARATOR, + '%e' => preg_quote(DIRECTORY_SEPARATOR, '/'), '%s' => '[^\r\n]+', '%S' => '[^\r\n]*', - '%a' => '.+', - '%A' => '.*', + '%a' => '.+?', + '%A' => '.*?', '%w' => '\s*', '%i' => '[+-]?\d+', '%d' => '\d+', '%x' => '[0-9a-fA-F]+', - '%f' => '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', + '%f' => '[+-]?(?:\d+|(?=\.\d))(?:\.\d+)?(?:[Ee][+-]?\d+)?', '%c' => '.', + '%0' => '\x00', ], ); diff --git a/src/Logging/TestDox/TestResult/TestResultCollector.php b/src/Logging/TestDox/TestResult/TestResultCollector.php index 46a301b6480..629a816e72c 100644 --- a/src/Logging/TestDox/TestResult/TestResultCollector.php +++ b/src/Logging/TestDox/TestResult/TestResultCollector.php @@ -258,7 +258,7 @@ public function testTriggeredPhpDeprecation(PhpDeprecationTriggered $event): voi return; } - if ($event->ignoredByTest()) { + if ($event->ignoredByBaseline()) { return; } diff --git a/src/Runner/CodeCoverage.php b/src/Runner/CodeCoverage.php index 46a91a0e955..280a9650364 100644 --- a/src/Runner/CodeCoverage.php +++ b/src/Runner/CodeCoverage.php @@ -316,7 +316,9 @@ public function generateReports(Printer $printer, Configuration $configuration): $textReport = $processor->process($this->codeCoverage(), $configuration->colors()); if ($configuration->coverageText() === 'php://stdout') { - $printer->print($textReport); + if (!$configuration->noOutput() && !$configuration->debug()) { + $printer->print($textReport); + } } else { file_put_contents($configuration->coverageText(), $textReport); } diff --git a/src/Runner/Version.php b/src/Runner/Version.php index c7c57cb99d3..3c4a350b268 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -34,7 +34,7 @@ public static function id(): string } if (self::$version === '') { - self::$version = (new VersionId('11.4.0', dirname(__DIR__, 2)))->asString(); + self::$version = (new VersionId('11.4.1', dirname(__DIR__, 2)))->asString(); } return self::$version; diff --git a/tests/README.md b/tests/README.md index db6b9a37dcc..1f2f51c6c78 100644 --- a/tests/README.md +++ b/tests/README.md @@ -7,7 +7,6 @@ This is the top-level directory structure of the `tests` directory: * `tests/unit` holds tests that are "regular" PHPUnit tests (implemented using `PHPUnit\Framework\TestCase`) * `tests/end-to-end` holds tests in the [PHPT](https://qa.php.net/phpt_details.php) format * `tests/end-to-end/phar` holds PHAR-specific tests that are not part of the regular `end-to-end` tests -* `tests/static-analysis` holds test fixture that is used for static analysis of PHPUnit's API using Psalm * `tests/_files` holds test fixture that is used by tests in `tests/unit` and/or `tests/end-to-end` ## Running the Test Suite @@ -16,4 +15,3 @@ This is the top-level directory structure of the `tests` directory: * `./phpunit --testsuite unit` will run all tests from `tests/unit` * `./phpunit --testsuite end-to-end` will run all tests from `tests/end-to-end` (except the PHAR-specific tests) * `ant phar-snapshot run-phar-specific-tests` will build a PHAR and run the PHAR-specific tests -* `./tools/psalm --config=.psalm/static-analysis.xml` will run the static analysis of PHPUnit's API using Psalm diff --git a/tests/_files/CoverageTraitMethodTest.php b/tests/_files/CoverageTraitMethodTest.php deleted file mode 100644 index d6badafea55..00000000000 --- a/tests/_files/CoverageTraitMethodTest.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\TestFixture; - -use PHPUnit\Framework\Attributes\CoversMethod; -use PHPUnit\Framework\Attributes\UsesMethod; -use PHPUnit\Framework\TestCase; - -#[CoversMethod(CoveredTrait::class, 'm')] -#[UsesMethod(CoveredTrait::class, 'm')] -final class CoverageTraitMethodTest extends TestCase -{ - public function testSomething(): void - { - } -} diff --git a/tests/end-to-end/execution-order/_files/MultiDependencyTest.php b/tests/_files/MultiDependencyTest.php similarity index 100% rename from tests/end-to-end/execution-order/_files/MultiDependencyTest.php rename to tests/_files/MultiDependencyTest.php diff --git a/tests/end-to-end/_files/HookMethodsOrderTest.php b/tests/end-to-end/_files/HookMethodsOrderTest.php index 638020ecd9e..882556c0d6c 100644 --- a/tests/end-to-end/_files/HookMethodsOrderTest.php +++ b/tests/end-to-end/_files/HookMethodsOrderTest.php @@ -7,11 +7,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -namespace PHPUnit\DeprecatedAnnotationsTestFixture; +namespace PHPUnit\TestFixture; use PHPUnit\Framework\Attributes\After; use PHPUnit\Framework\Attributes\Before; -use PHPUnit\Framework\TestCase; final class HookMethodsOrderTest extends HookMethodsOrderTestCase { @@ -58,26 +57,3 @@ protected function afterWithPriority(): void { } } - -abstract class HookMethodsOrderTestCase extends TestCase -{ - #[Before] - protected function beforeInParent(): void - { - } - - #[Before(priority: 1)] - protected function beforeWithPriorityInParent(): void - { - } - - #[After] - protected function afterInParent(): void - { - } - - #[After(priority: 1)] - protected function afterWithPriorityInParent(): void - { - } -} diff --git a/tests/end-to-end/_files/HookMethodsOrderTestCase.php b/tests/end-to-end/_files/HookMethodsOrderTestCase.php new file mode 100644 index 00000000000..39f7554c8bd --- /dev/null +++ b/tests/end-to-end/_files/HookMethodsOrderTestCase.php @@ -0,0 +1,37 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +namespace PHPUnit\TestFixture; + +use PHPUnit\Framework\Attributes\After; +use PHPUnit\Framework\Attributes\Before; +use PHPUnit\Framework\TestCase; + +abstract class HookMethodsOrderTestCase extends TestCase +{ + #[Before] + protected function beforeInParent(): void + { + } + + #[Before(priority: 1)] + protected function beforeWithPriorityInParent(): void + { + } + + #[After] + protected function afterInParent(): void + { + } + + #[After(priority: 1)] + protected function afterWithPriorityInParent(): void + { + } +} diff --git a/tests/end-to-end/_files/baseline/use-baseline/baseline.xml b/tests/end-to-end/_files/baseline/use-baseline/baseline.xml index 194ec72508e..3b92752b4c3 100644 --- a/tests/end-to-end/_files/baseline/use-baseline/baseline.xml +++ b/tests/end-to-end/_files/baseline/use-baseline/baseline.xml @@ -1,8 +1,23 @@ - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/tests/end-to-end/_files/baseline/use-baseline/tests/Test.php b/tests/end-to-end/_files/baseline/use-baseline/tests/UseBaselineTest.php similarity index 59% rename from tests/end-to-end/_files/baseline/use-baseline/tests/Test.php rename to tests/end-to-end/_files/baseline/use-baseline/tests/UseBaselineTest.php index 98ba8d9e387..672e7b3b088 100644 --- a/tests/end-to-end/_files/baseline/use-baseline/tests/Test.php +++ b/tests/end-to-end/_files/baseline/use-baseline/tests/UseBaselineTest.php @@ -1,4 +1,4 @@ -assertTrue(true); } diff --git a/tests/end-to-end/baseline/ignore-baseline-testdox.phpt b/tests/end-to-end/baseline/ignore-baseline-testdox.phpt new file mode 100644 index 00000000000..32645ec06ef --- /dev/null +++ b/tests/end-to-end/baseline/ignore-baseline-testdox.phpt @@ -0,0 +1,101 @@ +--TEST-- +phpunit --configuration ../_files/baseline/use-baseline/phpunit.xml --ignore-baseline --tes +--FILE-- +run($_SERVER['argv']); +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann and contributors. + +Runtime: %s +Configuration: %s + +W 1 / 1 (100%) + +Time: %s, Memory: %s + +Use Baseline (PHPUnit\TestFixture\Baseline\UseBaseline) + ⚠ One + +1 test triggered 1 PHP warning: + +1) %sUseBaselineTest.php:31 +Undefined variable $b + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 warning: + +1) %sUseBaselineTest.php:35 +warning + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 PHP notice: + +1) %sUseBaselineTest.php:29 +Only variables should be assigned by reference + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 notice: + +1) %sUseBaselineTest.php:34 +notice + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 PHP deprecation: + +1) %sUseBaselineTest.php:23 +strlen(): Passing null to parameter #1 ($string) of type string is deprecated + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 deprecation: + +1) %sUseBaselineTest.php:33 +deprecation + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +OK, but there were issues! +Tests: 1, Assertions: 1, Warnings: 2, Deprecations: 2, Notices: 2. diff --git a/tests/end-to-end/baseline/ignore-baseline.phpt b/tests/end-to-end/baseline/ignore-baseline.phpt index a56345af0d3..3b9e43dd2a0 100644 --- a/tests/end-to-end/baseline/ignore-baseline.phpt +++ b/tests/end-to-end/baseline/ignore-baseline.phpt @@ -7,6 +7,8 @@ $_SERVER['argv'][] = '--configuration'; $_SERVER['argv'][] = __DIR__ . '/../_files/baseline/use-baseline/phpunit.xml'; $_SERVER['argv'][] = '--ignore-baseline'; $_SERVER['argv'][] = '--display-deprecations'; +$_SERVER['argv'][] = '--display-notices'; +$_SERVER['argv'][] = '--display-warnings'; require_once __DIR__ . '/../../bootstrap.php'; @@ -17,19 +19,79 @@ PHPUnit %s by Sebastian Bergmann and contributors. Runtime: %s Configuration: %s -D 1 / 1 (100%) +W 1 / 1 (100%) Time: %s, Memory: %s +1 test triggered 1 PHP warning: + +1) %sUseBaselineTest.php:31 +Undefined variable $b + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 warning: + +1) %sUseBaselineTest.php:35 +warning + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 PHP notice: + +1) %sUseBaselineTest.php:29 +Only variables should be assigned by reference + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 notice: + +1) %sUseBaselineTest.php:34 +notice + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + +1 test triggered 1 PHP deprecation: + +1) %sUseBaselineTest.php:23 +strlen(): Passing null to parameter #1 ($string) of type string is deprecated + +Triggered by: + +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 + +-- + 1 test triggered 1 deprecation: -1) %sTest.php:%d +1) %sUseBaselineTest.php:33 deprecation Triggered by: -* PHPUnit\TestFixture\Baseline\Test::testOne - %sTest.php:%d +* PHPUnit\TestFixture\Baseline\UseBaselineTest::testOne + %sUseBaselineTest.php:21 OK, but there were issues! -Tests: 1, Assertions: 1, Deprecations: 1. +Tests: 1, Assertions: 1, Warnings: 2, Deprecations: 2, Notices: 2. diff --git a/tests/end-to-end/baseline/use-baseline-testdox.phpt b/tests/end-to-end/baseline/use-baseline-testdox.phpt new file mode 100644 index 00000000000..318a244157a --- /dev/null +++ b/tests/end-to-end/baseline/use-baseline-testdox.phpt @@ -0,0 +1,28 @@ +--TEST-- +phpunit --configuration ../_files/baseline/use-baseline/phpunit.xml --testdox +--FILE-- +run($_SERVER['argv']); +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann and contributors. + +Runtime: %s +Configuration: %s + +. 1 / 1 (100%) + +Time: %s, Memory: %s + +Use Baseline (PHPUnit\TestFixture\Baseline\UseBaseline) + ✔ One + +OK (1 test, 1 assertion) + +6 issues were ignored by baseline. diff --git a/tests/end-to-end/baseline/use-baseline.phpt b/tests/end-to-end/baseline/use-baseline.phpt index 5b38af2d187..180befee7fc 100644 --- a/tests/end-to-end/baseline/use-baseline.phpt +++ b/tests/end-to-end/baseline/use-baseline.phpt @@ -21,4 +21,4 @@ Time: %s, Memory: %s OK (1 test, 1 assertion) -1 issue was ignored by baseline. +6 issues were ignored by baseline. diff --git a/tests/end-to-end/cli/exclude-filter/match.phpt b/tests/end-to-end/cli/exclude-filter/match.phpt index 8064a059574..c78875601bf 100644 --- a/tests/end-to-end/cli/exclude-filter/match.phpt +++ b/tests/end-to-end/cli/exclude-filter/match.phpt @@ -2,13 +2,9 @@ phpunit --exclude-filter testThree ../../_files/groups/tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/fail-on/do-not-fail-on-empty-test-suite-by-default.phpt b/tests/end-to-end/cli/fail-on/do-not-fail-on-empty-test-suite-by-default.phpt index 5fefa2f8f08..2a0dfae0479 100644 --- a/tests/end-to-end/cli/fail-on/do-not-fail-on-empty-test-suite-by-default.phpt +++ b/tests/end-to-end/cli/fail-on/do-not-fail-on-empty-test-suite-by-default.phpt @@ -2,13 +2,9 @@ Test Runner exits with shell exit code indicating success by default when no tests were run --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index ad3cbe7d1dc..0e81cf5e9f9 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-deprecation.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-deprecation.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test triggered a deprecation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/fail-on/fail-on-empty-test-suite.phpt b/tests/end-to-end/cli/fail-on/fail-on-empty-test-suite.phpt index 1331c932d2d..e900ce18e87 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-empty-test-suite.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-empty-test-suite.phpt @@ -2,13 +2,9 @@ Test Runner exits with shell exit code indicating failure when no tests were run and --fail-on-empty-test-suite option is used --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 0b310cbae7b..a80fb40a1d4 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-incomplete.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-incomplete.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test was marked incomplete --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index b43ee718eeb..f81d559088b 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-notice.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-notice.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test triggered a notice --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/fail-on/fail-on-phpunit-deprecation.phpt b/tests/end-to-end/cli/fail-on/fail-on-phpunit-deprecation.phpt index 798f1daeb2c..519f5726bab 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-phpunit-deprecation.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-phpunit-deprecation.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test triggered a PHPUnit deprecation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index c79e8b89fbd..d7323df117a 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-risky.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-risky.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test was considered risky --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 2dd54f8bb9b..8978243ea19 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-skipped.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-skipped.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one test was skipped --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index bc124d4d476..eabbe8937af 100644 --- a/tests/end-to-end/cli/fail-on/fail-on-warning.phpt +++ b/tests/end-to-end/cli/fail-on/fail-on-warning.phpt @@ -2,23 +2,15 @@ Test Runner exits with shell exit code indicating failure when all tests are successful but at least one warning was triggered --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 71c42ea0e5d..0f8f07a1750 100644 --- a/tests/end-to-end/cli/filter/filter-class-match-argument.phpt +++ b/tests/end-to-end/cli/filter/filter-class-match-argument.phpt @@ -2,13 +2,9 @@ phpunit --filter FooTest tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 328e2e6e11e..17e98448355 100644 --- a/tests/end-to-end/cli/filter/filter-class-match-configuration.phpt +++ b/tests/end-to-end/cli/filter/filter-class-match-configuration.phpt @@ -2,24 +2,16 @@ phpunit --filter FooTest --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 7c870d8b427..be71939651b 100644 --- a/tests/end-to-end/cli/filter/filter-class-nomatch-argument.phpt +++ b/tests/end-to-end/cli/filter/filter-class-nomatch-argument.phpt @@ -2,13 +2,9 @@ phpunit --filter BarTest tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index a4d41c9ffac..23a7967a205 100644 --- a/tests/end-to-end/cli/filter/filter-class-nomatch-configuration.phpt +++ b/tests/end-to-end/cli/filter/filter-class-nomatch-configuration.phpt @@ -2,24 +2,16 @@ phpunit --filter BarTest --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 348a6e07789..8fc0f1b4a58 100644 --- a/tests/end-to-end/cli/filter/filter-method-match-argument.phpt +++ b/tests/end-to-end/cli/filter/filter-method-match-argument.phpt @@ -2,13 +2,9 @@ phpunit --filter testOne tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 6a43eb6c635..f74ff0d5d68 100644 --- a/tests/end-to-end/cli/filter/filter-method-match-configuration.phpt +++ b/tests/end-to-end/cli/filter/filter-method-match-configuration.phpt @@ -2,24 +2,16 @@ phpunit --filter testOne --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 8663caa1efe..cd052a99bd3 100644 --- a/tests/end-to-end/cli/filter/filter-method-nomatch-argument.phpt +++ b/tests/end-to-end/cli/filter/filter-method-nomatch-argument.phpt @@ -2,13 +2,9 @@ phpunit --filter testFoo tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index c6e69a415b0..f1b8168a91f 100644 --- a/tests/end-to-end/cli/filter/filter-method-nomatch-configuration.phpt +++ b/tests/end-to-end/cli/filter/filter-method-nomatch-configuration.phpt @@ -2,24 +2,16 @@ phpunit --filter testFoo --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/covers-csv.phpt b/tests/end-to-end/cli/group/covers-csv.phpt index f2a5794cf4c..4ff5a6b21f4 100644 --- a/tests/end-to-end/cli/group/covers-csv.phpt +++ b/tests/end-to-end/cli/group/covers-csv.phpt @@ -2,13 +2,9 @@ phpunit --covers PHPUnit\TestFixture\AttributeBasedFiltering\Foo --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Triggered Warning (Using comma-separated values with --covers is deprecated and will no longer work in PHPUnit 12. You can use --covers multiple times instead.) diff --git a/tests/end-to-end/cli/group/covers.phpt b/tests/end-to-end/cli/group/covers.phpt index 9aa2d30276b..404040369ca 100644 --- a/tests/end-to-end/cli/group/covers.phpt +++ b/tests/end-to-end/cli/group/covers.phpt @@ -2,13 +2,9 @@ phpunit --covers PHPUnit\TestFixture\AttributeBasedFiltering\Foo --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/exclude-group-argument-csv.phpt b/tests/end-to-end/cli/group/exclude-group-argument-csv.phpt index 5b16969cc85..054f1ac6d66 100644 --- a/tests/end-to-end/cli/group/exclude-group-argument-csv.phpt +++ b/tests/end-to-end/cli/group/exclude-group-argument-csv.phpt @@ -2,13 +2,9 @@ phpunit --exclude-group one,two tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Triggered Warning (Using comma-separated values with --exclude-group is deprecated and will no longer work in PHPUnit 12. You can use --exclude-group multiple times instead.) diff --git a/tests/end-to-end/cli/group/exclude-group-argument.phpt b/tests/end-to-end/cli/group/exclude-group-argument.phpt index e6d14b3ad60..81e0027bed9 100644 --- a/tests/end-to-end/cli/group/exclude-group-argument.phpt +++ b/tests/end-to-end/cli/group/exclude-group-argument.phpt @@ -2,13 +2,9 @@ phpunit --exclude-group one,two tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/exclude-group-configuration-csv.phpt b/tests/end-to-end/cli/group/exclude-group-configuration-csv.phpt index 844cd7c9aca..9212a0d588c 100644 --- a/tests/end-to-end/cli/group/exclude-group-configuration-csv.phpt +++ b/tests/end-to-end/cli/group/exclude-group-configuration-csv.phpt @@ -2,12 +2,8 @@ phpunit --exclude-group one,two --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Triggered Warning (Using comma-separated values with --exclude-group is deprecated and will no longer work in PHPUnit 12. You can use --exclude-group multiple times instead.) diff --git a/tests/end-to-end/cli/group/exclude-group-configuration.phpt b/tests/end-to-end/cli/group/exclude-group-configuration.phpt index 5eb354a7c13..cd3cb8f911b 100644 --- a/tests/end-to-end/cli/group/exclude-group-configuration.phpt +++ b/tests/end-to-end/cli/group/exclude-group-configuration.phpt @@ -2,12 +2,8 @@ phpunit --exclude-group one,two --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/group-argument.phpt b/tests/end-to-end/cli/group/group-argument.phpt index 5e2db3bb623..8977194b861 100644 --- a/tests/end-to-end/cli/group/group-argument.phpt +++ b/tests/end-to-end/cli/group/group-argument.phpt @@ -2,13 +2,9 @@ phpunit --group one tests/FooTest.php --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/group-configuration.phpt b/tests/end-to-end/cli/group/group-configuration.phpt index 3575592bf26..f2dfaf744fc 100644 --- a/tests/end-to-end/cli/group/group-configuration.phpt +++ b/tests/end-to-end/cli/group/group-configuration.phpt @@ -2,24 +2,16 @@ phpunit --group one --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/requires-php-extension.phpt b/tests/end-to-end/cli/group/requires-php-extension.phpt index 1c6afe8c587..4f120f50264 100644 --- a/tests/end-to-end/cli/group/requires-php-extension.phpt +++ b/tests/end-to-end/cli/group/requires-php-extension.phpt @@ -2,13 +2,9 @@ phpunit --requires-php-extension standard --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/group/uses-csv.phpt b/tests/end-to-end/cli/group/uses-csv.phpt index de576dbd911..ce67c008c45 100644 --- a/tests/end-to-end/cli/group/uses-csv.phpt +++ b/tests/end-to-end/cli/group/uses-csv.phpt @@ -2,13 +2,9 @@ phpunit --uses PHPUnit\TestFixture\AttributeBasedFiltering\Foo --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Triggered Warning (Using comma-separated values with --uses is deprecated and will no longer work in PHPUnit 12. You can use --uses multiple times instead.) diff --git a/tests/end-to-end/cli/group/uses.phpt b/tests/end-to-end/cli/group/uses.phpt index aabfb24c5e3..83b4a57761a 100644 --- a/tests/end-to-end/cli/group/uses.phpt +++ b/tests/end-to-end/cli/group/uses.phpt @@ -2,13 +2,9 @@ phpunit --uses PHPUnit\TestFixture\AttributeBasedFiltering\Foo --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 3c1279397db..1d0b8e9091e 100644 --- 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 @@ -2,23 +2,15 @@ Stopping test execution after first error works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index c38363045b0..b2f6a9be461 100644 --- 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 @@ -2,23 +2,15 @@ Stopping test execution after first failure works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 26b21e4c4ab..5b38eb7275b 100644 --- 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 @@ -2,23 +2,15 @@ Stopping test execution after first risky test works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index c6128e18b6d..7a9752c7cf2 100644 --- 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 @@ -2,23 +2,15 @@ Stopping test execution after first warning works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index aa9dd54373d..9076b047e8f 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-deprecation.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-deprecation.phpt @@ -2,23 +2,15 @@ Stopping test execution after first deprecation works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index 88f9c1b4b12..d7dd7834be2 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-error.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-error.phpt @@ -2,23 +2,15 @@ Stopping test execution after first error works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index bfcae5407d2..a07f58bd38d 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-failure.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-failure.phpt @@ -2,23 +2,15 @@ Stopping test execution after first failure works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured 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 index b581602a554..4b23c90d60a 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-incomplete.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-incomplete.phpt @@ -2,23 +2,15 @@ Stopping test execution after first incomplete test works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/stop-on/stop-on-notice.phpt b/tests/end-to-end/cli/stop-on/stop-on-notice.phpt index af685b595f6..4e4da4092c4 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-notice.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-notice.phpt @@ -2,23 +2,15 @@ Stopping test execution after first notice works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/stop-on/stop-on-risky.phpt b/tests/end-to-end/cli/stop-on/stop-on-risky.phpt index 54c063845c7..7c81b8df921 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-risky.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-risky.phpt @@ -2,23 +2,15 @@ Stopping test execution after first risky test works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/stop-on/stop-on-skipped.phpt b/tests/end-to-end/cli/stop-on/stop-on-skipped.phpt index 72d5643fcce..37d60f01063 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-skipped.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-skipped.phpt @@ -2,23 +2,15 @@ Stopping test execution after first skipped test works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/cli/stop-on/stop-on-warning.phpt b/tests/end-to-end/cli/stop-on/stop-on-warning.phpt index 0c3f308b401..6b081ec11a3 100644 --- a/tests/end-to-end/cli/stop-on/stop-on-warning.phpt +++ b/tests/end-to-end/cli/stop-on/stop-on-warning.phpt @@ -2,23 +2,15 @@ Stopping test execution after first warning works --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/deprecation-trigger/deprecation-trigger-function.phpt b/tests/end-to-end/deprecation-trigger/deprecation-trigger-function.phpt index f7388f657eb..d09f46a8dbe 100644 --- a/tests/end-to-end/deprecation-trigger/deprecation-trigger-function.phpt +++ b/tests/end-to-end/deprecation-trigger/deprecation-trigger-function.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers E_USER_DEPRECATED --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/deprecation-trigger/deprecation-trigger-method.phpt b/tests/end-to-end/deprecation-trigger/deprecation-trigger-method.phpt index a590e3524df..80fb0131cf9 100644 --- a/tests/end-to-end/deprecation-trigger/deprecation-trigger-method.phpt +++ b/tests/end-to-end/deprecation-trigger/deprecation-trigger-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers E_USER_DEPRECATED --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/_files/CustomFailureException.php b/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureException.php similarity index 100% rename from tests/end-to-end/event/_files/CustomFailureException.php rename to tests/end-to-end/event/_files/custom-failure-interface/CustomFailureException.php diff --git a/tests/end-to-end/event/_files/CustomFailureInterface.php b/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterface.php similarity index 100% rename from tests/end-to-end/event/_files/CustomFailureInterface.php rename to tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterface.php diff --git a/tests/end-to-end/event/_files/CustomFailureInterfaceTest.php b/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterfaceTest.php similarity index 100% rename from tests/end-to-end/event/_files/CustomFailureInterfaceTest.php rename to tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterfaceTest.php diff --git a/tests/static-analysis/happy-path/assert-not-null.php b/tests/end-to-end/event/_files/custom-failure-interface/bootstrap.php similarity index 57% rename from tests/static-analysis/happy-path/assert-not-null.php rename to tests/end-to-end/event/_files/custom-failure-interface/bootstrap.php index f84d87ee96a..560c65452b7 100644 --- a/tests/static-analysis/happy-path/assert-not-null.php +++ b/tests/end-to-end/event/_files/custom-failure-interface/bootstrap.php @@ -1,4 +1,5 @@ run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/assertion-failure-in-after-test-method.phpt b/tests/end-to-end/event/assertion-failure-in-after-test-method.phpt index b90e705c8d5..409109ecf0a 100644 --- a/tests/end-to-end/event/assertion-failure-in-after-test-method.phpt +++ b/tests/end-to-end/event/assertion-failure-in-after-test-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that fails because of an assertion failure in a "after test" method --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/assertion-failure-in-before-test-method.phpt b/tests/end-to-end/event/assertion-failure-in-before-test-method.phpt index 52c3e654a81..c4b138ed4db 100644 --- a/tests/end-to-end/event/assertion-failure-in-before-test-method.phpt +++ b/tests/end-to-end/event/assertion-failure-in-before-test-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that fails because of an assertion failure in a "before test" method --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/assertion-failure-in-postcondition-method.phpt b/tests/end-to-end/event/assertion-failure-in-postcondition-method.phpt index bb87edc02bd..4034eaf1e55 100644 --- a/tests/end-to-end/event/assertion-failure-in-postcondition-method.phpt +++ b/tests/end-to-end/event/assertion-failure-in-postcondition-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that fails because of an assertion failure in a "post condition" method --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/assertion-failure-in-precondition-method.phpt b/tests/end-to-end/event/assertion-failure-in-precondition-method.phpt index ae173a2e64b..5e90267b8cc 100644 --- a/tests/end-to-end/event/assertion-failure-in-precondition-method.phpt +++ b/tests/end-to-end/event/assertion-failure-in-precondition-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that fails because of an assertion failure in a "pre condition" method --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/assertion-failure-in-test-method.phpt b/tests/end-to-end/event/assertion-failure-in-test-method.phpt index 991c59f3cef..e74e57fde9e 100644 --- a/tests/end-to-end/event/assertion-failure-in-test-method.phpt +++ b/tests/end-to-end/event/assertion-failure-in-test-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that fails because of an assertion failure in the test method --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/custom-comparator.phpt b/tests/end-to-end/event/custom-comparator.phpt index 96967ed83af..3665207d1ba 100644 --- a/tests/end-to-end/event/custom-comparator.phpt +++ b/tests/end-to-end/event/custom-comparator.phpt @@ -2,25 +2,20 @@ The right events are emitted in the right order for a successful test that uses assertEquals() with a custom comparator --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sCustomComparator.php) Event Facade Sealed Test Suite Loaded (1 test) Test Runner Started diff --git a/tests/end-to-end/event/custom-error-handler-registered-in-bootstrap-is-not-overwritten-by-phpunit.phpt b/tests/end-to-end/event/custom-error-handler-registered-in-bootstrap-is-not-overwritten-by-phpunit.phpt index a023a2dfd43..f48d3e909bf 100644 --- a/tests/end-to-end/event/custom-error-handler-registered-in-bootstrap-is-not-overwritten-by-phpunit.phpt +++ b/tests/end-to-end/event/custom-error-handler-registered-in-bootstrap-is-not-overwritten-by-phpunit.phpt @@ -2,23 +2,15 @@ A custom error handler registered in the test suite's bootstrap script using set_error_handler() is not overwritten by PHPUnit by default --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-duplicate-key.phpt b/tests/end-to-end/event/data-provider-duplicate-key.phpt index 62d005c6f17..0bc07706d78 100644 --- a/tests/end-to-end/event/data-provider-duplicate-key.phpt +++ b/tests/end-to-end/event/data-provider-duplicate-key.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that provides data with duplicate keys --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-empty.phpt b/tests/end-to-end/event/data-provider-empty.phpt index 496e310bca7..83c6f4c54af 100644 --- a/tests/end-to-end/event/data-provider-empty.phpt +++ b/tests/end-to-end/event/data-provider-empty.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that provides no data --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-exception.phpt b/tests/end-to-end/event/data-provider-exception.phpt index c85357566c4..fc4f1dd5203 100644 --- a/tests/end-to-end/event/data-provider-exception.phpt +++ b/tests/end-to-end/event/data-provider-exception.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that raises an exception --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-expects-argument.phpt b/tests/end-to-end/event/data-provider-expects-argument.phpt index cf8af7ec6ba..3616bc7ec40 100644 --- a/tests/end-to-end/event/data-provider-expects-argument.phpt +++ b/tests/end-to-end/event/data-provider-expects-argument.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that expects an argument --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-external.phpt b/tests/end-to-end/event/data-provider-external.phpt index 04984561f57..03ff9791292 100644 --- a/tests/end-to-end/event/data-provider-external.phpt +++ b/tests/end-to-end/event/data-provider-external.phpt @@ -2,25 +2,20 @@ The right events are emitted in the right order for a successful test that uses a data provider method in a different class --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sDataProvider.php) Event Facade Sealed Data Provider Method Called (PHPUnit\TestFixture\Event\DataProvider::values for test method PHPUnit\TestFixture\Event\DataProviderExternalTest::testSuccess) Data Provider Method Finished for PHPUnit\TestFixture\Event\DataProviderExternalTest::testSuccess: diff --git a/tests/end-to-end/event/data-provider-invalid-argument-name.phpt b/tests/end-to-end/event/data-provider-invalid-argument-name.phpt index fb328bfbfc0..d5b8b946f5b 100644 --- a/tests/end-to-end/event/data-provider-invalid-argument-name.phpt +++ b/tests/end-to-end/event/data-provider-invalid-argument-name.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that provides data with invalid argument names --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-not-public.phpt b/tests/end-to-end/event/data-provider-not-public.phpt index 5c1aedc95a6..eaa601f8dc9 100644 --- a/tests/end-to-end/event/data-provider-not-public.phpt +++ b/tests/end-to-end/event/data-provider-not-public.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that is not public --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider-not-static.phpt b/tests/end-to-end/event/data-provider-not-static.phpt index 8ee9869c173..88916b9b939 100644 --- a/tests/end-to-end/event/data-provider-not-static.phpt +++ b/tests/end-to-end/event/data-provider-not-static.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that is not static --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/data-provider.phpt b/tests/end-to-end/event/data-provider.phpt index 00307c91ace..f50444ec77a 100644 --- a/tests/end-to-end/event/data-provider.phpt +++ b/tests/end-to-end/event/data-provider.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that uses a data provider --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/deprecated-assertion.phpt b/tests/end-to-end/event/deprecated-assertion.phpt index f60e71934a3..4e96998d47f 100644 --- a/tests/end-to-end/event/deprecated-assertion.phpt +++ b/tests/end-to-end/event/deprecated-assertion.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that uses a deprecated assertion --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/deprecations-can-be-ignored-using-attribute.phpt b/tests/end-to-end/event/deprecations-can-be-ignored-using-attribute.phpt index 9048718964b..90dc20f4cd0 100644 --- a/tests/end-to-end/event/deprecations-can-be-ignored-using-attribute.phpt +++ b/tests/end-to-end/event/deprecations-can-be-ignored-using-attribute.phpt @@ -2,22 +2,14 @@ https://github.com/sebastianbergmann/phpunit/issues/5532 --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/duplicated-cli-options.phpt b/tests/end-to-end/event/duplicated-cli-options.phpt index 160717e8057..02a599c5764 100644 --- a/tests/end-to-end/event/duplicated-cli-options.phpt +++ b/tests/end-to-end/event/duplicated-cli-options.phpt @@ -2,13 +2,9 @@ The right events are emitted in the right order when duplicated CLI options are used --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Triggered Warning (Option --filter cannot be used more than once) diff --git a/tests/end-to-end/event/error-handler-can-be-disabled.phpt b/tests/end-to-end/event/error-handler-can-be-disabled.phpt index 230d5ab8142..f3609a41a2b 100644 --- a/tests/end-to-end/event/error-handler-can-be-disabled.phpt +++ b/tests/end-to-end/event/error-handler-can-be-disabled.phpt @@ -2,12 +2,8 @@ The right events are emitted in the right order when PHPUnit's error handler is disabled --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/error.phpt b/tests/end-to-end/event/error.phpt index 0038927c561..76a965154af 100644 --- a/tests/end-to-end/event/error.phpt +++ b/tests/end-to-end/event/error.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for an errored test --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/exception-in-setup-before-class.phpt b/tests/end-to-end/event/exception-in-setup-before-class.phpt index 0d75a1475a8..012061badfa 100644 --- a/tests/end-to-end/event/exception-in-setup-before-class.phpt +++ b/tests/end-to-end/event/exception-in-setup-before-class.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for when an exception is raised in setUpBeforeClass() --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/exception-in-setup.phpt b/tests/end-to-end/event/exception-in-setup.phpt index d10b0f1192a..a5d04f0278a 100644 --- a/tests/end-to-end/event/exception-in-setup.phpt +++ b/tests/end-to-end/event/exception-in-setup.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for when an exception is raised in setUp() --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/expectation-on-output.phpt b/tests/end-to-end/event/expectation-on-output.phpt index 969787c61bd..55c4d59cdad 100644 --- a/tests/end-to-end/event/expectation-on-output.phpt +++ b/tests/end-to-end/event/expectation-on-output.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a test with an output expectation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/failed-mock-expectation.phpt b/tests/end-to-end/event/failed-mock-expectation.phpt index a96a0b84f00..cec67ead8ff 100644 --- a/tests/end-to-end/event/failed-mock-expectation.phpt +++ b/tests/end-to-end/event/failed-mock-expectation.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test with a failed expectation on a mock object --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/incomplete-test.phpt b/tests/end-to-end/event/incomplete-test.phpt index 27682e909e5..f7fec9b8e58 100644 --- a/tests/end-to-end/event/incomplete-test.phpt +++ b/tests/end-to-end/event/incomplete-test.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for an incomplete test --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/invalid-coverage-metadata.phpt b/tests/end-to-end/event/invalid-coverage-metadata.phpt index 3863dcf42da..26ad9d708c2 100644 --- a/tests/end-to-end/event/invalid-coverage-metadata.phpt +++ b/tests/end-to-end/event/invalid-coverage-metadata.phpt @@ -7,23 +7,15 @@ if (!extension_loaded('pcov')) { } --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/invalid-data-provider-with-passing-test.phpt b/tests/end-to-end/event/invalid-data-provider-with-passing-test.phpt index 4e6b19e3cae..848ed0a3f54 100644 --- a/tests/end-to-end/event/invalid-data-provider-with-passing-test.phpt +++ b/tests/end-to-end/event/invalid-data-provider-with-passing-test.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that returns an invalid array --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/invalid-data-provider.phpt b/tests/end-to-end/event/invalid-data-provider.phpt index 761b7236eed..48a8e9e8e35 100644 --- a/tests/end-to-end/event/invalid-data-provider.phpt +++ b/tests/end-to-end/event/invalid-data-provider.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a data provider that returns an invalid array --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/invalid-test-dependency.phpt b/tests/end-to-end/event/invalid-test-dependency.phpt index ed933353731..1c660608561 100644 --- a/tests/end-to-end/event/invalid-test-dependency.phpt +++ b/tests/end-to-end/event/invalid-test-dependency.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that has an invalid dependency --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/missing-test-dependency.phpt b/tests/end-to-end/event/missing-test-dependency.phpt index 32e0f81f093..6979f3d828c 100644 --- a/tests/end-to-end/event/missing-test-dependency.phpt +++ b/tests/end-to-end/event/missing-test-dependency.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that has a missing dependency --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/mock-object.phpt b/tests/end-to-end/event/mock-object.phpt index 4cd24b4c129..a0067688e30 100644 --- a/tests/end-to-end/event/mock-object.phpt +++ b/tests/end-to-end/event/mock-object.phpt @@ -2,25 +2,20 @@ The right events are emitted in the right order for a test that uses a mock object --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sExample.php) Event Facade Sealed Test Suite Loaded (1 test) Test Runner Started diff --git a/tests/end-to-end/event/php-deprecated.phpt b/tests/end-to-end/event/php-deprecated.phpt index e026f0e341c..3de2675fc77 100644 --- a/tests/end-to-end/event/php-deprecated.phpt +++ b/tests/end-to-end/event/php-deprecated.phpt @@ -4,23 +4,15 @@ The right events are emitted in the right order for a test that runs code which error_reporting=-1 --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/php-notice.phpt b/tests/end-to-end/event/php-notice.phpt index 98be934ed83..732066180d2 100644 --- a/tests/end-to-end/event/php-notice.phpt +++ b/tests/end-to-end/event/php-notice.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a test that runs code which triggers E_NOTICE --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/php-warning.phpt b/tests/end-to-end/event/php-warning.phpt index e8a7e728ae4..6c2d8ae50dc 100644 --- a/tests/end-to-end/event/php-warning.phpt +++ b/tests/end-to-end/event/php-warning.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a test that runs code which triggers E_WARNING --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/phpt-skipif.phpt b/tests/end-to-end/event/phpt-skipif.phpt index e4d5bb1665d..f3bb2853bed 100644 --- a/tests/end-to-end/event/phpt-skipif.phpt +++ b/tests/end-to-end/event/phpt-skipif.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a skipped PHPT test --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/phpunit-deprecated.phpt b/tests/end-to-end/event/phpunit-deprecated.phpt index dd541b4ba72..42b74026e6e 100644 --- a/tests/end-to-end/event/phpunit-deprecated.phpt +++ b/tests/end-to-end/event/phpunit-deprecated.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that uses a deprecated PHPUnit feature --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/phpunit-warning.phpt b/tests/end-to-end/event/phpunit-warning.phpt index 185f46a322d..c21366a43da 100644 --- a/tests/end-to-end/event/phpunit-warning.phpt +++ b/tests/end-to-end/event/phpunit-warning.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers a PHPUnit warning --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/process-isolation-fatal.phpt b/tests/end-to-end/event/process-isolation-fatal.phpt index ab090657965..f7452563ade 100644 --- a/tests/end-to-end/event/process-isolation-fatal.phpt +++ b/tests/end-to-end/event/process-isolation-fatal.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a test that is run in process isolation and triggers a fatal error --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/registered-failure-interface.phpt b/tests/end-to-end/event/registered-failure-interface.phpt index ac6d3882cf9..d05df537573 100644 --- a/tests/end-to-end/event/registered-failure-interface.phpt +++ b/tests/end-to-end/event/registered-failure-interface.phpt @@ -2,25 +2,20 @@ The right events are emitted in the right order for a test that registers a failure interface --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sbootstrap.php) Event Facade Sealed Test Suite Loaded (2 tests) Test Runner Started diff --git a/tests/end-to-end/event/risky-depends-on-larger-test.phpt b/tests/end-to-end/event/risky-depends-on-larger-test.phpt index 0060aed3fa5..ef8d47863e8 100644 --- a/tests/end-to-end/event/risky-depends-on-larger-test.phpt +++ b/tests/end-to-end/event/risky-depends-on-larger-test.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that is considered risky because it depends on a larger test --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/risky-global-state-modification.phpt b/tests/end-to-end/event/risky-global-state-modification.phpt index 7e0a05d8950..0f7db3330de 100644 --- a/tests/end-to-end/event/risky-global-state-modification.phpt +++ b/tests/end-to-end/event/risky-global-state-modification.phpt @@ -2,24 +2,16 @@ The right events are emitted in the right order for a test that is considered risky because it modified global state --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/risky-no-assertions-isolation.phpt b/tests/end-to-end/event/risky-no-assertions-isolation.phpt index fa38189d973..7fda500fac9 100644 --- a/tests/end-to-end/event/risky-no-assertions-isolation.phpt +++ b/tests/end-to-end/event/risky-no-assertions-isolation.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a test that is run in an isolated process and is considered risky because it did not perform assertions --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/risky-no-assertions.phpt b/tests/end-to-end/event/risky-no-assertions.phpt index 0d2172d8cc1..e42b0c0110c 100644 --- a/tests/end-to-end/event/risky-no-assertions.phpt +++ b/tests/end-to-end/event/risky-no-assertions.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that is considered risky because it did not perform assertions --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/risky-output.phpt b/tests/end-to-end/event/risky-output.phpt index c20e5f62cc8..97c35b8dfc5 100644 --- a/tests/end-to-end/event/risky-output.phpt +++ b/tests/end-to-end/event/risky-output.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a test that is considered risky because it prints output --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/risky-time-limit-exceeded.phpt b/tests/end-to-end/event/risky-time-limit-exceeded.phpt index 1c7441b2c97..c78d6cc73e1 100644 --- a/tests/end-to-end/event/risky-time-limit-exceeded.phpt +++ b/tests/end-to-end/event/risky-time-limit-exceeded.phpt @@ -5,23 +5,15 @@ The right events are emitted in the right order for a test that is considered ri if (!extension_loaded('pcntl')) echo 'skip: Extension pcntl is required'; --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/risky-with-multiple-reasons.phpt b/tests/end-to-end/event/risky-with-multiple-reasons.phpt index f3f322cd071..60d01435d6d 100644 --- a/tests/end-to-end/event/risky-with-multiple-reasons.phpt +++ b/tests/end-to-end/event/risky-with-multiple-reasons.phpt @@ -2,24 +2,16 @@ The right events are emitted in the right order for a test that is considered risky for multiple reasons --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/success-process-isolation.phpt b/tests/end-to-end/event/success-process-isolation.phpt index 05839125c12..4ad9672962f 100644 --- a/tests/end-to-end/event/success-process-isolation.phpt +++ b/tests/end-to-end/event/success-process-isolation.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for a successful test that is run in an isolated process --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/success.phpt b/tests/end-to-end/event/success.phpt index 3487b0c5c8b..c326766b72e 100644 --- a/tests/end-to-end/event/success.phpt +++ b/tests/end-to-end/event/success.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/successful-mock-expectation.phpt b/tests/end-to-end/event/successful-mock-expectation.phpt index 4891dc8b4c8..1f7d881f420 100644 --- a/tests/end-to-end/event/successful-mock-expectation.phpt +++ b/tests/end-to-end/event/successful-mock-expectation.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test with a successful expectation on a mock object --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/suppressed-user-notice.phpt b/tests/end-to-end/event/suppressed-user-notice.phpt index 1804231c0f7..cc989d50609 100644 --- a/tests/end-to-end/event/suppressed-user-notice.phpt +++ b/tests/end-to-end/event/suppressed-user-notice.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers a suppressed E_USER_NOTICE --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/suppressed-user-warning.phpt b/tests/end-to-end/event/suppressed-user-warning.phpt index 41e445da3db..290f5802864 100644 --- a/tests/end-to-end/event/suppressed-user-warning.phpt +++ b/tests/end-to-end/event/suppressed-user-warning.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers a suppressed E_USER_WARNING --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/template-methods-isolation.phpt b/tests/end-to-end/event/template-methods-isolation.phpt index c8c3ace60e1..071fcad9ad3 100644 --- a/tests/end-to-end/event/template-methods-isolation.phpt +++ b/tests/end-to-end/event/template-methods-isolation.phpt @@ -2,23 +2,15 @@ The right events are emitted in the right order for the template methods of a test class that is run in process isolation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/template-methods.phpt b/tests/end-to-end/event/template-methods.phpt index 650b2479cc4..7d932c55c01 100644 --- a/tests/end-to-end/event/template-methods.phpt +++ b/tests/end-to-end/event/template-methods.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for the template methods of a test class --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/test-skipped-in-setup-before-class.phpt b/tests/end-to-end/event/test-skipped-in-setup-before-class.phpt index ad68f912e09..745335fd039 100644 --- a/tests/end-to-end/event/test-skipped-in-setup-before-class.phpt +++ b/tests/end-to-end/event/test-skipped-in-setup-before-class.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test skipped in setUpBeforeClass() --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/test-skipped-in-setup.phpt b/tests/end-to-end/event/test-skipped-in-setup.phpt index 41908a3aa93..aa6bc9806f9 100644 --- a/tests/end-to-end/event/test-skipped-in-setup.phpt +++ b/tests/end-to-end/event/test-skipped-in-setup.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test skipped in setUp() --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/test-skipped.phpt b/tests/end-to-end/event/test-skipped.phpt index dab673e4fa3..7d3f68453d4 100644 --- a/tests/end-to-end/event/test-skipped.phpt +++ b/tests/end-to-end/event/test-skipped.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a skipped test --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/test-stub.phpt b/tests/end-to-end/event/test-stub.phpt index 87abca49435..9a2667b567b 100644 --- a/tests/end-to-end/event/test-stub.phpt +++ b/tests/end-to-end/event/test-stub.phpt @@ -2,25 +2,20 @@ The right events are emitted in the right order for a test that uses a test stub --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sExample.php) Event Facade Sealed Test Suite Loaded (1 test) Test Runner Started diff --git a/tests/end-to-end/event/testwith-annotation.phpt b/tests/end-to-end/event/testwith-annotation.phpt index 55b02a6c9f2..53351ea27b0 100644 --- a/tests/end-to-end/event/testwith-annotation.phpt +++ b/tests/end-to-end/event/testwith-annotation.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that uses the TestWith and TestWithJson attributes --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/testwith-attribute.phpt b/tests/end-to-end/event/testwith-attribute.phpt index dc4aa11bb32..d5761afdc7c 100644 --- a/tests/end-to-end/event/testwith-attribute.phpt +++ b/tests/end-to-end/event/testwith-attribute.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that uses the TestWith and TestWithJson attributes --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/too-few-columns.phpt b/tests/end-to-end/event/too-few-columns.phpt index 7eff55a7b6f..2b7ee09d69f 100644 --- a/tests/end-to-end/event/too-few-columns.phpt +++ b/tests/end-to-end/event/too-few-columns.phpt @@ -2,24 +2,16 @@ The right events are emitted in the right order when too few columns are requested --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Triggered Warning (Less than 16 columns requested, number of columns set to 16) diff --git a/tests/end-to-end/event/unexpected-end-of-test-in-separate-process.phpt b/tests/end-to-end/event/unexpected-end-of-test-in-separate-process.phpt index d9d4f63ff5c..6a22805968f 100644 --- a/tests/end-to-end/event/unexpected-end-of-test-in-separate-process.phpt +++ b/tests/end-to-end/event/unexpected-end-of-test-in-separate-process.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test run in a separate process that ends unexpectedly --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/unsatisfied-requirement-before-class-method.phpt b/tests/end-to-end/event/unsatisfied-requirement-before-class-method.phpt index da5163ee91e..e0ecee2339d 100644 --- a/tests/end-to-end/event/unsatisfied-requirement-before-class-method.phpt +++ b/tests/end-to-end/event/unsatisfied-requirement-before-class-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that has an unsatisfied requirement (before class method) --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/unsatisfied-requirement-class.phpt b/tests/end-to-end/event/unsatisfied-requirement-class.phpt index 8783a8cb41e..043cec3d53e 100644 --- a/tests/end-to-end/event/unsatisfied-requirement-class.phpt +++ b/tests/end-to-end/event/unsatisfied-requirement-class.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that has an unsatisfied requirement (class level) --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/unsatisfied-requirement-method.phpt b/tests/end-to-end/event/unsatisfied-requirement-method.phpt index 86fc442efcb..447367927f6 100644 --- a/tests/end-to-end/event/unsatisfied-requirement-method.phpt +++ b/tests/end-to-end/event/unsatisfied-requirement-method.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that has an unsatisfied requirement (method level) --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/user-deprecated.phpt b/tests/end-to-end/event/user-deprecated.phpt index 4d179263227..28526734282 100644 --- a/tests/end-to-end/event/user-deprecated.phpt +++ b/tests/end-to-end/event/user-deprecated.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers E_USER_DEPRECATED --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/user-error-php-84.phpt b/tests/end-to-end/event/user-error-php-84.phpt index e8e42807b45..036347e47f4 100644 --- a/tests/end-to-end/event/user-error-php-84.phpt +++ b/tests/end-to-end/event/user-error-php-84.phpt @@ -7,22 +7,14 @@ if (version_compare('8.4.0-dev', PHP_VERSION)) { } --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/user-error.phpt b/tests/end-to-end/event/user-error.phpt index 17b8ae5edbd..20e16b88aa9 100644 --- a/tests/end-to-end/event/user-error.phpt +++ b/tests/end-to-end/event/user-error.phpt @@ -7,22 +7,14 @@ if (version_compare(PHP_VERSION, '8.4.0-dev', '>=')) { } --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/user-notice.phpt b/tests/end-to-end/event/user-notice.phpt index d1f90883872..fda43c8a94a 100644 --- a/tests/end-to-end/event/user-notice.phpt +++ b/tests/end-to-end/event/user-notice.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers an E_USER_NOTICE --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/event/user-warning.phpt b/tests/end-to-end/event/user-warning.phpt index dc55d65b7b3..64dd91eecad 100644 --- a/tests/end-to-end/event/user-warning.phpt +++ b/tests/end-to-end/event/user-warning.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers E_USER_WARNING --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/execution-order/_files/TestWithDifferentDurations.phpunit.result.cache.txt b/tests/end-to-end/execution-order/_files/TestWithDifferentDurations.phpunit.result.cache.txt index 5cfa53d2f1d..abbaa02a4c8 100644 --- a/tests/end-to-end/execution-order/_files/TestWithDifferentDurations.phpunit.result.cache.txt +++ b/tests/end-to-end/execution-order/_files/TestWithDifferentDurations.phpunit.result.cache.txt @@ -1 +1 @@ -{"version":1,"defects":[],"times":{"TestWithDifferentDurations::testOne":1,"TestWithDifferentDurations::testTwo":0.5,"TestWithDifferentDurations::testThree":1.5}} +{"version":1,"defects":[],"times":{"PHPUnit\\TestFixture\\TestWithDifferentDurations::testOne":2.006,"PHPUnit\\TestFixture\\TestWithDifferentDurations::testTwo":0,"PHPUnit\\TestFixture\\TestWithDifferentDurations::testThree":3.001,"PHPUnit\\TestFixture\\ExampleTest::testOne":2.006,"PHPUnit\\TestFixture\\ExampleTest::testTwo":3.001,"PHPUnit\\TestFixture\\ExampleTest::testThree":0}} \ No newline at end of file diff --git a/tests/end-to-end/execution-order/_files/order-by-duration.phpunit.xml b/tests/end-to-end/execution-order/_files/order-by-duration.phpunit.xml new file mode 100644 index 00000000000..2ef82a66223 --- /dev/null +++ b/tests/end-to-end/execution-order/_files/order-by-duration.phpunit.xml @@ -0,0 +1,11 @@ + + + + ./TestWithDifferentDurations.php + + + diff --git a/tests/end-to-end/execution-order/cache-result.phpt b/tests/end-to-end/execution-order/cache-result.phpt index b855577d074..7800e94e781 100644 --- a/tests/end-to-end/execution-order/cache-result.phpt +++ b/tests/end-to-end/execution-order/cache-result.phpt @@ -9,7 +9,7 @@ $_SERVER['argv'][] = '--ignore-dependencies'; // keep coverage for legacy CLI $_SERVER['argv'][] = '--order-by=reverse'; $_SERVER['argv'][] = '--cache-result'; $_SERVER['argv'][] = '--cache-directory=' . $cacheDirectory; -$_SERVER['argv'][] = realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'); +$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php'; require_once __DIR__ . '/../../bootstrap.php'; diff --git a/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt index a629ad66fe5..9f19922e0aa 100644 --- a/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt +++ b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt @@ -5,7 +5,7 @@ phpunit --process-isolation _files/MultiDependencyTest.php $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; $_SERVER['argv'][] = '--process-isolation'; -$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php'); +$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php'; require_once __DIR__ . '/../../bootstrap.php'; diff --git a/tests/end-to-end/execution-order/depends-multiple-parameters.phpt b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt index 99f71a43d19..02c6884b487 100644 --- a/tests/end-to-end/execution-order/depends-multiple-parameters.phpt +++ b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt @@ -4,7 +4,7 @@ phpunit _files/MultiDependencyTest.php run($_SERVER['argv']); + +unlink($cacheDirectory . DIRECTORY_SEPARATOR . 'test-results'); +rmdir($cacheDirectory); +--EXPECTF-- +PHPUnit Started (PHPUnit %s using PHP %s) +Test Runner Configured +Event Facade Sealed +Test Suite Loaded (3 tests) +Test Runner Started +Test Suite Sorted +Test Runner Execution Started (3 tests) +Test Suite Started (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests) +Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Suite Finished (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests) +Test Runner Execution Finished +Test Runner Finished +PHPUnit Finished (Shell Exit Code: 0) diff --git a/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt b/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt new file mode 100644 index 00000000000..46f01c62f4f --- /dev/null +++ b/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt @@ -0,0 +1,55 @@ +--TEST-- +phpunit --configuration=order-by-duration.phpunit.xml +--FILE-- +run($_SERVER['argv']); + +unlink($cacheDirectory . DIRECTORY_SEPARATOR . 'test-results'); +rmdir($cacheDirectory); +--EXPECTF-- +PHPUnit Started (PHPUnit %s using PHP %s) +Test Runner Configured +Event Facade Sealed +Test Suite Loaded (3 tests) +Test Runner Started +Test Suite Sorted +Test Runner Execution Started (3 tests) +Test Suite Started (%sorder-by-duration.phpunit.xml, 3 tests) +Test Suite Started (order-by-duration, 3 tests) +Test Suite Started (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests) +Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo) +Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testOne) +Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testThree) +Test Suite Finished (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests) +Test Suite Finished (order-by-duration, 3 tests) +Test Suite Finished (%sorder-by-duration.phpunit.xml, 3 tests) +Test Runner Execution Finished +Test Runner Finished +PHPUnit Finished (Shell Exit Code: 0) diff --git a/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt index 6f767e30069..2c81c005efb 100644 --- a/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt +++ b/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt @@ -6,7 +6,7 @@ $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; $_SERVER['argv'][] = '--resolve-dependencies'; // keep coverage for legacy CLI option $_SERVER['argv'][] = '--order-by=depends,random'; -$_SERVER['argv'][] = \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'); +$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php'; require_once __DIR__ . '/../../bootstrap.php'; diff --git a/tests/end-to-end/extension-xml/phar-extension.phpt b/tests/end-to-end/extension-xml/phar-extension.phpt index f2f8b12bdf5..55a9405df79 100644 --- a/tests/end-to-end/extension-xml/phar-extension.phpt +++ b/tests/end-to-end/extension-xml/phar-extension.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order when a PHPUnit extension from a PHAR is loaded --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/generic/controlled-garbage-collection.phpt b/tests/end-to-end/generic/controlled-garbage-collection.phpt index 7ca8c73fe79..5e08f9c6401 100644 --- a/tests/end-to-end/generic/controlled-garbage-collection.phpt +++ b/tests/end-to-end/generic/controlled-garbage-collection.phpt @@ -2,22 +2,14 @@ phpunit --configuration=__DIR__.'/../_files/controlled-garbage-collection' --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/groups-from-configuration/group-another-group.phpt b/tests/end-to-end/groups-from-configuration/group-another-group.phpt index 3958ea7a643..02b04573196 100644 --- a/tests/end-to-end/groups-from-configuration/group-another-group.phpt +++ b/tests/end-to-end/groups-from-configuration/group-another-group.phpt @@ -2,12 +2,8 @@ phpunit --configuration _files/phpunit.xml --list-groups --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/groups-from-configuration/group-bar.phpt b/tests/end-to-end/groups-from-configuration/group-bar.phpt index 05937a40a0e..8d241423263 100644 --- a/tests/end-to-end/groups-from-configuration/group-bar.phpt +++ b/tests/end-to-end/groups-from-configuration/group-bar.phpt @@ -2,12 +2,8 @@ phpunit --configuration _files/phpunit.xml --list-groups --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/groups-from-configuration/group-baz.phpt b/tests/end-to-end/groups-from-configuration/group-baz.phpt index 6de50a9bf13..a407cec537a 100644 --- a/tests/end-to-end/groups-from-configuration/group-baz.phpt +++ b/tests/end-to-end/groups-from-configuration/group-baz.phpt @@ -2,12 +2,8 @@ phpunit --configuration _files/phpunit.xml --list-groups --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/groups-from-configuration/group-foo.phpt b/tests/end-to-end/groups-from-configuration/group-foo.phpt index 226c378522b..38e19a13bc2 100644 --- a/tests/end-to-end/groups-from-configuration/group-foo.phpt +++ b/tests/end-to-end/groups-from-configuration/group-foo.phpt @@ -2,12 +2,8 @@ phpunit --configuration _files/phpunit.xml --list-groups --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/logging/_files/CaseWithDollarSignTest.php b/tests/end-to-end/logging/_files/CaseWithDollarSignTest.php index fc78f37346d..725ad4f2f32 100644 --- a/tests/end-to-end/logging/_files/CaseWithDollarSignTest.php +++ b/tests/end-to-end/logging/_files/CaseWithDollarSignTest.php @@ -9,6 +9,8 @@ */ namespace PHPUnit\TestFixture; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\TestDox; use PHPUnit\Framework\TestCase; final class CaseWithDollarSignTest extends TestCase @@ -24,11 +26,8 @@ public static function dataProvider(): iterable yield ['Alone $ surrounded by spaces']; } - /** - * @testdox The "$x" is used for this test - * - * @dataProvider dataProvider - */ + #[DataProvider('dataProvider')] + #[TestDox('The "$x" is used for this test')] public function testSomething(string $x): void { $this->assertTrue(true); diff --git a/tests/end-to-end/metadata/before-test-method-configured-with-annotation-and-attribute.phpt b/tests/end-to-end/metadata/before-test-method-configured-with-annotation-and-attribute.phpt index 39d52e7605d..6b2b8fada73 100644 --- a/tests/end-to-end/metadata/before-test-method-configured-with-annotation-and-attribute.phpt +++ b/tests/end-to-end/metadata/before-test-method-configured-with-annotation-and-attribute.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that has a before-test method that is configured with annotation and attribute --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/metadata/before-test-method-configured-with-annotation.phpt b/tests/end-to-end/metadata/before-test-method-configured-with-annotation.phpt index cd30305dd63..b0e0625035f 100644 --- a/tests/end-to-end/metadata/before-test-method-configured-with-annotation.phpt +++ b/tests/end-to-end/metadata/before-test-method-configured-with-annotation.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that has a before-test method that is configured with annotation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/metadata/before-test-method-configured-with-attribute.phpt b/tests/end-to-end/metadata/before-test-method-configured-with-attribute.phpt index 2676356b6a0..c16340e0e40 100644 --- a/tests/end-to-end/metadata/before-test-method-configured-with-attribute.phpt +++ b/tests/end-to-end/metadata/before-test-method-configured-with-attribute.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that has a before-test method that is configured with attribute --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/metadata/before-test-method-configured-with-prioritized-attribute.phpt b/tests/end-to-end/metadata/before-test-method-configured-with-prioritized-attribute.phpt index e55a97522f7..81d37999619 100644 --- a/tests/end-to-end/metadata/before-test-method-configured-with-prioritized-attribute.phpt +++ b/tests/end-to-end/metadata/before-test-method-configured-with-prioritized-attribute.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that has a before-test method that is configured with attribute --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/metadata/hook-methods-order.phpt b/tests/end-to-end/metadata/hook-methods-order.phpt index 31e21c56c10..bcbbf2c4e70 100644 --- a/tests/end-to-end/metadata/hook-methods-order.phpt +++ b/tests/end-to-end/metadata/hook-methods-order.phpt @@ -2,62 +2,57 @@ The right events are emitted in the right order for a successful test that has a before-test method that is configured with annotation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sHookMethodsOrderTestCase.php) Event Facade Sealed Test Suite Loaded (1 test) Test Runner Started Test Suite Sorted Test Runner Execution Started (1 test) -Test Suite Started (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest, 1 test) -Test Preparation Started (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::testOne) -Before Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeWithPriorityInParent) -Before Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeWithPriority) -Before Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeInParent) -Before Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeFirst) -Before Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeSecond) -Before Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::setUp) +Test Suite Started (PHPUnit\TestFixture\HookMethodsOrderTest, 1 test) +Test Preparation Started (PHPUnit\TestFixture\HookMethodsOrderTest::testOne) +Before Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::beforeWithPriorityInParent) +Before Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::beforeWithPriority) +Before Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::beforeInParent) +Before Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::beforeFirst) +Before Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::beforeSecond) +Before Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::setUp) Before Test Method Finished: -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeWithPriorityInParent -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeWithPriority -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeInParent -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeFirst -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::beforeSecond -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::setUp -Test Prepared (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::testOne) -Test Passed (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::testOne) -After Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterWithPriority) -After Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterWithPriorityInParent) -After Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::tearDown) -After Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterFirst) -After Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterSecond) -After Test Method Called (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterInParent) +- PHPUnit\TestFixture\HookMethodsOrderTest::beforeWithPriorityInParent +- PHPUnit\TestFixture\HookMethodsOrderTest::beforeWithPriority +- PHPUnit\TestFixture\HookMethodsOrderTest::beforeInParent +- PHPUnit\TestFixture\HookMethodsOrderTest::beforeFirst +- PHPUnit\TestFixture\HookMethodsOrderTest::beforeSecond +- PHPUnit\TestFixture\HookMethodsOrderTest::setUp +Test Prepared (PHPUnit\TestFixture\HookMethodsOrderTest::testOne) +Test Passed (PHPUnit\TestFixture\HookMethodsOrderTest::testOne) +After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterWithPriority) +After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterWithPriorityInParent) +After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::tearDown) +After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterFirst) +After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterSecond) +After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterInParent) After Test Method Finished: -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterWithPriority -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterWithPriorityInParent -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::tearDown -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterFirst -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterSecond -- PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::afterInParent -Test Finished (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest::testOne) -Test Suite Finished (PHPUnit\DeprecatedAnnotationsTestFixture\HookMethodsOrderTest, 1 test) +- PHPUnit\TestFixture\HookMethodsOrderTest::afterWithPriority +- PHPUnit\TestFixture\HookMethodsOrderTest::afterWithPriorityInParent +- PHPUnit\TestFixture\HookMethodsOrderTest::tearDown +- PHPUnit\TestFixture\HookMethodsOrderTest::afterFirst +- PHPUnit\TestFixture\HookMethodsOrderTest::afterSecond +- PHPUnit\TestFixture\HookMethodsOrderTest::afterInParent +Test Finished (PHPUnit\TestFixture\HookMethodsOrderTest::testOne) +Test Suite Finished (PHPUnit\TestFixture\HookMethodsOrderTest, 1 test) Test Runner Execution Finished Test Runner Finished PHPUnit Finished (Shell Exit Code: 0) diff --git a/tests/end-to-end/metadata/targeting-traits-with-coversclass-attribute-is-deprecated.phpt b/tests/end-to-end/metadata/targeting-traits-with-coversclass-attribute-is-deprecated.phpt index ca1d878ff20..b3debf34b6b 100644 --- a/tests/end-to-end/metadata/targeting-traits-with-coversclass-attribute-is-deprecated.phpt +++ b/tests/end-to-end/metadata/targeting-traits-with-coversclass-attribute-is-deprecated.phpt @@ -10,9 +10,7 @@ $coverageFile = tempnam(sys_get_temp_dir(), __FILE__); $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; -$_SERVER['argv'][] = '--no-output'; -$_SERVER['argv'][] = '--log-events-text'; -$_SERVER['argv'][] = $traceFile; +$_SERVER['argv'][] = '--debug'; $_SERVER['argv'][] = '--coverage-text=' . $coverageFile; $_SERVER['argv'][] = '--coverage-filter'; $_SERVER['argv'][] = __DIR__ . '/../_files'; @@ -21,10 +19,6 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/TraitTargetedWithCoversClassTest.php' require __DIR__ . '/../../bootstrap.php'; (new PHPUnit\TextUI\Application)->run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); unlink($coverageFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) diff --git a/tests/end-to-end/metadata/targeting-traits-with-coversmethod-attribute-is-deprecated.phpt b/tests/end-to-end/metadata/targeting-traits-with-coversmethod-attribute-is-deprecated.phpt index f15886cbdc3..910112df5c3 100644 --- a/tests/end-to-end/metadata/targeting-traits-with-coversmethod-attribute-is-deprecated.phpt +++ b/tests/end-to-end/metadata/targeting-traits-with-coversmethod-attribute-is-deprecated.phpt @@ -10,9 +10,7 @@ $coverageFile = tempnam(sys_get_temp_dir(), __FILE__); $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; -$_SERVER['argv'][] = '--no-output'; -$_SERVER['argv'][] = '--log-events-text'; -$_SERVER['argv'][] = $traceFile; +$_SERVER['argv'][] = '--debug'; $_SERVER['argv'][] = '--coverage-text=' . $coverageFile; $_SERVER['argv'][] = '--coverage-filter'; $_SERVER['argv'][] = __DIR__ . '/../_files'; @@ -21,10 +19,6 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/TraitTargetedWithCoversMethodTest.php require __DIR__ . '/../../bootstrap.php'; (new PHPUnit\TextUI\Application)->run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); unlink($coverageFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) diff --git a/tests/end-to-end/metadata/targeting-traits-with-coverstrait-attribute-is-deprecated.phpt b/tests/end-to-end/metadata/targeting-traits-with-coverstrait-attribute-is-deprecated.phpt index 8c818a34bbb..8fb57c942b1 100644 --- a/tests/end-to-end/metadata/targeting-traits-with-coverstrait-attribute-is-deprecated.phpt +++ b/tests/end-to-end/metadata/targeting-traits-with-coverstrait-attribute-is-deprecated.phpt @@ -10,9 +10,7 @@ $coverageFile = tempnam(sys_get_temp_dir(), __FILE__); $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; -$_SERVER['argv'][] = '--no-output'; -$_SERVER['argv'][] = '--log-events-text'; -$_SERVER['argv'][] = $traceFile; +$_SERVER['argv'][] = '--debug'; $_SERVER['argv'][] = '--coverage-text=' . $coverageFile; $_SERVER['argv'][] = '--coverage-filter'; $_SERVER['argv'][] = __DIR__ . '/../_files'; @@ -21,10 +19,6 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/TraitTargetedWithCoversTraitTest.php' require __DIR__ . '/../../bootstrap.php'; (new PHPUnit\TextUI\Application)->run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/metadata/targeting-traits-with-usesclass-attribute-is-deprecated.phpt b/tests/end-to-end/metadata/targeting-traits-with-usesclass-attribute-is-deprecated.phpt index e09f87e53dd..d388212aecc 100644 --- a/tests/end-to-end/metadata/targeting-traits-with-usesclass-attribute-is-deprecated.phpt +++ b/tests/end-to-end/metadata/targeting-traits-with-usesclass-attribute-is-deprecated.phpt @@ -10,9 +10,7 @@ $coverageFile = tempnam(sys_get_temp_dir(), __FILE__); $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; -$_SERVER['argv'][] = '--no-output'; -$_SERVER['argv'][] = '--log-events-text'; -$_SERVER['argv'][] = $traceFile; +$_SERVER['argv'][] = '--debug'; $_SERVER['argv'][] = '--coverage-text=' . $coverageFile; $_SERVER['argv'][] = '--coverage-filter'; $_SERVER['argv'][] = __DIR__ . '/../_files'; @@ -21,10 +19,6 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/TraitTargetedWithUsesClassTest.php'; require __DIR__ . '/../../bootstrap.php'; (new PHPUnit\TextUI\Application)->run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); unlink($coverageFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) diff --git a/tests/end-to-end/metadata/targeting-traits-with-usesmethod-attribute-is-deprecated.phpt b/tests/end-to-end/metadata/targeting-traits-with-usesmethod-attribute-is-deprecated.phpt index 34e8813955c..01f8d1eace6 100644 --- a/tests/end-to-end/metadata/targeting-traits-with-usesmethod-attribute-is-deprecated.phpt +++ b/tests/end-to-end/metadata/targeting-traits-with-usesmethod-attribute-is-deprecated.phpt @@ -10,9 +10,7 @@ $coverageFile = tempnam(sys_get_temp_dir(), __FILE__); $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; -$_SERVER['argv'][] = '--no-output'; -$_SERVER['argv'][] = '--log-events-text'; -$_SERVER['argv'][] = $traceFile; +$_SERVER['argv'][] = '--debug'; $_SERVER['argv'][] = '--coverage-text=' . $coverageFile; $_SERVER['argv'][] = '--coverage-filter'; $_SERVER['argv'][] = __DIR__ . '/../_files'; @@ -21,10 +19,6 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/TraitTargetedWithUsesMethodTest.php'; require __DIR__ . '/../../bootstrap.php'; (new PHPUnit\TextUI\Application)->run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); unlink($coverageFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) diff --git a/tests/end-to-end/metadata/targeting-traits-with-usestrait-attribute-is-deprecated.phpt b/tests/end-to-end/metadata/targeting-traits-with-usestrait-attribute-is-deprecated.phpt index f6659509f9b..12e90f289ac 100644 --- a/tests/end-to-end/metadata/targeting-traits-with-usestrait-attribute-is-deprecated.phpt +++ b/tests/end-to-end/metadata/targeting-traits-with-usestrait-attribute-is-deprecated.phpt @@ -10,9 +10,7 @@ $coverageFile = tempnam(sys_get_temp_dir(), __FILE__); $_SERVER['argv'][] = '--do-not-cache-result'; $_SERVER['argv'][] = '--no-configuration'; -$_SERVER['argv'][] = '--no-output'; -$_SERVER['argv'][] = '--log-events-text'; -$_SERVER['argv'][] = $traceFile; +$_SERVER['argv'][] = '--debug'; $_SERVER['argv'][] = '--coverage-text=' . $coverageFile; $_SERVER['argv'][] = '--coverage-filter'; $_SERVER['argv'][] = __DIR__ . '/../_files'; @@ -21,10 +19,6 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/TraitTargetedWithUsesTraitTest.php'; require __DIR__ . '/../../bootstrap.php'; (new PHPUnit\TextUI\Application)->run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/metadata/test-size-configured-with-annotation.phpt b/tests/end-to-end/metadata/test-size-configured-with-annotation.phpt index e3195b2fafb..871cdccbb56 100644 --- a/tests/end-to-end/metadata/test-size-configured-with-annotation.phpt +++ b/tests/end-to-end/metadata/test-size-configured-with-annotation.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a successful test that has a size that is configured with annotation --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/end-to-end/regression/4232.phpt b/tests/end-to-end/regression/4232.phpt index b020d4e6bb6..be898dcb671 100644 --- a/tests/end-to-end/regression/4232.phpt +++ b/tests/end-to-end/regression/4232.phpt @@ -4,6 +4,8 @@ https://github.com/sebastianbergmann/phpunit/issues/4232 run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured +Bootstrap Finished (%sMyClassTest.php) Event Facade Sealed Data Provider Method Called (PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::provide for test method PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::test) Data Provider Method Finished for PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::test: diff --git a/tests/end-to-end/regression/5498.phpt b/tests/end-to-end/regression/5498.phpt index 166d81577d7..7fc1b4912d0 100644 --- a/tests/end-to-end/regression/5498.phpt +++ b/tests/end-to-end/regression/5498.phpt @@ -2,25 +2,20 @@ https://github.com/sebastianbergmann/phpunit/issues/5498 --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (%s) Test Runner Configured +Bootstrap Finished (%sTestCase.php) Event Facade Sealed Test Suite Loaded (1 test) Test Runner Started diff --git a/tests/end-to-end/regression/5807/phpunit.xml b/tests/end-to-end/regression/5807/phpunit.xml index 49c4d96c3bc..c298a260cbd 100644 --- a/tests/end-to-end/regression/5807/phpunit.xml +++ b/tests/end-to-end/regression/5807/phpunit.xml @@ -1,6 +1,7 @@ diff --git a/tests/end-to-end/self-direct-indirect/user-deprecation.phpt b/tests/end-to-end/self-direct-indirect/user-deprecation.phpt index 27ed002f19b..99c1dc06242 100644 --- a/tests/end-to-end/self-direct-indirect/user-deprecation.phpt +++ b/tests/end-to-end/self-direct-indirect/user-deprecation.phpt @@ -2,22 +2,14 @@ The right events are emitted in the right order for a test that runs code which triggers E_USER_DEPRECATED --FILE-- run($_SERVER['argv']); - -print file_get_contents($traceFile); - -unlink($traceFile); --EXPECTF-- PHPUnit Started (PHPUnit %s using %s) Test Runner Configured diff --git a/tests/static-analysis/happy-path/assert-not-empty.php b/tests/end-to-end/testdox/_files/bootstrap.php similarity index 56% rename from tests/static-analysis/happy-path/assert-not-empty.php rename to tests/end-to-end/testdox/_files/bootstrap.php index 323724b1918..cea41cada23 100644 --- a/tests/static-analysis/happy-path/assert-not-empty.php +++ b/tests/end-to-end/testdox/_files/bootstrap.php @@ -1,4 +1,5 @@ - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\StaticAnalysis; - -use PHPUnit\Framework\TestCase; - -/** @see https://www.youtube.com/watch?v=rXwMrBb2x1Q */ -interface SayHello -{ - public function hey(string $toPerson): string; -} - -/** @small */ -final class TestUsingCallbacks extends TestCase -{ - public function testWillSayHelloAndCheckCallbackInput(): void - { - $mock = $this->createMock(SayHello::class); - - $mock - ->expects(self::once()) - ->method('hey') - ->with(self::callback(static function (string $input): bool { - self::assertStringContainsString('Joe', $input); - - return true; - })) - ->willReturn('Hey Joe!'); - - self::assertSame('Hey Joe!', $mock->hey('Joe')); - } - - public function testWillSayHelloAndCheckCallbackWithoutAnyInput(): void - { - $mock = $this->createMock(SayHello::class); - - $mock - ->expects(self::once()) - ->method('hey') - ->with(self::callback(static fn(): bool => true)) - ->willReturn('Hey Joe!'); - - self::assertSame('Hey Joe!', $mock->hey('Joe')); - } -} diff --git a/tests/static-analysis/TestUsingMocks.php b/tests/static-analysis/TestUsingMocks.php deleted file mode 100644 index 24770e4c0d6..00000000000 --- a/tests/static-analysis/TestUsingMocks.php +++ /dev/null @@ -1,94 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\StaticAnalysis; - -use PHPUnit\Framework\TestCase; - -class HelloWorldClass -{ - public function sayHello(): string - { - return 'hello world!'; - } -} - -/** - * @small - */ -final class TestUsingMocks extends TestCase -{ - public function testWillSayHelloThroughCreateMock(): void - { - $mock = $this->createMock(HelloWorldClass::class); - - $mock - ->method('sayHello') - ->willReturn('hello mock!'); - - self::assertSame('hello mock!', $mock->sayHello()); - } - - public function testWillSayHelloThroughCreateStub(): void - { - $mock = $this->createStub(HelloWorldClass::class); - - $mock - ->method('sayHello') - ->willReturn('hello stub!'); - - self::assertSame('hello stub!', $mock->sayHello()); - } - - public function testWillSayHelloThroughCreateConfiguredMock(): void - { - $mock = $this->createConfiguredMock(HelloWorldClass::class, []); - - $mock - ->method('sayHello') - ->willReturn('hello mock!'); - - self::assertSame('hello mock!', $mock->sayHello()); - } - - public function testWillSayHelloThroughCreatePartialMock(): void - { - $mock = $this->createPartialMock(HelloWorldClass::class, []); - - $mock - ->method('sayHello') - ->willReturn('hello mock!'); - - self::assertSame('hello mock!', $mock->sayHello()); - } - - public function testWillSayHelloThroughCreateTestProxy(): void - { - $mock = $this->createTestProxy(HelloWorldClass::class, []); - - $mock - ->method('sayHello') - ->willReturn('hello mock!'); - - self::assertSame('hello mock!', $mock->sayHello()); - } - - public function testWillSayHelloThroughGetMockBuilder(): void - { - $mock = $this - ->getMockBuilder(HelloWorldClass::class) - ->getMock(); - - $mock - ->method('sayHello') - ->willReturn('hello mock!'); - - self::assertSame('hello mock!', $mock->sayHello()); - } -} diff --git a/tests/static-analysis/happy-path/assert-empty.php b/tests/static-analysis/happy-path/assert-empty.php deleted file mode 100644 index 24fd7749f48..00000000000 --- a/tests/static-analysis/happy-path/assert-empty.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath; - -use PHPUnit\Framework\Assert; - -/** @return null */ -function consume(?object $value) -{ - Assert::assertEmpty($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-false.php b/tests/static-analysis/happy-path/assert-false.php deleted file mode 100644 index 2278fb04264..00000000000 --- a/tests/static-analysis/happy-path/assert-false.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertFalse; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return false - */ -function consume($value) -{ - Assert::assertFalse($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-instance-of.php b/tests/static-analysis/happy-path/assert-instance-of.php deleted file mode 100644 index 5f098943917..00000000000 --- a/tests/static-analysis/happy-path/assert-instance-of.php +++ /dev/null @@ -1,19 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertInstanceOf; - -use PHPUnit\Framework\Assert; - -function consume(object $value): \stdClass -{ - Assert::assertInstanceOf(\stdClass::class, $value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-array.php b/tests/static-analysis/happy-path/assert-is-array.php deleted file mode 100644 index 2571be3e6ca..00000000000 --- a/tests/static-analysis/happy-path/assert-is-array.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsArray; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): array -{ - Assert::assertIsArray($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-bool.php b/tests/static-analysis/happy-path/assert-is-bool.php deleted file mode 100644 index 91617e741f7..00000000000 --- a/tests/static-analysis/happy-path/assert-is-bool.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsBool; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): bool -{ - Assert::assertIsBool($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-callable.php b/tests/static-analysis/happy-path/assert-is-callable.php deleted file mode 100644 index d331c76541c..00000000000 --- a/tests/static-analysis/happy-path/assert-is-callable.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsCallable; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): callable -{ - Assert::assertIsCallable($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-closed-resource.php b/tests/static-analysis/happy-path/assert-is-closed-resource.php deleted file mode 100644 index cf4efdb5d1a..00000000000 --- a/tests/static-analysis/happy-path/assert-is-closed-resource.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsClosedResource; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return resource - */ -function consume($value) -{ - Assert::assertIsClosedResource($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-float.php b/tests/static-analysis/happy-path/assert-is-float.php deleted file mode 100644 index 228f6fee2e6..00000000000 --- a/tests/static-analysis/happy-path/assert-is-float.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsFloat; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): float -{ - Assert::assertIsFloat($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-int.php b/tests/static-analysis/happy-path/assert-is-int.php deleted file mode 100644 index 8b72dfc5426..00000000000 --- a/tests/static-analysis/happy-path/assert-is-int.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsInt; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): int -{ - Assert::assertIsInt($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-iterable.php b/tests/static-analysis/happy-path/assert-is-iterable.php deleted file mode 100644 index 489472ccdb9..00000000000 --- a/tests/static-analysis/happy-path/assert-is-iterable.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsIterable; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): iterable -{ - Assert::assertIsIterable($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-array.php b/tests/static-analysis/happy-path/assert-is-not-array.php deleted file mode 100644 index 815987cb501..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-array.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotArray; - -use PHPUnit\Framework\Assert; - -/** @param array|int $value */ -function consume($value): int -{ - Assert::assertIsNotArray($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-bool.php b/tests/static-analysis/happy-path/assert-is-not-bool.php deleted file mode 100644 index b0c7b4c72f1..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-bool.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotBool; - -use PHPUnit\Framework\Assert; - -/** @param bool|int $value */ -function consume($value): int -{ - Assert::assertIsNotBool($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-callable.php b/tests/static-analysis/happy-path/assert-is-not-callable.php deleted file mode 100644 index 853b7b810e8..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-callable.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsCallable; - -use PHPUnit\Framework\Assert; - -/** @param callable|int $value */ -function consume($value): int -{ - Assert::assertIsNotCallable($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-closed-resource.php b/tests/static-analysis/happy-path/assert-is-not-closed-resource.php deleted file mode 100644 index f04171266fe..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-closed-resource.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotClosedResource; - -use PHPUnit\Framework\Assert; - -/** @param int|resource $value */ -function consume($value): int -{ - Assert::assertIsNotClosedResource($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-float.php b/tests/static-analysis/happy-path/assert-is-not-float.php deleted file mode 100644 index 6ef3d47225a..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-float.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotFloat; - -use PHPUnit\Framework\Assert; - -/** @param float|int $value */ -function consume($value): int -{ - Assert::assertIsNotFloat($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-int.php b/tests/static-analysis/happy-path/assert-is-not-int.php deleted file mode 100644 index 5787921339c..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-int.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotInt; - -use PHPUnit\Framework\Assert; - -/** @param float|int $value */ -function consume($value): float -{ - Assert::assertIsNotInt($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-iterable.php b/tests/static-analysis/happy-path/assert-is-not-iterable.php deleted file mode 100644 index 0cb93f22593..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-iterable.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotIterable; - -use PHPUnit\Framework\Assert; - -/** @param int|iterable $value */ -function consume($value): int -{ - Assert::assertIsNotIterable($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-numeric.php b/tests/static-analysis/happy-path/assert-is-not-numeric.php deleted file mode 100644 index c1d63c2e2ba..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-numeric.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotNumeric; - -use PHPUnit\Framework\Assert; - -/** @param array|numeric $value */ -function consume($value): array -{ - Assert::assertIsNotNumeric($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-object.php b/tests/static-analysis/happy-path/assert-is-not-object.php deleted file mode 100644 index 87056210295..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-object.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotObject; - -use PHPUnit\Framework\Assert; - -/** @param int|object $value */ -function consume($value): int -{ - Assert::assertIsNotObject($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-resource.php b/tests/static-analysis/happy-path/assert-is-not-resource.php deleted file mode 100644 index 882f711ef7c..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-resource.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotResource; - -use PHPUnit\Framework\Assert; - -/** @param int|resource $value */ -function consume($value): int -{ - Assert::assertIsNotResource($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-scalar.php b/tests/static-analysis/happy-path/assert-is-not-scalar.php deleted file mode 100644 index 361264eb463..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-scalar.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotScalar; - -use PHPUnit\Framework\Assert; - -/** @param object|scalar $value */ -function consume($value): object -{ - Assert::assertIsNotScalar($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-not-string.php b/tests/static-analysis/happy-path/assert-is-not-string.php deleted file mode 100644 index 045510f18a0..00000000000 --- a/tests/static-analysis/happy-path/assert-is-not-string.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNotString; - -use PHPUnit\Framework\Assert; - -/** @param int|string $value */ -function consume($value): int -{ - Assert::assertIsNotString($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-numeric.php b/tests/static-analysis/happy-path/assert-is-numeric.php deleted file mode 100644 index 17e0f3739f9..00000000000 --- a/tests/static-analysis/happy-path/assert-is-numeric.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsNumeric; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return numeric - */ -function consume($value) -{ - Assert::assertIsNumeric($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-object.php b/tests/static-analysis/happy-path/assert-is-object.php deleted file mode 100644 index 33a132ab6be..00000000000 --- a/tests/static-analysis/happy-path/assert-is-object.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsObject; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): object -{ - Assert::assertIsObject($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-resource.php b/tests/static-analysis/happy-path/assert-is-resource.php deleted file mode 100644 index 8cfc606fd9e..00000000000 --- a/tests/static-analysis/happy-path/assert-is-resource.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsResource; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return resource - */ -function consume($value) -{ - Assert::assertIsResource($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-scalar.php b/tests/static-analysis/happy-path/assert-is-scalar.php deleted file mode 100644 index eb4da9fd063..00000000000 --- a/tests/static-analysis/happy-path/assert-is-scalar.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsScalar; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return scalar - */ -function consume($value) -{ - Assert::assertIsScalar($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-is-string.php b/tests/static-analysis/happy-path/assert-is-string.php deleted file mode 100644 index a15fcf148d2..00000000000 --- a/tests/static-analysis/happy-path/assert-is-string.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertIsString; - -use PHPUnit\Framework\Assert; - -/** @param mixed $value */ -function consume($value): string -{ - Assert::assertIsString($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-not-false.php b/tests/static-analysis/happy-path/assert-not-false.php deleted file mode 100644 index 582c7dcc416..00000000000 --- a/tests/static-analysis/happy-path/assert-not-false.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertNotFalse; - -use PHPUnit\Framework\Assert; - -/** @param false|int $value */ -function consume($value): int -{ - Assert::assertNotFalse($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-not-instance-of.php b/tests/static-analysis/happy-path/assert-not-instance-of.php deleted file mode 100644 index 88d981657c4..00000000000 --- a/tests/static-analysis/happy-path/assert-not-instance-of.php +++ /dev/null @@ -1,27 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertNotInstanceOf; - -use PHPUnit\Framework\Assert; - -class A -{ -} -class B -{ -} - -/** @param A|B $value */ -function consume(object $value): B -{ - Assert::assertNotInstanceOf(A::class, $value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-not-true.php b/tests/static-analysis/happy-path/assert-not-true.php deleted file mode 100644 index ba43275cfe1..00000000000 --- a/tests/static-analysis/happy-path/assert-not-true.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertNotTrue; - -use PHPUnit\Framework\Assert; - -/** @param int|true $value */ -function consume($value): int -{ - Assert::assertNotTrue($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-null.php b/tests/static-analysis/happy-path/assert-null.php deleted file mode 100644 index b7696b17327..00000000000 --- a/tests/static-analysis/happy-path/assert-null.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertNull; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return null - */ -function consume($value) -{ - Assert::assertNull($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/assert-same.php b/tests/static-analysis/happy-path/assert-same.php deleted file mode 100644 index ae6ddaecf3a..00000000000 --- a/tests/static-analysis/happy-path/assert-same.php +++ /dev/null @@ -1,19 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertSame; - -use PHPUnit\Framework\Assert; - -function consume(\stdClass $a, object $b): \stdClass -{ - Assert::assertSame($a, $b); - - return $b; -} diff --git a/tests/static-analysis/happy-path/assert-true.php b/tests/static-analysis/happy-path/assert-true.php deleted file mode 100644 index 5ee070111f3..00000000000 --- a/tests/static-analysis/happy-path/assert-true.php +++ /dev/null @@ -1,24 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertTrue; - -use PHPUnit\Framework\Assert; - -/** - * @param mixed $value - * - * @return true - */ -function consume($value): bool -{ - Assert::assertTrue($value); - - return $value; -} diff --git a/tests/static-analysis/happy-path/fail.php b/tests/static-analysis/happy-path/fail.php deleted file mode 100644 index 100d2980918..00000000000 --- a/tests/static-analysis/happy-path/fail.php +++ /dev/null @@ -1,22 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace PHPUnit\Framework\StaticAnalysis\HappyPath\AssertEmpty\Fail; - -use PHPUnit\Framework\Assert; - -/** @param int|string $value */ -function consume($value): int -{ - if (\is_string($value)) { - Assert::fail(); - } - - return $value; -} diff --git a/tests/unit/Framework/Constraint/String/StringMatchesFormatDescriptionTest.php b/tests/unit/Framework/Constraint/String/StringMatchesFormatDescriptionTest.php index 1557f9dc61c..c34ab37426a 100644 --- a/tests/unit/Framework/Constraint/String/StringMatchesFormatDescriptionTest.php +++ b/tests/unit/Framework/Constraint/String/StringMatchesFormatDescriptionTest.php @@ -141,12 +141,12 @@ public function testConstraintStringMatchesFloat(): void $this->assertFalse($constraint->evaluate('**', '', true)); $this->assertFalse($constraint->evaluate('***', '', true)); $this->assertFalse($constraint->evaluate('*a*', '', true)); + $this->assertFalse($constraint->evaluate('*1.*', '', true)); $this->assertTrue($constraint->evaluate('*1.0*', '', true)); $this->assertTrue($constraint->evaluate('*0*', '', true)); $this->assertTrue($constraint->evaluate('*12*', '', true)); $this->assertTrue($constraint->evaluate('*.1*', '', true)); - $this->assertTrue($constraint->evaluate('*1.*', '', true)); $this->assertTrue($constraint->evaluate('*2e3*', '', true)); $this->assertTrue($constraint->evaluate('*-2.34e-56*', '', true)); $this->assertTrue($constraint->evaluate('*+2.34e+56*', '', true)); diff --git a/tests/unit/Metadata/Api/CodeCoverageTest.php b/tests/unit/Metadata/Api/CodeCoverageTest.php index 696f361d6f1..1f6b90f4f7d 100644 --- a/tests/unit/Metadata/Api/CodeCoverageTest.php +++ b/tests/unit/Metadata/Api/CodeCoverageTest.php @@ -34,7 +34,6 @@ use PHPUnit\TestFixture\CoverageMethodTest; use PHPUnit\TestFixture\CoverageNamespacedFunctionTest; use PHPUnit\TestFixture\CoverageNoneTest; -use PHPUnit\TestFixture\CoverageTraitMethodTest; use PHPUnit\TestFixture\CoveredClassUsingCoveredTraitTest; use PHPUnit\TestFixture\InterfaceAsTargetWithAttributeTest; use PHPUnit\TestFixture\InterfaceTargetTest; @@ -219,14 +218,6 @@ public static function linesToBeCoveredProvider(): array Test3194::class, 'testOne', ], - - [ - [ - TEST_FILES_PATH . 'CoveredTrait.php' => range(14, 17), - ], - CoverageTraitMethodTest::class, - 'testSomething', - ], ]; } @@ -353,14 +344,6 @@ public static function linesToBeUsedProvider(): array CoverageNamespacedFunctionTest::class, 'testFunc', ], - - [ - [ - TEST_FILES_PATH . 'CoveredTrait.php' => range(14, 17), - ], - CoverageTraitMethodTest::class, - 'testSomething', - ], ]; } diff --git a/tools/phpab b/tools/phpab index e67d3430e2a..01e881632c9 100755 --- a/tools/phpab +++ b/tools/phpab @@ -150,22 +150,22 @@ spl_autoload_register( ); Phar::mapPhar('phpab.phar'); -define('PHPAB_VERSION', '1.29.1'); +define('PHPAB_VERSION', '1.29.2'); $factory = new \TheSeer\Autoload\Factory(); $factory->getCLI()->run($_SERVER); exit(0); __HALT_COMPILER(); ?> �*� -phpab.phar8vendor/theseer/directoryscanner/src/directoryscanner.php�"8�/fG �P��7vendor/theseer/directoryscanner/src/filesonlyfilter.php� -8�/f���;l�<vendor/theseer/directoryscanner/src/includeexcludefilter.php�8�/f~���Ť1vendor/theseer/directoryscanner/src/phpfilter.php -8�/f�\�n;�'vendor/zetacomponents/base/src/base.php�Y8�/f��\��0vendor/zetacomponents/base/src/base_autoload.phpN8�/f@��¬�Lvendor/zetacomponents/base/src/exceptions/double_class_repository_prefix.phpV8�/f3��w�7vendor/zetacomponents/base/src/exceptions/exception.php�8�/f CTs�Avendor/zetacomponents/base/src/exceptions/extension_not_found.php68�/f�~�9 �<vendor/zetacomponents/base/src/exceptions/file_exception.php-8�/f����5vendor/zetacomponents/base/src/exceptions/file_io.php�8�/f�O��;�<vendor/zetacomponents/base/src/exceptions/file_not_found.phpJ8�/f*T]DX�=vendor/zetacomponents/base/src/exceptions/file_permission.php� 8�/f�D�g7�Ivendor/zetacomponents/base/src/exceptions/functionality_not_supported.php>8�/f� V&J�Fvendor/zetacomponents/base/src/exceptions/init_callback_configured.php�8�/f�: ��Dvendor/zetacomponents/base/src/exceptions/invalid_callback_class.php_8�/f� -Z»�Bvendor/zetacomponents/base/src/exceptions/invalid_parent_class.phpE8�/f����@vendor/zetacomponents/base/src/exceptions/property_not_found.php�8�/f�"�yA�Avendor/zetacomponents/base/src/exceptions/property_permission.phpf8�/fV>�D��?vendor/zetacomponents/base/src/exceptions/setting_not_found.phpT8�/f�H[Y�;vendor/zetacomponents/base/src/exceptions/setting_value.php[8�/f���3vendor/zetacomponents/base/src/exceptions/value.php�8�/f���.Ѥ6vendor/zetacomponents/base/src/exceptions/whatever.php 8�/f�8�K�0vendor/zetacomponents/base/src/ezc_bootstrap.php�8�/fP–~P�+vendor/zetacomponents/base/src/features.php�.8�/f� -'��'vendor/zetacomponents/base/src/file.phpIH8�/f���u�'vendor/zetacomponents/base/src/init.phpV8�/flko��Gvendor/zetacomponents/base/src/interfaces/configuration_initializer.php�8�/f�E��8vendor/zetacomponents/base/src/interfaces/exportable.php�8�/f=���5�9vendor/zetacomponents/base/src/interfaces/persistable.php�8�/f7�J �+vendor/zetacomponents/base/src/metadata.php�8�/f���b��0vendor/zetacomponents/base/src/metadata/pear.php8�/f��<���3vendor/zetacomponents/base/src/metadata/tarball.php8�/f�� g^�*vendor/zetacomponents/base/src/options.php�8�/f���K�)vendor/zetacomponents/base/src/struct.php?8�/f�t����<vendor/zetacomponents/base/src/structs/file_find_context.php� 8�/f�-�њ�?vendor/zetacomponents/base/src/structs/repository_directory.php 8�/fE�8'U�<vendor/zetacomponents/console-tools/src/console_autoload.phpr8�/f��i�>vendor/zetacomponents/console-tools/src/dialog/menu_dialog.php�8�/f �w�ԤBvendor/zetacomponents/console-tools/src/dialog/question_dialog.php�"8�/f� ��t��Qvendor/zetacomponents/console-tools/src/dialog/validators/menu_dialog_default.php�8�/f+��Xvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_collection.php�8�/fwO��N�Uvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_mapping.php8�/f���F�Svendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_regex.php�8�/f���{�Rvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_type.phpC8�/f(���9vendor/zetacomponents/console-tools/src/dialog_viewer.php" -8�/f7R28��?vendor/zetacomponents/console-tools/src/exceptions/argument.php�8�/f�X� ΤRvendor/zetacomponents/console-tools/src/exceptions/argument_already_registered.phpE 8�/f�/wm'�Svendor/zetacomponents/console-tools/src/exceptions/argument_mandatory_violation.php�8�/f���Hvendor/zetacomponents/console-tools/src/exceptions/argument_too_many.php�8�/f'Y�ۤNvendor/zetacomponents/console-tools/src/exceptions/argument_type_violation.phps8�/fr[�:M�Cvendor/zetacomponents/console-tools/src/exceptions/dialog_abort.php�8�/f�"��@vendor/zetacomponents/console-tools/src/exceptions/exception.php�8�/fN[� �Jvendor/zetacomponents/console-tools/src/exceptions/invalid_option_name.php8�/f�d��Lvendor/zetacomponents/console-tools/src/exceptions/invalid_output_target.php�8�/f�]vmw�Ivendor/zetacomponents/console-tools/src/exceptions/no_position_stored.php�8�/f��RGy�Mvendor/zetacomponents/console-tools/src/exceptions/no_valid_dialog_result.php�8�/f�X���=vendor/zetacomponents/console-tools/src/exceptions/option.php�8�/f�}��Y�Pvendor/zetacomponents/console-tools/src/exceptions/option_already_registered.php�8�/f�-/ߤQvendor/zetacomponents/console-tools/src/exceptions/option_arguments_violation.php�8�/f ~x��Rvendor/zetacomponents/console-tools/src/exceptions/option_dependency_violation.php8�/fn�����Qvendor/zetacomponents/console-tools/src/exceptions/option_exclusion_violation.php8�/feV��m�Qvendor/zetacomponents/console-tools/src/exceptions/option_mandatory_violation.phph8�/f�YXpA�Kvendor/zetacomponents/console-tools/src/exceptions/option_missing_value.php�8�/fF�^�Fvendor/zetacomponents/console-tools/src/exceptions/option_no_alias.php 8�/f�����Hvendor/zetacomponents/console-tools/src/exceptions/option_not_exists.php$8�/f�6E��Svendor/zetacomponents/console-tools/src/exceptions/option_string_not_wellformed.php 8�/f��0���Mvendor/zetacomponents/console-tools/src/exceptions/option_too_many_values.phpw8�/f ����Lvendor/zetacomponents/console-tools/src/exceptions/option_type_violation.php8�/f��D/�1vendor/zetacomponents/console-tools/src/input.php��8�/fy&Ǖ��:vendor/zetacomponents/console-tools/src/input/argument.php�8�/f�h"��;vendor/zetacomponents/console-tools/src/input/arguments.phpt"8�/f�ث��Jvendor/zetacomponents/console-tools/src/input/help_generators/standard.php98�/f�B�j�8vendor/zetacomponents/console-tools/src/input/option.phpJO8�/f��N��Evendor/zetacomponents/console-tools/src/input/validators/standard.php�8�/fx��=vendor/zetacomponents/console-tools/src/interfaces/dialog.phpT 8�/f/Z;�Gvendor/zetacomponents/console-tools/src/interfaces/dialog_validator.php�8�/f� ��5�Kvendor/zetacomponents/console-tools/src/interfaces/input_help_generator.php8�/fa��Ӂ�Fvendor/zetacomponents/console-tools/src/interfaces/input_validator.phpy8�/fbutov�Lvendor/zetacomponents/console-tools/src/interfaces/menu_dialog_validator.php�8�/f���T�Pvendor/zetacomponents/console-tools/src/interfaces/question_dialog_validator.php8�/f��&c֤:vendor/zetacomponents/console-tools/src/options/dialog.php2 8�/f*�Y�?vendor/zetacomponents/console-tools/src/options/menu_dialog.php�8�/fw1v�f�:vendor/zetacomponents/console-tools/src/options/output.php�8�/f�0ِI�?vendor/zetacomponents/console-tools/src/options/progressbar.php�8�/fl�e�%�Cvendor/zetacomponents/console-tools/src/options/progressmonitor.phpF 8�/f�� ��Cvendor/zetacomponents/console-tools/src/options/question_dialog.php�8�/fN�ia�=vendor/zetacomponents/console-tools/src/options/statusbar.php� 8�/f�p�~[�9vendor/zetacomponents/console-tools/src/options/table.phpL"8�/fieK��2vendor/zetacomponents/console-tools/src/output.php�M8�/f�W��?�7vendor/zetacomponents/console-tools/src/progressbar.php�:8�/f[m|��;vendor/zetacomponents/console-tools/src/progressmonitor.phpZ8�/f���q�5vendor/zetacomponents/console-tools/src/statusbar.php 8�/f[ ��rM�?vendor/zetacomponents/console-tools/src/structs/option_rule.php�8�/f� ��Avendor/zetacomponents/console-tools/src/structs/output_format.phpk8�/fb�+-�Bvendor/zetacomponents/console-tools/src/structs/output_formats.php�8�/fb!-�1vendor/zetacomponents/console-tools/src/table.phpBt8�/fr�e�5�6vendor/zetacomponents/console-tools/src/table/cell.php8�/f(Կ�5vendor/zetacomponents/console-tools/src/table/row.php�08�/f� -/���8vendor/zetacomponents/console-tools/src/tools/string.php�8�/f���F)�phpab/Application.phpJ&8�/f� ��l�phpab/AutoloadRenderer.phpc#8�/f� -��� phpab/CLI.php�_8�/f@�]�phpab/Cache.php@8�/f� "9��phpab/CacheEntry.php�8�/f���Ф"phpab/CacheWarmingListRenderer.php�8�/fry?���phpab/CachingParser.php�8�/fOI!��phpab/Collector.php� 8�/f7��6�phpab/CollectorResult.phpT 8�/f~�-���phpab/ComposerIterator.php{8�/f�㻂�phpab/Config.phpR48�/f ���)�phpab/DependencySorter.phpm8�/f{ɢ�p�phpab/Factory.php� 8�/f��#�T�phpab/Logger.php�8�/f,�I9~�phpab/ParseResult.phpg8�/fX�ߪ�phpab/Parser.phpT8�/f��>_�phpab/ParserInterface.php8�/f���phpab/PathComparator.phpw8�/f�`=Τphpab/PharBuilder.phpg8�/fN61_�phpab/SourceFile.php�8�/f��%��phpab/StaticListRenderer.php�8�/fy���phpab/StaticRenderer.php�8�/f��}xȤ#phpab/StaticRequireListRenderer.php"8�/fLX��O�phpab/Version.php� -8�/f���j�"phpab/templates/ci/default.php.tpl8�/f /]i�phpab/templates/ci/phar.php.tpl�8�/f�~���� phpab/templates/ci/php52.php.tpl�8�/f^@�N�"phpab/templates/cs/default.php.tpl�8�/f�Bw#��phpab/templates/cs/phar.php.tpl�8�/f��2q$� phpab/templates/cs/php52.php.tpl�8�/f&�Nˤphpab/templates/static.php.tpl�8�/fn휺��"phpab/templates/staticphar.php.tplW8�/fY�.�֤�Yms�8��_ї���f���%��q@Հ��&���Uʱ��H�$�R{s��J� �@����U_�����ӭ����������_��t:SЈ���ݻ�����OG0��,b(���#���}q��/Z��20�J����Q�c�J%���J9��%��)ɗ"F��>e�x� sق�T̀ �ϗ +phpab.phar8vendor/theseer/directoryscanner/src/directoryscanner.php�"rgG �P��7vendor/theseer/directoryscanner/src/filesonlyfilter.php� +rg���;l�<vendor/theseer/directoryscanner/src/includeexcludefilter.php�rg~���Ť1vendor/theseer/directoryscanner/src/phpfilter.php +rg�\�n;�'vendor/zetacomponents/base/src/base.php�Yrg��\��0vendor/zetacomponents/base/src/base_autoload.phpNrg@��¬�Lvendor/zetacomponents/base/src/exceptions/double_class_repository_prefix.phpVrg3��w�7vendor/zetacomponents/base/src/exceptions/exception.php�rg CTs�Avendor/zetacomponents/base/src/exceptions/extension_not_found.php6rg�~�9 �<vendor/zetacomponents/base/src/exceptions/file_exception.php-rg����5vendor/zetacomponents/base/src/exceptions/file_io.php�rg�O��;�<vendor/zetacomponents/base/src/exceptions/file_not_found.phpJrg*T]DX�=vendor/zetacomponents/base/src/exceptions/file_permission.php� rg�D�g7�Ivendor/zetacomponents/base/src/exceptions/functionality_not_supported.php>rg� V&J�Fvendor/zetacomponents/base/src/exceptions/init_callback_configured.php�rg�: ��Dvendor/zetacomponents/base/src/exceptions/invalid_callback_class.php_rg� +Z»�Bvendor/zetacomponents/base/src/exceptions/invalid_parent_class.phpErg����@vendor/zetacomponents/base/src/exceptions/property_not_found.php�rg�"�yA�Avendor/zetacomponents/base/src/exceptions/property_permission.phpfrgV>�D��?vendor/zetacomponents/base/src/exceptions/setting_not_found.phpTrg�H[Y�;vendor/zetacomponents/base/src/exceptions/setting_value.php[rg���3vendor/zetacomponents/base/src/exceptions/value.php�rg���.Ѥ6vendor/zetacomponents/base/src/exceptions/whatever.php rg�8�K�0vendor/zetacomponents/base/src/ezc_bootstrap.php�rgP–~P�+vendor/zetacomponents/base/src/features.php�.rg� +'��'vendor/zetacomponents/base/src/file.phpIHrg���u�'vendor/zetacomponents/base/src/init.phpVrglko��Gvendor/zetacomponents/base/src/interfaces/configuration_initializer.php�rg�E��8vendor/zetacomponents/base/src/interfaces/exportable.php�rg=���5�9vendor/zetacomponents/base/src/interfaces/persistable.php�rg7�J �+vendor/zetacomponents/base/src/metadata.php�rg���b��0vendor/zetacomponents/base/src/metadata/pear.phprg��<���3vendor/zetacomponents/base/src/metadata/tarball.phprg�� g^�*vendor/zetacomponents/base/src/options.php�rg���K�)vendor/zetacomponents/base/src/struct.php?rg�t����<vendor/zetacomponents/base/src/structs/file_find_context.php� rg�-�њ�?vendor/zetacomponents/base/src/structs/repository_directory.php rgE�8'U�<vendor/zetacomponents/console-tools/src/console_autoload.phprrg��i�>vendor/zetacomponents/console-tools/src/dialog/menu_dialog.php�rg �w�ԤBvendor/zetacomponents/console-tools/src/dialog/question_dialog.php�"rg� ��t��Qvendor/zetacomponents/console-tools/src/dialog/validators/menu_dialog_default.php�rg+��Xvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_collection.php�rgwO��N�Uvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_mapping.phprg���F�Svendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_regex.php�rg���{�Rvendor/zetacomponents/console-tools/src/dialog/validators/question_dialog_type.phpCrg(���9vendor/zetacomponents/console-tools/src/dialog_viewer.php" +rg7R28��?vendor/zetacomponents/console-tools/src/exceptions/argument.php�rg�X� ΤRvendor/zetacomponents/console-tools/src/exceptions/argument_already_registered.phpE rg�/wm'�Svendor/zetacomponents/console-tools/src/exceptions/argument_mandatory_violation.php�rg���Hvendor/zetacomponents/console-tools/src/exceptions/argument_too_many.php�rg'Y�ۤNvendor/zetacomponents/console-tools/src/exceptions/argument_type_violation.phpsrgr[�:M�Cvendor/zetacomponents/console-tools/src/exceptions/dialog_abort.php�rg�"��@vendor/zetacomponents/console-tools/src/exceptions/exception.php�rgN[� �Jvendor/zetacomponents/console-tools/src/exceptions/invalid_option_name.phprg�d��Lvendor/zetacomponents/console-tools/src/exceptions/invalid_output_target.php�rg�]vmw�Ivendor/zetacomponents/console-tools/src/exceptions/no_position_stored.php�rg��RGy�Mvendor/zetacomponents/console-tools/src/exceptions/no_valid_dialog_result.php�rg�X���=vendor/zetacomponents/console-tools/src/exceptions/option.php�rg�}��Y�Pvendor/zetacomponents/console-tools/src/exceptions/option_already_registered.php�rg�-/ߤQvendor/zetacomponents/console-tools/src/exceptions/option_arguments_violation.php�rg ~x��Rvendor/zetacomponents/console-tools/src/exceptions/option_dependency_violation.phprgn�����Qvendor/zetacomponents/console-tools/src/exceptions/option_exclusion_violation.phprgeV��m�Qvendor/zetacomponents/console-tools/src/exceptions/option_mandatory_violation.phphrg�YXpA�Kvendor/zetacomponents/console-tools/src/exceptions/option_missing_value.php�rgF�^�Fvendor/zetacomponents/console-tools/src/exceptions/option_no_alias.php rg�����Hvendor/zetacomponents/console-tools/src/exceptions/option_not_exists.php$rg�6E��Svendor/zetacomponents/console-tools/src/exceptions/option_string_not_wellformed.php rg��0���Mvendor/zetacomponents/console-tools/src/exceptions/option_too_many_values.phpwrg ����Lvendor/zetacomponents/console-tools/src/exceptions/option_type_violation.phprg��D/�1vendor/zetacomponents/console-tools/src/input.php��rgy&Ǖ��:vendor/zetacomponents/console-tools/src/input/argument.php�rg�h"��;vendor/zetacomponents/console-tools/src/input/arguments.phpt"rg�ث��Jvendor/zetacomponents/console-tools/src/input/help_generators/standard.php9rg�B�j�8vendor/zetacomponents/console-tools/src/input/option.phpJOrg��N��Evendor/zetacomponents/console-tools/src/input/validators/standard.php�rgx��=vendor/zetacomponents/console-tools/src/interfaces/dialog.phpT rg/Z;�Gvendor/zetacomponents/console-tools/src/interfaces/dialog_validator.php�rg� ��5�Kvendor/zetacomponents/console-tools/src/interfaces/input_help_generator.phprga��Ӂ�Fvendor/zetacomponents/console-tools/src/interfaces/input_validator.phpyrgbutov�Lvendor/zetacomponents/console-tools/src/interfaces/menu_dialog_validator.php�rg���T�Pvendor/zetacomponents/console-tools/src/interfaces/question_dialog_validator.phprg��&c֤:vendor/zetacomponents/console-tools/src/options/dialog.php2 rg*�Y�?vendor/zetacomponents/console-tools/src/options/menu_dialog.php�rgw1v�f�:vendor/zetacomponents/console-tools/src/options/output.php�rg�0ِI�?vendor/zetacomponents/console-tools/src/options/progressbar.php�rgl�e�%�Cvendor/zetacomponents/console-tools/src/options/progressmonitor.phpF rg�� ��Cvendor/zetacomponents/console-tools/src/options/question_dialog.php�rgN�ia�=vendor/zetacomponents/console-tools/src/options/statusbar.php� rg�p�~[�9vendor/zetacomponents/console-tools/src/options/table.phpL"rgieK��2vendor/zetacomponents/console-tools/src/output.php�Mrg�W��?�7vendor/zetacomponents/console-tools/src/progressbar.php�:rg[m|��;vendor/zetacomponents/console-tools/src/progressmonitor.phpZrg���q�5vendor/zetacomponents/console-tools/src/statusbar.php rg[ ��rM�?vendor/zetacomponents/console-tools/src/structs/option_rule.php�rg� ��Avendor/zetacomponents/console-tools/src/structs/output_format.phpkrgb�+-�Bvendor/zetacomponents/console-tools/src/structs/output_formats.php�rgb!-�1vendor/zetacomponents/console-tools/src/table.phpBtrgr�e�5�6vendor/zetacomponents/console-tools/src/table/cell.phprg(Կ�5vendor/zetacomponents/console-tools/src/table/row.php�0rg� +/���8vendor/zetacomponents/console-tools/src/tools/string.php�rg���F)�phpab/Application.phpJ&rg� ��l�phpab/AutoloadRenderer.phpc#rg� +��� phpab/CLI.php�_rg@�]�phpab/Cache.php@rg� "9��phpab/CacheEntry.php�rg���Ф"phpab/CacheWarmingListRenderer.php�rgry?���phpab/CachingParser.php�rgOI!��phpab/Collector.php� rg7��6�phpab/CollectorResult.phpT rg~�-���phpab/ComposerIterator.php{rg�㻂�phpab/Config.phpR4rg ���)�phpab/DependencySorter.phpmrg{ɢ�p�phpab/Factory.php� rg��#�T�phpab/Logger.php�rg,�I9~�phpab/ParseResult.phpgrgX�ߪ�phpab/Parser.phpnTrg�����phpab/ParserInterface.phprg���phpab/PathComparator.phpwrg�`=Τphpab/PharBuilder.phpgrgN61_�phpab/SourceFile.php�rg��%��phpab/StaticListRenderer.php�rgy���phpab/StaticRenderer.php�rg��}xȤ#phpab/StaticRequireListRenderer.php"rgLX��O�phpab/Version.php� +rg���j�"phpab/templates/ci/default.php.tplrg /]i�phpab/templates/ci/phar.php.tpl�rg�~���� phpab/templates/ci/php52.php.tpl�rg^@�N�"phpab/templates/cs/default.php.tpl�rg�Bw#��phpab/templates/cs/phar.php.tpl�rg��2q$� phpab/templates/cs/php52.php.tpl�rg&�Nˤphpab/templates/static.php.tpl�rgn휺��"phpab/templates/staticphar.php.tplWrgY�.�֤�Yms�8��_ї���f���%��q@Հ��&���Uʱ��H�$�R{s��J� �@����U_�����ӭ����������_��t:SЈ���ݻ�����OG0��,b(���#���}q��/Z��20�J����Q�c�J%���J9��%��)ɗ"F��>e�x� sق�T̀ �ϗ ���h@In�wܐ���� �]�^��r6�tHC҅�k妑���`H�N�qC�hxkf����3�<9~H;��kM��?�b���C��{ ��rM���3�D �_��^P�r@���[�R�tB�l}ա]�Π��t�� ��p4p�[���5��ۘ�!u�u�� �Q!�ŽvRg쓡6��iU��2i8 \y^�0��vHp/0č҂�:-�~�{=���rP͟�Eݐ��xR�mB߻!�ć�3H�p��s�'���j2�+Zp�'a��@]��5q��#}� �#=B�K`�%WzE��o=���iB˧�C��o�[���q�8 �e)�[Ƶ@{�t��6>lB� j���A0��-�������h�zYuS����%�#�P���R͸0ˮ^e���n5$Z�*|���4�]]��{��7Sjq�nOS5[ޟ�|�V3����N���d�E#�3 ���8���Hk6ul���B��Ҏ�p�4� ��4}D�߾H�sXDj�έ�}���E�I�)mI�V�\fJ�}��"g��8[&y����z)��I+T��+�]�cu=��IV���a$� ~�����?�")�� z��\�����/�v���a�UX)1S� p��^JO۫�� @@ -940,22 +940,15 @@ Q ((�{\�3����(;M7N0�Mr�W,!# �"dv�$Å@y|�S�#�/rĖ1Cʂ��Y�B�C���s��:�Hi��<���� D���YT�cvOR�o �< Wr�@�J����)�&�'%'A��E �+���f��c)*9΢ִ�9��lp�� <̰�a��Wq9�`$�����L�$ ���.Rviz ���b�����@ː~,Z��~x��I,-�)���{���srh:^�����ɸ���ܨp�P�Mcd�e�����s/���V� ��G/�6�R���&<�|?���[f'+b��R���6|��S�H� 7����Z�vV?J����^+���� ��:|Q+[X�|�V'�G�~�� -�}W�7�ӧ�t�۾�����Q�,\r�> ��7����~�1��Y�������va��h)^��k��{�>�|o����_����U�Ƈ` �Ͽa�2z��S�n�@�����6�nkk�������L�Q6�e3�k���A¥�v��{oO/:с�=���+�O"^͝�� c8�H��@6� �R{�(��x\�a �d0���-��Ť:k��#��5� Ȍ�a4���T��>>7�����Áj�����G��O,�0�G����/����9��� �4A7@;5u�PF����F��d���w�xbqi� �3�R`靈4U��8S���2��cm�Y�|���'� -������b ���� -��@3�CE;S]�F0�A���,0O��P�1��."A���ML5�*�s�O-h'� >hH|�UB7M-V��I�4�~�2ޭl�ƾ&���ux�=���u�(_n�<ʻ̪���)�@��s�3Nѱ9�a�s~����6fe;�1 ������v�ۃ��^w_�,Wv������I�iM-CѬ��W��z��}��9�~��f)X�݆ϼY��ف݃��������GpgәHC~��r�NO&������2�N4uP6�V @-��zP�Pu49+#��I�"�N�}���2t(�]�]���1�8��a�λ>�����]��s2�SU5�u���''�w�r����� ��b=�gE�[;$�X�p�������~h�0���轅�a��C6;2���Wu`�C�4k�ũ��ꯗ9н=k�WLUܷ)����D��� -���8��Z~�R#�O -�4�4��1�������se}E���'��|���Q�}8T �%�}l(}�,2��>�(\��"�MbwK�!R�q�U�IQK����nX��H5W�͈�3�37to������ -��.E�����A�y$��n���d:����\b E���yHn�W���\me%7�`��D�Č��?#��n�*R2#�gS;�L�î�<ׁ��wx9�:��B�v�V~��!]ѹ�����m�8�I�/��n���[�s�^/�6i��pE�R�T�N��neS{ &wN'��!8*�q��,�OI��~D�A�� ��R�r�*["���`��U\�: �fJ��U|c��JK������MA[jb���B�j�Vb��U��ő�~� /��9��8����������+?�z��W��l�)�!隬c;��Q��V�Kk� �dv���js -5,�Tg�5�<[�N6_�"�܎���q������2^��hox�=o5?7�&���s��Sb���G�D8��L�?$�.�U��Ƌ�=����6�𫬭 �O��pXt��>$���|n�tGs�c9�����zP�K,�Y!��P���/�@P -͂�$���L�au)�cx�l�M�L؝: \5����e���|H?�j�a�@�ׂ�x�YQ�{X2(>W��7r�(q=zYE���͢R%h/T�݈���タ8����(�U��SS+�b�F=Rp)l��wK �Jr+ -3�rBR��{}�qC��ݫ�.��g�K|9��N��h�#:z����m �h�..3sK �[2H����-�C��Mx��mr^��乞�����*a� �e�$U��B��b+���U�>�(�&��݂����0��8����xBk��qB�]xC|��'�#nu��ows�"�㲩���p� -�8����&y}��J��N^�����|�v-���|l��m����"�Ͷ���D��矓�ds�v��/��L�I—@�ŷ���O��J9 ������e!���^�8�ؿDݔ�(Č�"���zs"$Y��g*���1jhTz������tt|X7\v�v� �& ��H��H�;���%��Z�g�����SKq��o�ͷ��K)�S�'���'=��� b�s4�H�'�<����Py]�l�!l����7�;�ƿ%]P{{��S������1�{�x�8��ɻZ}� -�ߤ�^t'^�;�7B�-ŠO�o�Ak���.�>!�ʈx4���م�2�ϊ��VV�-�M�Uc��p��QJi-w����v��R��0^�9�F����ަ�-�Ivf� (�_�^[����|� R]�Օ��XH =���1"뾲)OI��� f���t F�R�,���YdZ�?��+�����;B[�$O~H�ސ���4����i��m�ߐ�2�H��lw���G�lŁ�8�݊�F�DV���2�q����ڞ�tZ+uO�o�����f��(�`~R����[�T��oiZ~�JY���W�Na_p&����Mͷ�t����d -��gR��;��eq%�[8a���_���{u�f�KRu����X:Õ"C�^��3fNd� - �p��ƕE� �����Q�G�mLV��n~�'�='�lm$��Y �BιŤ3�:լ#կ��d��$9�ƥU�`�%�I������y���^4���5�4[���l����;O#��`�?�̃�ӕM��Ú�LF}�ʚtH&�#Ig2������s��c$+fJJ���ݷ -=Ơ��Ä}n�s�l%U���=�,� -Ӗ�� -�Y�m<_�s -�B���ʕ�sr��+�v�6� B��-��\o�M�b��nʚ�]�*�jx�ҭ?/��]�H(х�a w�7�~��?J�Y�� �E���2B!^յ��jPU��(/'K����S��L�K���rݯ���K͙�ѡ����x���Â�_��XXw(E�|�]?���<��r�7�7YpԸ�({Bj�yٗgU_� Brͥq_��k��S�W���� 5+jʏR��9��V�՚�S��!����ߩ٣�=�*ږdQf7kǧٿ|�Q��E�}��L�Y~ߧqM��J�'�S%���<"I+��̦"�כ�8��T�$ޭ>͒0X}�噦��اbǩ���_c��*j�?bɹ폕��R�>cQሮ�-Z'��=� ��c��24�:#��4�R ��zQ��˞��n�hճ��~�{�'��J �x��#"�&j3߿@)p��_<��S�e���b��j�M+� �*�'>��5�ߺOQ�m�s=�VxSå ��7����~�1��Y�������va��h)^��k��{�>�|o����_����U�Ƈ` �Ͽa�2z��S�n�@�����6�nkk�������L�Q6�e3�k���A¥�v��{oO/:с�=���+�O"^͝�� c8�H��@6� �R{�(��x\�a �d0���-��Ť:k��#��5� Ȍ�a4��)� +� cC�� ���u�B_�ڇS N��@5LPF��#�Ў'�n��b�f���h����Ɔj�������:�O�a(#KS�h��p2�F:p<��4u �ڙf���ND�*� � ��F�TYʱ6Ԭs>�f�p��Ɗai��P1�xb�uSdq��������.h#�~TG���p(�tCd�0Ԕ� 7:��f�} 9˾���:��a̱������z6*�9�P7P����:�4e�L����*� ����Pϐp�Q��c�Ҭ���]pɛ��Q�� u� nb�(�������h�y�ߏ'���C\��R c2�4}ԆS���Q5��LLu�e��8�֩�������NU�T5@qS��SP�eh}K�� �t�����a�}PG}[uD�I3�6W-C3F�����>A���ML5�*�s�O-h'� >jH|�UB7M-V��I�4�~�2ޯl�ƾ&���ux�=���u�(_n�y���U۠G���{�u��8E������eog�ۘ����$�~N��/;;�eoƧcx�} N�\�!;#s�'��5� E��o^7;p���͛�p��zA�R�f� _x�G��qﯹ����GpgәHCq��r�NO&�����e��h�jD)�@�Z +W$�`B��䬊0�&c����hg�x6c�q;���Z�/?w=�b��OUո�Vԕ��㟜hGܹ˕G�'o4?$t�R���uo�@cI�E0;�W��R�����k\����+8��>���`�o^o�*��!^�j(���zY�۳�}�T��}��nn�O���O�V�G 7�E�T�J�~R������ ���ܐ���._j��+��>1��S}��6�1ЇC��]��dž�W��!���#�…+R�n�t v�r"�A�Ze����$Qjl��Պ���s�،h>#>sC��Hn�� �)�RT��٭4�G2���qk��O�z�/��%�)�\E�CrK� +4���h+k��k&�� fdE��7��HɌ8�M�(3����\�k���t�> �� [�9��tMD�O���we��']�f�����l�vo��]z��ۤid�s:�-J�R�g:���M�%��9� �����+��?%���ak/��*%�}h���?�x/�%6��[�^��{ #���-���=�7a��Ka�'��#9��9n-",�^_���p�i�����t��U�a����D6Nyn��؞7]3B���[��F��p!s����~䙉m�O�D��mA:�h�;rSЖ���d&�����UX$qտ|y$�{�K8x��$���|n�tGs�c�����͠D�Xr�B2-�f���^����%�Ilg��)��R,���،�x��;7t�j�����J`3���~����:�����өfE9�aŠ�\Qb�ȝ����e�Zz�E�Z�(^�#�M[��qp)g�Q��5��:V �ҍ�H���}:��,u40kI(�(̈� I5>��h� ^w�'���7�<��\⫩ov�uDs���SR��%좹����-%,�n� ���¶��j6�Q�缪��s=#s{�u� +4��"I��;d����V���y��-|�Q�M(��O��naf�q\;� 9����'�+�|��������O�Չ��-Ԋd�˦.O�b��+|昦>����!�_k�;E �*�Uٵb���# �y�"�Ͷ���D��矓�$?l��ۗQ�L]z��$�K ����fi�'�l���HL��q���P��[Y�N�]�_�nJkb�v�u�s��IV#����j� 4*�^L�� a�ҍ,ɥ P�'�Hz����X���cI}��� ۯl��zXI�i���WD=E����::>���.;F��j���W$D$��B��o-����������Hq�������������ٓNOٓ�҈����9�?g$�{�G�,F��.K�����a��D�ߒ.��=`凩]�s}~�v���u���Rw� ���� �PmK1���?EкI��{t�HeD<D ����@�g�NO+�n޼G�� \�l�RZ��6D$���]JZƫ?G�(W[���T��C=��l<U���� a�5�T�/�~A�K���� i��E�@�#��LK�2E��zF%���{�x +��"��r�sB��,8j�הS!�ּ�̳����!�>Ӹ�G ����ރ��9�h��5��G +�Ң��alr2k͊�[n�b�v��w�Pݞx�mK����ǧٿbȱ�ы�ם�Z��~R�땬O�JN��yD��& �ME�o7�q�[�(I�[J&a����3ME��OŎS�����LE��8�Ēs�+]Uq��4|Ƣ�]�[�NT�{�D%C�x-�D��&#��4�#��zY��˞ںq�h����~�{�'�+ ���#"�'*��_��k�/�s��Ҳ�"�-� μ��a�������G�v׷�SB��6׹l+�������N����2X���5�'��m�~�n�+ۦH��w�J�v-��եPZU?}��� M~Z���Z�W�Ǔ6&*�1L�!��T�Uɮ��애`Q�/�M��b�_w� �Q1N1���)(�%HI $�%�Ʒ��plk�N@����%R��V�3;3^<�>�@{�D����Y�W%G��3k�ϗ:�0�� Gt.��Ђ?���h�s�[XO��8�ܻ��'h,b���xI%�Q0�Jc�)|�dł$�r{�-�W���Kܮ��AL��u]!�,n��̸�Y���Ku�t鿍�T�C5�;w�P ��2z�.E�Ύ'�B.kM�rDOTg�e"�=65�ǁ��O�f�Me�EW���?u{}�nn~�/�R�n�0��+� Ĕ�Əc6m�қk CG$R�]� ��{@ٖ��Q^4�.ggfu}S�U�Ti�R�������� ���=�t���Nq~��J�b��Z8����0��/ ��{�l;�E�+�/� �O�f��HP��M$ٗ� �;b��U���%��{�޸i]�ca5�j��z�1�H���;�F�\�\)j� {É9���G�{� hTQ)��$W��,�=��N�K�φo}Yz�[���vB�ڱkH@J �)�h�Fg5��P]0�)��m6�٨�lr�����*�ez��whv�U��=��D;.2���x��%p��f����v =�*���0t����0NĴJ�Ay�-��e+����-��-\7�p���j�-H�8��������+O⸆`1l�&�(�C\�'�XQo�8~ϯ�9�)���" \�I+[LL�#�D9٠-ZDŽeR ���"��@ٲe[��N/���Ǚo>����K>��>~�P���|����B+9��O��}t���7�D�d\NQ[p-��z>N�B� J �'L��c�I��0V�Qa���e �A�*t�囑�\�a��̴�Y� (]����L�b,��.�9꙰Sȵz)�`'܂� �U��g!!Q2n�)'�Оm���5�LT�0+��� Y��zrC�RY�`{�`'�@&�uXu'd��a*L�q1C��^�gB���<˵J�����2�T%� �-R�2��4(;A 3nQ ��ur�Ė���BP��V�:'�T)�z�,�X`*m�N��F�D��U�2Uڠ�W��LY�u�@�Z���c�,�X;�m[��Jz��:O���?��}��- �b�92>�:�� {v-Y�IA� �(�1�Ҝ��`�d�T�Ձɧ @�ۚ���Mmd|��cK�5 �����,G�H�p5��1��{��Nh "��uUm�ꀈ��m��W�@<�߆�{6�{�赧�xZWbS�q�5w�n����k.�C�CıX�E)v��j��r%aU�]��J�0��y�9M@���EJ l�Adݬ�mL҃Ⱦ��J���c�����o �!���'t�C��%�k��;z��=���u�2�F�<��I'��@op7����ٵtN~��Aļ��,���lׅW{��d�w��;�5h� �鶛 "�}V!b�>_ˮ�� ͹h���������ؙ�DD��S�8�dfb)A�ge���E%�(K�/u��J�0E��� l �~��h�V(+�� 2�f� ��&SAd�]bٺ ;O��p��f܏�z ��S���UҫP �y�׆�� �A^4#��sd��tiAN���%��^�+P�c �9�'۱v1n���w��^tF���WX��`>R�-�ɘ��=��`;��0ΉJz/?Ӆ�AĢ΅�+�"�²���d�����yy�N�<�O�S���E������{H�h0d�T�iЁɧ��M�.�]�R��m�< b�9�Ҫ�u�A -�@ ���"�~@P�z[�!�t(Iٍ}��x�y`��}��0���VK�157�t����iT�G%���b�ځ �^ŤQâ����<@X#!��q�剈'�h�>��/�(P��W(��,V�,VH�SH,-�OO�K-J,IMQH��IU�UH�W��/QHM�,኏�w��q�� ���犏�p� �w�� ��q �д����>Q;�% 7Y�-����� �N7�3��m��y^հ�|l�}4'G^��!���ov.� ��oF�GBMB \ No newline at end of file +�@ ���"�~@P�z[�!�t(Iٍ}��x�y`��}��0���VK�157�t����iT�G%���b�ځ �^ŤQâ����<@X#!��q�剈'�h�>��/�(P��W(��,V�,VH�SH,-�OO�K-J,IMQH��IU�UH�W��/QHM�,኏�w��q�� ���犏�p� �w�� ��q �д���VNY��G�`���ԋ�9^+�pN狝�%�!Q%��K|�Z�w{�#�l��R�v�/��l8@�fGBMB \ No newline at end of file diff --git a/tools/phpstan b/tools/phpstan index 95932296f17..d3f6d41d769 100755 Binary files a/tools/phpstan and b/tools/phpstan differ