From c3edff031e2528b07b3e793780bce0236606a35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 6 Apr 2018 15:24:54 +0200 Subject: [PATCH 01/28] Fix: Remove unused private field --- src/Framework/Constraint/IsEqual.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Framework/Constraint/IsEqual.php b/src/Framework/Constraint/IsEqual.php index 78a25949abe..9bca85a6de4 100644 --- a/src/Framework/Constraint/IsEqual.php +++ b/src/Framework/Constraint/IsEqual.php @@ -48,11 +48,6 @@ class IsEqual extends Constraint */ private $ignoreCase = false; - /** - * @var SebastianBergmann\Comparator\ComparisonFailure - */ - private $lastFailure; - /** * @param mixed $value * @param float $delta From 114a7630770a5e68e6959a6ea6a53dd0094b2999 Mon Sep 17 00:00:00 2001 From: kambo-1st Date: Sun, 8 Apr 2018 17:48:19 +0000 Subject: [PATCH 02/28] Add phpunit.xsd into the phar file --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index 27b19c38924..1087bb437cc 100644 --- a/build.xml +++ b/build.xml @@ -125,6 +125,8 @@ + + From 9b58a4f41d91a20bc9c7c3aae94e74ac61e530b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 9 Apr 2018 23:57:52 +0200 Subject: [PATCH 03/28] Allow returning null result This can and does happen with Symfony's phpunit-bridge listener. Apart for that, this property is not guaranteed to be not null (there is a setter and no constructor requirement), so the return type hint should reflect that. See https://github.com/symfony/symfony/issues/26861 --- src/Framework/TestCase.php | 2 +- tests/Framework/TestCaseTest.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php index 97dce8658b8..ace15a4319f 100644 --- a/src/Framework/TestCase.php +++ b/src/Framework/TestCase.php @@ -1032,7 +1032,7 @@ public function setOutputCallback(callable $callback): void $this->outputCallback = $callback; } - public function getTestResultObject(): TestResult + public function getTestResultObject(): ?TestResult { return $this->result; } diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php index c1036c30c61..10843d1c929 100644 --- a/tests/Framework/TestCaseTest.php +++ b/tests/Framework/TestCaseTest.php @@ -721,6 +721,12 @@ public function testProvidingArrayThatMixesObjectsAndScalars(): void $this->assertSame($data, $test->myTestData); } + public function testGettingNullTestResultObject() + { + $test = new \Success(); + $this->assertNull($test->getTestResultObject()); + } + /** * @return array */ From 88709831f53129f92d7d5b1bc369accd75ec7d8a Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 10 Apr 2018 06:42:06 +0200 Subject: [PATCH 04/28] Update ChangeLog --- ChangeLog-7.1.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index c56fa6688cb..d5f7a3b65fb 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -9,6 +9,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil * Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider` * Fixed [#3059](https://github.com/sebastianbergmann/phpunit/pull/3059): `StringMatchesFormatDescription` constraint fails when matching multiline with `\r\n` * Fixed [#3083](https://github.com/sebastianbergmann/phpunit/pull/3083): `@runClassInSeparateProcess` and `@dataProvider` cannot be used together +* Fixed [#3087](https://github.com/sebastianbergmann/phpunit/pull/3087): `TestCase::getTestResultObject()` can return `null` ## [7.1.1] - 2018-04-06 From c33b0de93403b0c8beffb118133e45bfac46785a Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 10 Apr 2018 06:46:53 +0200 Subject: [PATCH 05/28] Fix --- ChangeLog-7.1.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index d5f7a3b65fb..ffb4fb92b24 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -6,9 +6,8 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil ### Fixed -* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider` +* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` and `@dataProvider` cannot be used together * Fixed [#3059](https://github.com/sebastianbergmann/phpunit/pull/3059): `StringMatchesFormatDescription` constraint fails when matching multiline with `\r\n` -* Fixed [#3083](https://github.com/sebastianbergmann/phpunit/pull/3083): `@runClassInSeparateProcess` and `@dataProvider` cannot be used together * Fixed [#3087](https://github.com/sebastianbergmann/phpunit/pull/3087): `TestCase::getTestResultObject()` can return `null` ## [7.1.1] - 2018-04-06 From c1b35f210334bf1695af4fe6a16c3a72ebbe5e3d Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 10 Apr 2018 07:24:44 +0200 Subject: [PATCH 06/28] Delete ChangeLog of unsupported release series --- ChangeLog-5.7.md | 242 ----------------------------------------------- 1 file changed, 242 deletions(-) delete mode 100644 ChangeLog-5.7.md diff --git a/ChangeLog-5.7.md b/ChangeLog-5.7.md deleted file mode 100644 index c8c778748d3..00000000000 --- a/ChangeLog-5.7.md +++ /dev/null @@ -1,242 +0,0 @@ -# Changes in PHPUnit 5.7 - -All notable changes of the PHPUnit 5.7 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. - -## [5.7.27] - 2018-02-01 - -### Fixed - -* Fixed [#2236](https://github.com/sebastianbergmann/phpunit/issues/2236): Exceptions in `tearDown()` do not affect `getStatus()` -* Fixed [#2950](https://github.com/sebastianbergmann/phpunit/issues/2950): Class extending `PHPUnit\Framework\TestSuite` does not extend `PHPUnit\FrameworkTestCase` -* Fixed [#2972](https://github.com/sebastianbergmann/phpunit/issues/2972): PHPUnit crashes when test suite contains both `.phpt` files and unconventionally named tests - -## [5.7.26] - 2017-12-17 - -### Fixed - -* Fixed [#2472](https://github.com/sebastianbergmann/phpunit/issues/2472): `PHPUnit\Util\Getopt` uses deprecated `each()` function -* Fixed [#2833](https://github.com/sebastianbergmann/phpunit/issues/2833): Test class loaded during data provider execution is not discovered -* Fixed [#2922](https://github.com/sebastianbergmann/phpunit/issues/2922): Test class is not discovered when there is a test class with `@group` and provider throwing exception in it, tests are run with `--exclude-group` for that group, there is another class called later (after the class from above), and the name of that another class does not match its filename - -## [5.7.25] - 2017-11-14 - -### Fixed - -* Fixed [#2859](https://github.com/sebastianbergmann/phpunit/issues/2859): Regression caused by fix for [#2833](https://github.com/sebastianbergmann/phpunit/issues/2833) - -## [5.7.24] - 2017-11-14 - -### Fixed - -* Fixed [#2833](https://github.com/sebastianbergmann/phpunit/issues/2833): Test class loaded during data provider execution is not discovered - -## [5.7.23] - 2017-10-15 - -### Fixed - -* Fixed [#2731](https://github.com/sebastianbergmann/phpunit/issues/2731): Empty exception message cannot be expected - -## [5.7.22] - 2017-09-24 - -### Fixed - -* Fixed [#2769](https://github.com/sebastianbergmann/phpunit/issues/2769): Usage of `setUseErrorHandler()` produces `Undefined variable` error - -## [5.7.21] - 2017-06-21 - -### Added - -* Added `PHPUnit\Framework\AssertionFailedError`, `PHPUnit\Framework\Test`, and `PHPUnit\Framework\TestSuite` to the forward compatibility layer for PHPUnit 6 - -### Fixed - -* Fixed [#2705](https://github.com/sebastianbergmann/phpunit/issues/2705): `stderr` parameter in `phpunit.xml` always considered `true` - -## [5.7.20] - 2017-05-22 - -### Fixed - -* Fixed [#2563](https://github.com/sebastianbergmann/phpunit/pull/2563): `phpunit --version` does not display version when running unsupported PHP - -## [5.7.19] - 2017-04-03 - -### Fixed - -* Fixed [#2638](https://github.com/sebastianbergmann/phpunit/pull/2638): Regression in `PHPUnit\Framework\TestCase:registerMockObjectsFromTestArguments()` - -## [5.7.18] - 2017-04-02 - -### Fixed - -* Fixed [#2145](https://github.com/sebastianbergmann/phpunit/issues/2145): `--stop-on-failure` fails to stop on PHP 7 -* Fixed [#2572](https://github.com/sebastianbergmann/phpunit/issues/2572): `PHPUnit\Framework\TestCase:registerMockObjectsFromTestArguments()` does not correctly handle arrays that reference themselves - -## [5.7.17] - 2017-03-19 - -### Fixed - -* Fixed [#2016](https://github.com/sebastianbergmann/phpunit/issues/2016): `prophesize()` does not work when static attributes are backed up -* Fixed [#2568](https://github.com/sebastianbergmann/phpunit/issues/2568): `ArraySubsetConstraint` uses invalid cast to array -* Fixed [#2573](https://github.com/sebastianbergmann/phpunit/issues/2573): `getMockFromWsdl()` does not handle URLs with query parameters -* `PHPUnit\Util\Test::getDataFromTestWithAnnotation()` raises notice when docblock contains Windows line endings - -## [5.7.16] - 2017-03-15 - -### Fixed - -* Fixed [#2547](https://github.com/sebastianbergmann/phpunit/issues/2547): Code Coverage data is collected for test annotated with `@coversNothing` -* Fixed [#2558](https://github.com/sebastianbergmann/phpunit/issues/2558): `countOf()` function is missing - -## [5.7.15] - 2017-03-02 - -### Fixed - -* Fixed [#1999](https://github.com/sebastianbergmann/phpunit/issues/1999): Handler is inherited from previous custom option with handler -* Fixed [#2149](https://github.com/sebastianbergmann/phpunit/issues/2149): `assertCount()` does not handle generators properly -* Fixed [#2478](https://github.com/sebastianbergmann/phpunit/issues/2478): Tests that take too long are not reported as risky test - -## [5.7.14] - 2017-02-19 - -### Fixed - -* Fixed [#2489](https://github.com/sebastianbergmann/phpunit/issues/2489): `processUncoveredFilesFromWhitelist` is not handled correctly -* Fixed default values for `addUncoveredFilesFromWhitelist` and `processUncoveredFilesFromWhitelist` in `phpunit.xsd` - -## [5.7.13] - 2017-02-10 - -### Fixed - -* Fixed [#2493](https://github.com/sebastianbergmann/phpunit/issues/2493): Fix for [#2475](https://github.com/sebastianbergmann/phpunit/pull/2475) does not apply to PHPUnit 5.7 - -## [5.7.12] - 2017-02-08 - -### Fixed - -* Fixed [#2475](https://github.com/sebastianbergmann/phpunit/pull/2475): Defining a test suite with only one file does not work - -## [5.7.11] - 2017-02-05 - -### Fixed - -* Deprecation errors when used with PHP 7.2 - -## [5.7.10] - 2017-02-04 - -### Fixed - -* Fixed [#2462](https://github.com/sebastianbergmann/phpunit/issues/2462): Code Coverage whitelist is filled even if no code coverage data is to be collected - -## [5.7.9] - 2017-01-28 - -### Fixed - -* Fixed [#2447](https://github.com/sebastianbergmann/phpunit/issues/2447): Reverted backwards incompatible change to handling of boolean environment variable values specified in XML - -## [5.7.8] - 2017-01-26 - -### Fixed - -* Fixed [#2446](https://github.com/sebastianbergmann/phpunit/issues/2446): Reverted backwards incompatible change to exit code in case of warnings - -## [5.7.7] - 2017-01-25 - -### Fixed - -* Fixed [#1896](https://github.com/sebastianbergmann/phpunit/issues/1896): Wrong test location when `@depends` and `@dataProvider` are combined -* Fixed [#1983](https://github.com/sebastianbergmann/phpunit/pull/1983): Tests with `@expectedException` annotation cannot be skipped -* Fixed [#2137](https://github.com/sebastianbergmann/phpunit/issues/2137): Warnings for invalid data providers are suppressed when test execution is filtered -* Fixed [#2275](https://github.com/sebastianbergmann/phpunit/pull/2275): Invalid UTF-8 characters can lead to missing output -* Fixed [#2299](https://github.com/sebastianbergmann/phpunit/issues/2299): `expectExceptionMessage()` and `expectExceptionCode()` do not work without `expectException()` -* Fixed [#2328](https://github.com/sebastianbergmann/phpunit/issues/2328): `TestListener` callbacks `startTest()` and `endTest()` are not called when test is skipped due to `@depends` -* Fixed [#2331](https://github.com/sebastianbergmann/phpunit/issues/2331): Boolean environment variable values specified in XML get mangled -* Fixed [#2333](https://github.com/sebastianbergmann/phpunit/issues/2333): `assertContains()` and `assertNotContains()` do not handle UTF-8 strings correctly -* Fixed [#2340](https://github.com/sebastianbergmann/phpunit/pull/2340): Data providers that use `yield` or implement `Iterator` cannot be combined -* Fixed [#2349](https://github.com/sebastianbergmann/phpunit/pull/2349): `PHPUnit_TextUI_Command` does not `exit()` when it should -* Fixed [#2392](https://github.com/sebastianbergmann/phpunit/issues/2392): Empty (but valid) data provider should skip the test -* Fixed [#2431](https://github.com/sebastianbergmann/phpunit/issues/2431): `assertArraySubset()` does not support `ArrayAccess` -* Fixed [#2435](https://github.com/sebastianbergmann/phpunit/issues/2435): Empty `@group` annotation causes error on PHP 7.2+ - -## [5.7.6] - 2017-01-22 - -### Fixed - -* Fixed [#2424](https://github.com/sebastianbergmann/phpunit/issues/2424): `TestCase::getStatus()` returns `STATUS_PASSED` instead of `STATUS_RISKY` for risky test -* Fixed [#2427](https://github.com/sebastianbergmann/phpunit/issues/2427): TestDox group configuration is not handled -* Fixed [#2428](https://github.com/sebastianbergmann/phpunit/pull/2428): Nested arrays specificied in XML configuration file are not handled correctly - -## [5.7.5] - 2016-12-28 - -### Fixed - -* Fixed [#2404](https://github.com/sebastianbergmann/phpunit/pull/2404): `assertDirectoryNotIsWriteable()` calls itself - -## [5.7.4] - 2016-12-13 - -### Fixed - -* Fixed [#2394](https://github.com/sebastianbergmann/phpunit/issues/2394): Do not treat `AssertionError` as assertion failure on PHP 5 - -## [5.7.3] - 2016-12-09 - -### Fixed - -* Fixed [#2384](https://github.com/sebastianbergmann/phpunit/pull/2384): Handle `PHPUnit_Framework_Exception` correctly when expecting exceptions - -## [5.7.2] - 2016-12-03 - -### Fixed - -* Fixed [#2382](https://github.com/sebastianbergmann/phpunit/issues/2382): Uncloneable test doubles passed via data provider do not work - -## [5.7.1] - 2016-12-02 - -### Fixed - -* Fixed [#2380](https://github.com/sebastianbergmann/phpunit/issues/2380): Data Providers cannot be generators anymore - -## [5.7.0] - 2016-12-02 - -### Added - -* Merged [#2223](https://github.com/sebastianbergmann/phpunit/pull/2223): Add support for multiple data providers -* Added `extensionsDirectory` configuration directive to configure a directory from which all `.phar` files are loaded as PHPUnit extensions -* Added `--no-extensions` commandline option to suppress loading of extensions (from configured extension directory) -* Added `PHPUnit\Framework\Assert` as an alias for `PHPUnit_Framework_Assert` for forward compatibility -* Added `PHPUnit\Framework\BaseTestListener` as an alias for `PHPUnit_Framework_BaseTestListener` for forward compatibility -* Added `PHPUnit\Framework\TestListener` as an alias for `PHPUnit_Framework_TestListener` for forward compatibility - -### Changed - -* The `--log-json` commandline option has been deprecated -* The `--tap` and `--log-tap` commandline options have been deprecated -* The `--self-update` and `--self-upgrade` commandline options have been deprecated (PHAR binary only) - -[5.7.27]: https://github.com/sebastianbergmann/phpunit/compare/5.7.26...5.7.27 -[5.7.26]: https://github.com/sebastianbergmann/phpunit/compare/5.7.25...5.7.26 -[5.7.25]: https://github.com/sebastianbergmann/phpunit/compare/5.7.24...5.7.25 -[5.7.24]: https://github.com/sebastianbergmann/phpunit/compare/5.7.23...5.7.24 -[5.7.23]: https://github.com/sebastianbergmann/phpunit/compare/5.7.22...5.7.23 -[5.7.22]: https://github.com/sebastianbergmann/phpunit/compare/5.7.21...5.7.22 -[5.7.21]: https://github.com/sebastianbergmann/phpunit/compare/5.7.20...5.7.21 -[5.7.20]: https://github.com/sebastianbergmann/phpunit/compare/5.7.19...5.7.20 -[5.7.19]: https://github.com/sebastianbergmann/phpunit/compare/5.7.18...5.7.19 -[5.7.18]: https://github.com/sebastianbergmann/phpunit/compare/5.7.17...5.7.18 -[5.7.17]: https://github.com/sebastianbergmann/phpunit/compare/5.7.16...5.7.17 -[5.7.16]: https://github.com/sebastianbergmann/phpunit/compare/5.7.15...5.7.16 -[5.7.15]: https://github.com/sebastianbergmann/phpunit/compare/5.7.14...5.7.15 -[5.7.14]: https://github.com/sebastianbergmann/phpunit/compare/5.7.13...5.7.14 -[5.7.13]: https://github.com/sebastianbergmann/phpunit/compare/5.7.12...5.7.13 -[5.7.12]: https://github.com/sebastianbergmann/phpunit/compare/5.7.11...5.7.12 -[5.7.11]: https://github.com/sebastianbergmann/phpunit/compare/5.7.10...5.7.11 -[5.7.10]: https://github.com/sebastianbergmann/phpunit/compare/5.7.9...5.7.10 -[5.7.9]: https://github.com/sebastianbergmann/phpunit/compare/5.7.8...5.7.9 -[5.7.8]: https://github.com/sebastianbergmann/phpunit/compare/5.7.7...5.7.8 -[5.7.7]: https://github.com/sebastianbergmann/phpunit/compare/5.7.6...5.7.7 -[5.7.6]: https://github.com/sebastianbergmann/phpunit/compare/5.7.5...5.7.6 -[5.7.5]: https://github.com/sebastianbergmann/phpunit/compare/5.7.4...5.7.5 -[5.7.4]: https://github.com/sebastianbergmann/phpunit/compare/5.7.3...5.7.4 -[5.7.3]: https://github.com/sebastianbergmann/phpunit/compare/5.7.2...5.7.3 -[5.7.2]: https://github.com/sebastianbergmann/phpunit/compare/5.7.1...5.7.2 -[5.7.1]: https://github.com/sebastianbergmann/phpunit/compare/5.7.0...5.7.1 -[5.7.0]: https://github.com/sebastianbergmann/phpunit/compare/5.6...5.7.0 - From 6cb87d282bebc22aa439348fa12fca24e22e8808 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 10 Apr 2018 07:34:01 +0200 Subject: [PATCH 07/28] Fix --- ChangeLog-7.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index ffb4fb92b24..47f7232d4a1 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -6,7 +6,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil ### Fixed -* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` and `@dataProvider` cannot be used together +* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider` * Fixed [#3059](https://github.com/sebastianbergmann/phpunit/pull/3059): `StringMatchesFormatDescription` constraint fails when matching multiline with `\r\n` * Fixed [#3087](https://github.com/sebastianbergmann/phpunit/pull/3087): `TestCase::getTestResultObject()` can return `null` From 4f21a3c6b97c42952fd5c2837bb354ec0199b97b Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 10 Apr 2018 13:38:34 +0200 Subject: [PATCH 08/28] Prepare release --- ChangeLog-6.5.md | 2 +- src/Runner/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md index e89aa24b8c9..8a703bc03d4 100644 --- a/ChangeLog-6.5.md +++ b/ChangeLog-6.5.md @@ -2,7 +2,7 @@ All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. -## [6.5.8] - 2018-MM-DD +## [6.5.8] - 2018-04-10 ### Fixed diff --git a/src/Runner/Version.php b/src/Runner/Version.php index b5083fd7642..387fcf132b7 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -32,7 +32,7 @@ public static function id() } if (self::$version === null) { - $version = new VersionId('6.5.7', \dirname(\dirname(__DIR__))); + $version = new VersionId('6.5.8', \dirname(\dirname(__DIR__))); self::$version = $version->getVersion(); } From 6a17c170fb92845896e1b3b00fcb462cd4b3c017 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 10 Apr 2018 13:40:22 +0200 Subject: [PATCH 09/28] Prepare release --- ChangeLog-7.1.md | 2 +- src/Runner/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index 47f7232d4a1..c78fa91cc1c 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -2,7 +2,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. -## [7.1.2] - 2018-MM-DD +## [7.1.2] - 2018-04-10 ### Fixed diff --git a/src/Runner/Version.php b/src/Runner/Version.php index b00870922f7..4f0e2f9ce78 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -30,7 +30,7 @@ public static function id(): string } if (self::$version === null) { - $version = new VersionId('7.1.1', \dirname(__DIR__, 2)); + $version = new VersionId('7.1.2', \dirname(__DIR__, 2)); self::$version = $version->getVersion(); } From 1b92225f66fe86baf22653c6e792a719e42a36b2 Mon Sep 17 00:00:00 2001 From: Bilge Date: Fri, 13 Apr 2018 01:44:09 +0100 Subject: [PATCH 10/28] Fixed faulty phpunit-mock-objects lower-bound version constraint. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a656c20fe4b..712aca97614 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "phpunit/php-file-iterator": "^1.4.3", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.0", - "phpunit/phpunit-mock-objects": "^6.1", + "phpunit/phpunit-mock-objects": "^6.1.1", "sebastian/comparator": "^2.1", "sebastian/diff": "^3.0", "sebastian/environment": "^3.1", From c98385c0ee2bc6d469165df82ae22d7b3e95ea20 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 13 Apr 2018 04:28:12 +0200 Subject: [PATCH 11/28] Update ChangeLog --- ChangeLog-7.1.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index c78fa91cc1c..d347a9f4991 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -2,6 +2,12 @@ All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [7.1.3] - 2018-MM-DD + +### Fixed + +* Fixed [#3094](https://github.com/sebastianbergmann/phpunit/issues/3094): Faulty dependency constraint affecting `getObjectForTrait()` (failure using `--prefer-lowest`) + ## [7.1.2] - 2018-04-10 ### Fixed @@ -28,6 +34,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil * `PHPUnit\Framework\Assert` is no longer searched for test methods * `ReflectionMethod::invokeArgs()` is no longer used to invoke test methods +[7.1.3]: https://github.com/sebastianbergmann/phpunit/compare/7.1.2...7.1.3 [7.1.2]: https://github.com/sebastianbergmann/phpunit/compare/7.1.1...7.1.2 [7.1.1]: https://github.com/sebastianbergmann/phpunit/compare/7.1.0...7.1.1 [7.1.0]: https://github.com/sebastianbergmann/phpunit/compare/7.0...7.1.0 From a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 13 Apr 2018 04:28:50 +0200 Subject: [PATCH 12/28] Prepare release --- ChangeLog-7.1.md | 2 +- src/Runner/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index d347a9f4991..c8cfd531c9a 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -2,7 +2,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. -## [7.1.3] - 2018-MM-DD +## [7.1.3] - 2018-04-13 ### Fixed diff --git a/src/Runner/Version.php b/src/Runner/Version.php index 4f0e2f9ce78..6dfc3a239ec 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -30,7 +30,7 @@ public static function id(): string } if (self::$version === null) { - $version = new VersionId('7.1.2', \dirname(__DIR__, 2)); + $version = new VersionId('7.1.3', \dirname(__DIR__, 2)); self::$version = $version->getVersion(); } From 1617f456e1522f9b32723549ddc5a370f8322e91 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Mon, 16 Apr 2018 05:59:19 +0200 Subject: [PATCH 13/28] Update Composer to 1.6.4 --- build/tools/composer | Bin 1861877 -> 1848805 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/build/tools/composer b/build/tools/composer index 041775a1274ffc0a74952eec9ceedfc062644408..499114bb3cf0ef3401a35587d6998e49ba319539 100755 GIT binary patch delta 28435 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 delta 41496 zcmce72bdexx#-$!Z<+P3BKmy!^n~(zU%$)VwK<<6-eee4opYg9bQ}H~af$7Uc}2@>aj z=_%pZ4%m6;>IE6?6RUA~_PMM3`Zizu{Fj9zBU^;C2Bzf3%j|u9-+FfSGs5*MIP1cJ z4f3py4IGr=@c~pG_)}Y7-|KJweMGopi73zDygZ;VxL<~!8$4Tve^~n7Gh|Ub;DoeE zaBJ{uHwzE0+9G^-XuUk}o*{_&^s&CaAGa>qB)mQYN!UC*Ef25^V=}yO7-D{881m0yS_IC18i8#1p0=+~dGyA~ z6WrY#$dq}!Tr4uB)SgPF(&Qi_2|n`EmnQ(bv+AdZuTOtbSh3D1T&#eb_^2W#5BiHDEJJ#oTZXr^OElnif~fb_gP;gY{ilP-DL7X|>c zYkz7jW8E}4JmV>+dE*MNM z3IclitRM|wrZ>wSPlK7KKl;&!WqPEJyQiUEJT?tyB4Fm8-J7lg8V6^hGn0xVBXBno ze8+KTQ`P}#_7yYh6ld#Urv%xnr*|x)esTt){_V_ug&Ax`QWOck(m7sQ8ni};%}&XC zuFg7S`1M(vOz5Wv`}%%;iQ+TM0}XR60!Yh9u>Y+` ztjnFN=HcuO^AP=hAp7wrzxSN5un}%km_JQk|G{}#{cqR+g-?=@$o73NEF-FJfQYWx z09Eh%8%V|TYPhNdkEUk^0aCb`!bZQ0^wEvbrVMP-$lrT6>10^hWRT%!Hfa@?t%pb? zm=POx;dh%%l(E3WwU8c3D|_x&XsS{^jI4Jz8l!C`&x;`^Qk^llUAZBSVA+o1k#1d4Qq z`k+tvqGnc*P(QbAi+sciFiUyQx!)4r!DfZ?wj;ux?ISW#XKg=AhUagGKJ07Tp~4)J zgg5%fe-j=iX9e}nVL^Qw^kJ(3JH9Gjc#Ck)t}R04H0S~U!@!q`qo-`9XNT_63`E5Hj#^bH9Y?SzI?+zGk;%biYn!p>drG|Ib-^7m(UK~n#= zD=Jfy0wn(HpWG!tjas<&49L$r&j`qa-#NoC4~l|8D~}%O2pX{I3zc(n=SP$f(;t-3 zF}(!_ZMpFB^JQDEICHJQo(Zuno(V~L;!Njka4$Sx38H_B{_s99N&0WIaQ&HcGs!$# zlg#a%Ti_@OqF25NcDY+E6Y|(xUtjW@*Jfm4l(zlQZs=%!z8mVrrajQ%oVN$^>8n84 zwicPNOq4WXgKDjCe9wr&y9q8K!OH_5UAM$(X~0H#duOTOSzfM!V*RuV9?@pCS?-Uk z;YznG!C$Chz_C#SCFwj3ba|iBP%`P8z>)6QbMH&CrCl(L2-~z1iist!FTt0eX!OZc zNS!(DoILA6pa+-#>d$A%#!Kq>vUXf??kJ>Pf-jz~yKH&ZUzcWG7VPW$uJEjM6x#(t z2Lqji4*G_#>Kroa?SP<%zWKtXva&1~Mg_folicwMa2~4vy6}K((WH(K=(ovR{;Zys z;oExXZF~mEntw5zt>6(zlLY%NeDhx6;N+|z5xmB@NuIRZNXpp11x|c#@QlZniGI~M zCfsdYBM*Am2tDOm6NHCN9=ZK)6SO6NGeHWxW{B)=aJ;vT-oHlnG16+^GDCTI-VBBE zv%m)Ky6uvq%d7b!f07|#&Y-lzzXT$H$ zEWww~w#Za`46tqF5086<>e+L`$U$U7n61^bJ4cHQ~;Kn}h)p zp8FgLY4(zE=_|-HWX$)Gkc2;z&?gzKyA_?AAR-Cg`^0@m1kK?I;b+zb;Zs&<@4se+ znzF_Qy|CZ5Z|$}SoFu{dmtGe>YTGB1{GTBHecb=_Zv{HOO?bpMB#haiQ~MckkK1D# z?pp4M+9CFm9R@Ei1Eu!=@+Yjo6z2tne@J-FzDuSVaX>2>cEI@LE(av%Z;mBJb;9r4 zoKU|0u=IVv1?}^`2MqY;prPDgu4$ZguC5{@O26v|1*?F9&|Gp z^z+}JX%wyxZxg=gofQfmxGe91*q-vhjh*H_N5+1MHzLDdc_CRUA5^5HJ{T_j75I~{ zt?^zYF!UM1Uwu%ClfYXG|G3K|tf)#fuN7?cn2aS#Lx2ApK*r`PZ=Vq!y?#QttuZ7I z`Wd}WrtvXwIv-6>8HA63V>?I>3Y-1V$nEt*lXR&cGBbZ#U*D^A;HIh(mnBqGkz&t<3B_Ab`Z+g81Q7Y|A9@*#Epg4%Y;1+_Re%SZx9|m z2U0y28W4_zphGB!&Q_R~;#mp)jK1LUdW$dkgx!&SijM)xC5t7&FKqjSLZ%5|567x_?~X!t zJ{5(hHy?wlQjS4)@Iz_s4__5u5|$z1?&zSfCq5v&9)qI!w-}74>~UQ2jU^K+!Bw9; z%K>Br8ua6FT3-6MK*2^o|DS1@;3Mb2RcFC z+_AB*?~lh?mkEzlKwaqYps?Y*wTfdnoFTza{>PgS35Ok0r$R`d2VLo9=Rx-T^1P*z z0nq>5TmO~<76W?l?qQdLSXx(tcdYrw@0Tba0+@Enr#^oK`nA##sMg;-0)wGV%mKx$ z4w4|j>`Pbbg#r_kCw-4OPlme^X&K&-fJKP65{7r5^?Buu!X9>5IFf{>=&~eS<#-ZW zJyj|sPmoMf?&mxuAMI=rHS+GY*0J#H zC>HYL5RmWh2#*~To~P!8gZV+>?(~pwj2#kw%0k7v3JCbQt-J<^#>oMj($Iuh(ohSu zz{b$3@8Up0PYi;GHU&C%uKE4hKz>ei3<;~aaha$;fzI_C_nr-80(M@@jR@YQ&JO`O zUeCWBl+WTA2c>A6)Oh#iCzq*}X1vVJ$mlKrosQsle;~_%v=vnb)|p}%Xwp9ijyL+7 z>u;641ss3~54hJWJ^&ai@lb*rY~9_$;lfrh8xc&|(;)kR)V!L^?H8^A7Wl->8?)Qx z&IbV6naBUKVR;*0%Z+Rz+m#wymtq;oiVT9JOtkTjkkzm0!M zpADq@79W2Fuo>Hg!R8(t6dtZm%RKmb9b(uF2wQw@>@HdKr9o>vlZp>7 z39bY`KL4}5OTG;nt;ZYh@hLRW;A>jLf~L7%!2xuVL`v}L-+pC4wyIL+`AryRUfaYK z=K=+l21$^cSuc4d3B#B$(poPQx4m_?;@3-qB)Isz;@dLku4%y&ytf5o$4~hC`mXxG z>7Zy0EV{JJ@z%gR*31@CFlB!pGAJ~APUTx1v27r=<# za{-)i{{@E>`<8NV32ssCnh~x$Y8MJep*6kiXjT@^TL2TLHg!*zJBbTn=iv)kg=eXF zDM9+j#jreJ!y+7DTCB?S+_hMf;li<|3_pAfF2C}kjH0#$vRQ&xJahe!(7gys*Gqu4 z1Lu2g1{lv0ydRLw;-CXcmvHvQWf{{w7sDNIxdg)NFKNl`$OkGiJo1FU}{_V23+-|u%DZ|??hwH4p;)u+bPl6-)$*0{3 z!TrIrgx(dW%Y%+z0g-yHgxmkdm51c^Emxf@!;7wBWcZt_5;Amt$glV=uxFA$N${;p z%g+fv6gCLgTE|Yv(uO5jdhtUrI@eweWu>9|$=K;gi_?edp zifgsP@2`OhJa{ck0S;XY^Rtg#3oARnxpuESdFypB^~zkQlD}`c4leTibmn8^!Z- zD>sUlEv{6E`;M+e#7!5j{PU_^`;epJ8{L(YJ@4Ym)QXeeBKRKc{pr}s&x`%ZVoH45 zykbs#cBX&ry6q{po~&gn4d8MY_Al(%A-*`%AL?B>+rOzS{`>vNxcJ=V{W|fctNU$Z zb#UjkRB70?aK5O#rk`G$O)u=+E_Jw>23v24w_nviC0^O>w}|m8`j3idU)vu>jv_}F z*g~BJb96WK8+yOIqCdMreBiSFQSsIr`kOuCs(#-}@!6~UL*fP3^nbG_T-$%gN-=#y zzf#=#(G}A-pWi>)GYS2V4~mcP9~|ke`$+$#N^vjKzg_%ce#MaZ+UHj4dvo9I7osb4 z;ukirIykD?tM@*4R>#?Y%HCuumnv-~uziPm8GDJizznOat4emKz@s!T0*! zA!^`TD3UHPTpe(5>sIli-2>aj+s_`OZ`!hAa(H`@X(Th}XwDU{x^}=QUV7``tmwFU zK+${Y+JVPM=C-G6<)WW$Wu>6!%mtYS_|bd&BLm;TRxO-<`hxg_=LY7*W3LaK(HlEH zFuF?I^5Vda;*sM6lf6rRGw}T@dLJ(jIxg+4cysWX72@yzYp~v9|2(+meDV6)(A6S+ z=ZaZTwRg>sc^8`tZC`y!6g>>%`C9Iy@wveaA2&{_*ma6JqYR;f>;o ze;J;Lr^HPY4LZr4sQ|Pm{~EkdEo$%L9JS2-mTW`)~XlO z>b>%x9YEj~kOlGSm)1NXe*5;})5Nd6yymORzYOAIzgy!L_k4F~K>Ysg!<(hvJ>si( z3~v&Ty|QLn{K=PxXT#3vsZIkV@euldPZ@frV` z&HeRON!(41o+UnF9T@2qFIn^IkzVJ;H8=G4ZhmEr>8ajzUmLw)v^V_3sA{7FSwN5^ z1C%)s^phxc*y9a4tg*vrC}=vAnuY!Q_b+TOf{32sSRCA~f@4IG z1*vz7_{dKIq1%qFUMGI$`=gWM&X-4(>LoORkUMw+iSGXb$?Pdh0bN@9lFj1Lmq$1B z0xyrQTG`9IGWzfu@w#7+t`{rc9at?o4~#DKzVw&ThxFo~4~#7IKEHeHn=4jt2VB9$ zudBy4ha0o zZa=lzCO-N4_=wmzyzZOtZay;Fzq)tjk#&2gMwZB1(C#scn%VKwdVgxJ`}^v5H=nzECvVmYmM_lMX0=*-?b-(I)#O!2z08HM=6TPH_)#DA{)_37^#D1w2fiSn8k z%#J%x7rp5CRR6*S7l_Bv@#*0fQ)se#cI@9FUiA8^DY5nI731P-==k8sj@`f{0e-3% zwut*Q;~N(1EK^Hnm_&gMmh-ISOY4o=;Tl^hFiCbN7!K?x_#fDJ&o-v_WnApB_=s<{o zx`BE|YnS*3_rw-)U2S5$xaLa})8cimiBSXuYbU~@{YO{L^`@zbiH$uXH}Q*A@?o>Z zN~5#$=J3Syid~}S-hrtR-~o>!jamm#D>8=^>&3zFghG6<4F38_aUvkw)oi`aHg;~$ z0Ie^uHL{&#<=AeQv_%Qm5D>IdvryP4eyK9CN9?{df!sVlJSZw|2B-c`Wg;dXtxRkb zLyHp~@dt|&XZHSBpZLe%yLC=d#f1wdR;+kmvk00sy^D`d#NX2=sp;CqiI4Taf6CjJ zObm#>zIfu*_jUC^S8Db987=PJJT=n$+!Yi0;ocu_n0Rzq_j?b1apG@7y@&3f_{+-W zX)E~2rSp07!HM--#Tc*HCf?l{-ylBs$@POh`nib%+n}(7l;ZJUfXM8xXHMQcI(E|f z==Nx|B7Me$uJ`obN&QMV*uJXgK_}ljNgi0|aPRZB$-g3}E`5PG`sGQarw>ftc#=#o zRJEe_c4hMK%hP+H4HgmeeC+l@IPUL%sp}cjg!y)4_JEuEBVhRKNkd1)aZvN?_Z`|TxPIL zQ*R5fw5$FJYA|!S*ZBD4V`J~{>|Jor`i=U^4Zn>sccPL z`NZT0S8wME<%CGzIHDGhUpzi69&wGY?)~YB$zu~@@6w4q_q{NA?tgPwo5Y2;hbDVZ z{&7+~9ZJx_Rbr(AB8$5>O}XAj;!F<+`P=UjrKN+Hh5zC+rtTdW(1RFRW0dTiewA1@ zOxb()8>U_y61lghHi(~hPAMjqyoMZy)fe_i8D8(-oKqiPJAG;o%r50_@zFmHO!OX# zPgMt2XOrbpOGFP(&5KcHYR$?$zzxn0ZtNXnrWE77o9k1Wl`FT`#i!4m+9qTh>21+`qlF(7Rr_ewF-71iuz~_v+WX$z_HC^Lv{3dUM^NsO_%* z)BBoN^}^?`cbsu*`;s*P+W$cHrYEP@iu@VVo5Y8%o*ovd?}ERcJY)KF@!o%(S>OA@ z^z_Z+;sIoOMBKe{W>oBbXIdd1`Qr38(U+NC5C$(Zr% zjY+T3>MiEp5AT^_2Tp#Tb^nZQ#qy_c`;Rt?pZV&{m8Z5$^}G+v>^M27cj1FGLo1g@ zh}V35=8ltJriW&t%U_=sADTI3;%yJlJUX=8DQ3Pm<6HjfJ@UPok=e-rTUn5DHQio~ zcCXq1errs<=U69j! zFeKG!*1+hD=A>C~G$s>THrc!H#hKf&)oiWNEQ%W2?6i2eIlE<&AaEQ_2RM{>U?}Gx zP#WdLcV3&BS|s#syo)+9&J)JaSP(5>6y>k;HabRxY1)O5ZD%-9EEwZaf6HO@@a`;T zblA+zL`UByb0`fbQb9cADI`mNO(K91bP#2&yqc$SsFn(nZHl0^RJXt&pt0lWp4u2K zFx3Bsg#V5Lp1%tY-$C=c}e0dd_vnf%gd)YRHKl0 zI1#gj4RgE(3z)Dfqso~HogrJ&rb$yEo+j~_4<}W8#hNU4%Syc|6xAl0`a+bcG`$H^ zKHpKr{YI=~R8@-+qsoPZx~eQuXCmQ@wP{fniq$|O6H6PyK@(lIX5AH^iwWa7t5K_R zggDeyDdR?x$c zB4$d2b9gadQpUOtH>0GCysK05nuxNRFZgp9PPB82L9QKWafq!J=d5_DPL)`y<#u+8 zl*-d3l!gxO$E}`tROO8oX=6TRh~adX^MqW4N$0cp^g&ir#dFmlX{ej5I2DW;com|K zC4t!wQz4eZYO!$2mTR^(QHrj3e4Uofkhg>@k-RHsC-Uuc)I`V7_Nvkjzsg@pw4)s| zY$WWJwmDQaSccMD z=c#40!8(?S)sx~1_w43gXvb`M*9guO*;+bVD>4h>E0(!gac1l6q`2_rtY(O81%b*N zBjPdJ?1K2*?pej6H5?>M6dtmnnh=R+C>EhZ6h~{Vjd;{qWTMVSEPw@Rpum9;IGP{_ zbd~N>IZj6fDBb}rf*ag8mQ!{=@6DQ9DP2nEE_%wbh$f2wBwZ$wYPyS-PP|KIDIAqo zLfcfF)@Cx|LkH(JE)q+op^F-*F4{&sIkM{^JPa@mU0@pIM%d3@D(ckSxY4NV2HO03(GtNRQK>#V{}7(0K@|<0X=9M;Fat93z>zdeBzP zs8e>-=-$Ce88W&yQvRa4AkB#e$wBSmNHdYt#6Z6*}SHzHWpXNnhD zGh+hbM?&j2<{}7zD*1>tm*BNAU8&OahY3ojt}N0?CZBV5(yoHG8loJkWR9rtop9LD zE;(pxC|+);*tpk~^E0}71@&l?R2a90k(8zE0_PR2m5F45h`TI=$?E}<8d3)8!CcvD z@-&;t3a`&vP=i;WclkT$>-LFm(<(6CP=_GJNZuzjag;FAGXaU(uwoVa~j&$Nc z_B#mzO-WABPU}f4M~C!=pr*bM(p9uZvJ%m-?qD=#OEvBOa=FYCoV>aZ5pVeZ?2g5f zJkd{*z$3GqzkPC5owJqD`B7;>QchV*z*YkmPf6fyfVqA!zyhy8BbNzsME)^o&HcX=?2!GaXXyNR*OK~ z=8h4!m{loV!Eka4wagyQsUo$YnLDoX_s}+0A4ws^KH0t~q5d zLRHUFonVP(8IQKiSesp6(~wQ4il`B-Xb@oRn+;opal{F( z+Q4HiBCAPuJ8q?i7w=h^-?;Gm15Er(NofDR8Cxj?|;L^KUwx)e__B?Ay+FRzNEin^|iaTl$QGETeG z?SK*}MKzi-sp_r{!BH<0z&Dq$9_=&Gq))fRN=+$uxT*KRfI@m#%A)fkyjG*{p(VM{a7NP%)M zVkDfAyqa-V@rWxBHQb~&&@|)as4-Pa)4`6F&hRy-I|6hYh*Q&>8dkyg;fPQSUISyVXAt}kxXgJzNm$F7hd#>+Qd^$BJwUTQj(>&DNUd-wQRx(j*eiMpC}Pby6)8T!DPZ4HLB^VGDK9;)ryr6 z75_dvxk$%&l8!lJjyMQN5_%d?1jK?sIn++!W#|oPI!EC)%&vX6(wy)J@1_NKG|45n zpg#&=I0*1!Wcm~b2jU=u?Br;hXYpNXD9JVw?_vp=83B|G6Ig(7Va^&?s4+oqup9C)D1p5?8$&D@X4|wW^_`-c4 z)ljUPUA2h#hz6fe=gBb6`t_`?p() zE}JXuimG!eRY>bnM>PR8sSa9V2>ot?aXUYqo4Lfn`8^nl%{%tx6}4Q7I?lbDGMoXw|7v8CxoCPE+x- zbc+Geu`6N=^M#VX(TZ5>PMetxR6@RpPaSuJ!CkJh&0$V&(GaUQ?0zS&E_4XD9&uoH zPde!627m($dUQ!PN%JM;xlM1=8qsL&=6#j7kQ?JA`=>5Uux_CPeAO2tve5@390RD9!|*-gD~ z`DVYdZYa=TY7OvDct!f5S&O)E_3Xlsy#rhbmavH{j?K@D3$t^p-{(i1K>{2)M$5(> zBptxN>iii{DFETKnhVXj9pcHk?aEodpN!2QpYt$09sPQo@~-tx#kl zo=nOX;zE)<6bnrthGb+sX2IR%?)lY=L<~3wQbz^zYLIqN zTIexOHp*@9_ZaWn!6{3~8$kZgcJSY9;k`RJl|Rcn7!zMH&Tm=-F2UgfE&)Wc1eW#G zoh@72mbPcpg=kYl8Hi4@=#KEg80X0P*>1C-Gv_H+nTzKuAP4faIK3h3;}b<~+vm}A zkg`6MET~ajv@-fg%71{Lnis*DYPESb!O zb)8&0WvJIO&T^gcl;TM=)lggUsM3^(a9LE9LRhNYu=8w`Ldiz5R5JP-v7oEEm^D}Ai

wmO|5cm(r^B)%*=a>x+~6s3&Xh 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 Date: Mon, 16 Apr 2018 12:16:21 +0200 Subject: [PATCH 14/28] Fix --- phpunit.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xsd b/phpunit.xsd index fd51faaaff5..2f3dfc58374 100644 --- a/phpunit.xsd +++ b/phpunit.xsd @@ -2,7 +2,7 @@ - This Schema file defines the rules by which the XML configuration file of PHPUnit 7.0 may be structured. + This Schema file defines the rules by which the XML configuration file of PHPUnit 7.1 may be structured. From b881247de0e692f5cb702642c2bc5a57646eb311 Mon Sep 17 00:00:00 2001 From: Rafael Beckel Date: Fri, 2 Mar 2018 05:18:23 +0000 Subject: [PATCH 15/28] Fixes #3031 based on 7.0.2 - getStatus() now detects thrown Exception inside tearDown() --- src/Framework/TestCase.php | 4 +++- tests/Framework/TestCaseTest.php | 8 +++++++ .../ExceptionInTestDetectedInTeardown.php | 21 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/_files/ExceptionInTestDetectedInTeardown.php diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php index ace15a4319f..040702d2f8f 100644 --- a/src/Framework/TestCase.php +++ b/src/Framework/TestCase.php @@ -867,7 +867,9 @@ public function runBare(): void $this->status = BaseTestRunner::STATUS_FAILURE; $this->statusMessage = $e->getMessage(); } catch (Throwable $_e) { - $e = $_e; + $e = $_e; + $this->status = BaseTestRunner::STATUS_ERROR; + $this->statusMessage = $_e->getMessage(); } $this->mockObjects = []; diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php index 10843d1c929..35fe6829676 100644 --- a/tests/Framework/TestCaseTest.php +++ b/tests/Framework/TestCaseTest.php @@ -177,6 +177,14 @@ public function testExceptionInTearDown(): void $this->assertEquals(BaseTestRunner::STATUS_ERROR, $test->getStatus()); } + public function testExceptionInTestIsDetectedInTeardown(): void + { + $test = new \ExceptionInTestDetectedInTeardown('testSomething'); + $test->run(); + + $this->assertTrue($test->exceptionDetected); + } + public function testNoArgTestCasePasses(): void { $result = new TestResult; diff --git a/tests/_files/ExceptionInTestDetectedInTeardown.php b/tests/_files/ExceptionInTestDetectedInTeardown.php new file mode 100644 index 00000000000..3ae0185b134 --- /dev/null +++ b/tests/_files/ExceptionInTestDetectedInTeardown.php @@ -0,0 +1,21 @@ +getStatus()) { + $this->exceptionDetected = true; + } + } +} From 04a6ba40e15578405b2374f25970c42cac5b4e18 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 08:20:08 +0200 Subject: [PATCH 16/28] Apply php-cs-fixer to all sourcecode files in the tests/ directory --- .php_cs.dist | 4 +- .../Regression/GitHub/1149/Issue1149Test.php | 8 +++ .../Regression/GitHub/1216/Issue1216Test.php | 8 +++ .../Regression/GitHub/1216/bootstrap1216.php | 8 +++ .../Regression/GitHub/1265/Issue1265Test.php | 8 +++ .../Regression/GitHub/1330/Issue1330Test.php | 8 +++ .../Regression/GitHub/1335/Issue1335Test.php | 8 +++ .../Regression/GitHub/1335/bootstrap1335.php | 8 +++ .../Regression/GitHub/1337/Issue1337Test.php | 10 ++++ .../Regression/GitHub/1348/Issue1348Test.php | 12 ++++- .../GitHub/1351/ChildProcessClass1351.php | 8 +++ .../Regression/GitHub/1351/Issue1351Test.php | 13 ++++- .../Regression/GitHub/1374/Issue1374Test.php | 16 ++++-- .../Regression/GitHub/1437/Issue1437Test.php | 10 +++- .../Regression/GitHub/1468/Issue1468Test.php | 8 +++ .../Regression/GitHub/1471/Issue1471Test.php | 8 +++ .../Regression/GitHub/1472/Issue1472Test.php | 8 +++ .../Regression/GitHub/1570/Issue1570Test.php | 8 +++ .../Regression/GitHub/2137/Issue2137Test.php | 10 +++- .../Regression/GitHub/2145/Issue2145Test.php | 8 +++ .../Regression/GitHub/2158/Issue2158Test.php | 10 +++- .../Regression/GitHub/2366/Issue2366Test.php | 10 ++++ .../Regression/GitHub/2380/Issue2380Test.php | 10 ++++ .../Regression/GitHub/2382/Issue2382Test.php | 10 ++++ .../Regression/GitHub/2435/Issue2435Test.php | 9 +++- tests/Regression/GitHub/244/Issue244Test.php | 8 +++ .../Regression/GitHub/2448-existing-test.phpt | 2 +- tests/Regression/GitHub/2448/Test.php | 8 +++ .../GitHub/2591/SeparateClassPreserveTest.php | 9 +++- .../2591/SeparateFunctionNoPreserveTest.php | 9 +++- .../2591/SeparateFunctionPreserveTest.php | 9 +++- .../GitHub/2591/bootstrapNoBootstrap.php | 12 ++++- .../GitHub/2591/bootstrapWithBootstrap.php | 10 +++- .../2591/bootstrapWithBootstrapNoGlobal.php | 11 +++- .../2724-diff-pid-from-master-process.phpt | 2 +- ...SeparateClassRunMethodInNewProcessTest.php | 24 ++++++--- .../GitHub/2725/BeforeAfterClassPidTest.php | 35 +++++++----- .../Regression/GitHub/2731/Issue2731Test.php | 8 +++ .../Regression/GitHub/2811/Issue2811Test.php | 8 +++ .../Regression/GitHub/2830/Issue2830Test.php | 13 +++-- .../GitHub/2972/issue-2972-test.phpt | 2 +- .../2972/unconventiallyNamedIssue2972Test.php | 9 +++- tests/Regression/GitHub/322/Issue322Test.php | 8 +++ tests/Regression/GitHub/433/Issue433Test.php | 8 +++ tests/Regression/GitHub/445/Issue445Test.php | 8 +++ tests/Regression/GitHub/498/Issue498Test.php | 13 ++++- tests/Regression/GitHub/503/Issue503Test.php | 8 +++ tests/Regression/GitHub/581/Issue581Test.php | 8 +++ tests/Regression/GitHub/74/Issue74Test.php | 9 ++++ tests/Regression/GitHub/74/NewException.php | 8 +++ tests/Regression/GitHub/765/Issue765Test.php | 10 ++++ tests/Regression/GitHub/797/Issue797Test.php | 8 +++ tests/Regression/GitHub/797/bootstrap797.php | 9 +++- tests/Regression/GitHub/863.phpt | 2 +- tests/Regression/GitHub/873/Issue873Test.php | 13 +++-- tests/Regression/Trac/1021/Issue1021Test.php | 10 ++++ tests/Regression/Trac/523/Issue523Test.php | 8 +++ tests/Regression/Trac/578/Issue578Test.php | 12 ++++- tests/Regression/Trac/684/Issue684Test.php | 8 +++ tests/Regression/Trac/783/ChildSuite.php | 9 ++++ tests/Regression/Trac/783/OneTest.php | 8 +++ tests/Regression/Trac/783/ParentSuite.php | 8 +++ tests/Regression/Trac/783/TwoTest.php | 8 +++ tests/TextUI/_files/Extension.php | 10 +++- tests/TextUI/_files/HookTest.php | 8 +++ tests/TextUI/_files/NullPrinter.php | 10 +++- tests/TextUI/mycommand.phpt | 1 + tests/TextUI/teamcity-inner-exceptions.phpt | 4 +- tests/TextUI/testdox-xml.phpt | 2 +- tests/Util/TestTest.php | 54 +++++++++---------- tests/_files/AbstractTest.php | 8 +++ tests/_files/ArrayAccessible.php | 11 +++- tests/_files/AssertionExample.php | 10 +++- tests/_files/AssertionExampleTest.php | 8 +++ tests/_files/BankAccount.php | 30 +++++------ tests/_files/BeforeAndAfterTest.php | 9 ++++ tests/_files/BeforeClassAndAfterClassTest.php | 9 ++++ .../BeforeClassWithOnlyDataProviderTest.php | 18 +++++-- tests/_files/Book.php | 2 +- tests/_files/Calculator.php | 11 ++++ .../ChangeCurrentWorkingDirectoryTest.php | 10 +++- tests/_files/ClassWithNonPublicAttributes.php | 16 ++++-- .../ClassWithScalarTypeDeclarations.php | 8 +++ tests/_files/ClonedDependencyTest.php | 18 +++++++ tests/_files/ConcreteTest.my.php | 8 +++ tests/_files/ConcreteTest.php | 8 +++ tests/_files/CountConstraint.php | 10 +++- tests/_files/CoverageClassExtendedTest.php | 8 +++ tests/_files/CoverageClassTest.php | 8 +++ .../CoverageFunctionParenthesesTest.php | 8 +++ ...erageFunctionParenthesesWhitespaceTest.php | 8 +++ tests/_files/CoverageFunctionTest.php | 8 +++ .../CoverageMethodOneLineAnnotationTest.php | 9 +++- .../_files/CoverageMethodParenthesesTest.php | 8 +++ ...overageMethodParenthesesWhitespaceTest.php | 8 +++ tests/_files/CoverageMethodTest.php | 8 +++ .../_files/CoverageNamespacedFunctionTest.php | 8 +++ tests/_files/CoverageNoneTest.php | 8 +++ tests/_files/CoverageNotPrivateTest.php | 8 +++ tests/_files/CoverageNotProtectedTest.php | 8 +++ tests/_files/CoverageNotPublicTest.php | 8 +++ tests/_files/CoverageNothingTest.php | 8 +++ tests/_files/CoveragePrivateTest.php | 8 +++ tests/_files/CoverageProtectedTest.php | 8 +++ tests/_files/CoveragePublicTest.php | 8 +++ .../CoverageTwoDefaultClassAnnotations.php | 8 +++ tests/_files/CoveredClass.php | 22 +++++--- tests/_files/CoveredFunction.php | 8 +++ tests/_files/CustomPrinter.php | 8 +++ tests/_files/DataProviderDebugTest.php | 34 +++++++----- tests/_files/DataProviderDependencyTest.php | 11 ++++ tests/_files/DataProviderFilterTest.php | 44 +++++++++------ tests/_files/DataProviderIncompleteTest.php | 32 ++++++++--- .../DataProviderIssue2833/FirstTest.php | 11 +++- .../DataProviderIssue2833/SecondTest.php | 9 +++- .../another/TestWithDataProviderTest.php | 11 +++- .../DataProviderIssue2922/FirstTest.php | 11 +++- .../DataProviderIssue2922/SecondTest.php | 9 +++- tests/_files/DataProviderSkippedTest.php | 32 ++++++++--- tests/_files/DataProviderTest.php | 28 +++++++--- tests/_files/DataProviderTestDoxTest.php | 8 +++ tests/_files/DependencyFailureTest.php | 8 +++ tests/_files/DependencySuccessTest.php | 8 +++ tests/_files/DependencyTestSuite.php | 8 +++ tests/_files/DoubleTestCase.php | 12 ++++- tests/_files/DummyException.php | 9 +++- tests/_files/EmptyTestCaseTest.php | 8 +++ .../ExceptionInAssertPostConditionsTest.php | 23 +++++--- .../ExceptionInAssertPreConditionsTest.php | 23 +++++--- tests/_files/ExceptionInSetUpTest.php | 21 +++++--- tests/_files/ExceptionInTearDownTest.php | 23 +++++--- tests/_files/ExceptionInTest.php | 21 +++++--- .../ExceptionInTestDetectedInTeardown.php | 18 +++++-- tests/_files/ExceptionNamespaceTest.php | 9 +++- tests/_files/ExceptionStackTest.php | 8 +++ tests/_files/ExceptionTest.php | 8 +++ tests/_files/Failure.php | 8 +++ tests/_files/FailureTest.php | 8 +++ tests/_files/FalsyConstraint.php | 10 +++- tests/_files/FatalTest.php | 13 +++-- tests/_files/IgnoreCodeCoverageClass.php | 9 ++++ tests/_files/IgnoreCodeCoverageClassTest.php | 8 +++ tests/_files/IncompleteTest.php | 8 +++ tests/_files/Inheritance/InheritanceA.php | 9 +++- tests/_files/Inheritance/InheritanceB.php | 9 +++- tests/_files/InheritedTestCase.php | 8 +++ tests/_files/IniTest.php | 10 +++- tests/_files/IsolationTest.php | 8 +++ tests/_files/MockRunner.php | 8 +++ tests/_files/Mockable.php | 18 +++++-- tests/_files/MultiDependencyTest.php | 11 ++++ tests/_files/MultipleDataProviderTest.php | 48 ++++++++++------- tests/_files/MyCommand.php | 12 ++++- tests/_files/NamedConstraint.php | 8 +++ .../NamespaceCoverageClassExtendedTest.php | 8 +++ tests/_files/NamespaceCoverageClassTest.php | 8 +++ ...NamespaceCoverageCoversClassPublicTest.php | 8 +++ .../NamespaceCoverageCoversClassTest.php | 8 +++ tests/_files/NamespaceCoverageMethodTest.php | 8 +++ .../NamespaceCoverageNotPrivateTest.php | 8 +++ .../NamespaceCoverageNotProtectedTest.php | 8 +++ .../_files/NamespaceCoverageNotPublicTest.php | 8 +++ tests/_files/NamespaceCoveragePrivateTest.php | 8 +++ .../_files/NamespaceCoverageProtectedTest.php | 8 +++ tests/_files/NamespaceCoveragePublicTest.php | 8 +++ tests/_files/NamespaceCoveredClass.php | 22 +++++--- tests/_files/NamespaceCoveredFunction.php | 8 +++ tests/_files/NoArgTestCaseTest.php | 8 +++ tests/_files/NoTestCaseClass.php | 8 +++ tests/_files/NoTestCases.php | 8 +++ tests/_files/NonStatic.php | 8 +++ .../_files/NotExistingCoveredElementTest.php | 8 +++ tests/_files/NotPublicTestCase.php | 8 +++ tests/_files/NotVoidTestCase.php | 8 +++ tests/_files/NothingTest.php | 8 +++ tests/_files/OneTestCase.php | 8 +++ tests/_files/OutputTestCase.php | 8 +++ tests/_files/OverrideTestCase.php | 8 +++ .../_files/ParseTestMethodAnnotationsMock.php | 9 ++++ .../RequirementsClassBeforeClassHookTest.php | 8 +++ .../_files/RequirementsClassDocBlockTest.php | 8 +++ tests/_files/RequirementsTest.php | 3 ++ tests/_files/SampleArrayAccess.php | 18 ++++--- tests/_files/SampleClass.php | 8 +++ tests/_files/Singleton.php | 24 ++++++--- tests/_files/StackTest.php | 12 ++++- tests/_files/StatusTest.php | 8 +++ tests/_files/StopOnWarningTestSuite.php | 8 +++ tests/_files/StopsOnWarningTest.php | 8 +++ tests/_files/Struct.php | 8 +++ tests/_files/Success.php | 8 +++ tests/_files/TemplateMethodsTest.php | 25 ++++++--- tests/_files/TestAutoreferenced.php | 10 +++- tests/_files/TestDoxGroupTest.php | 9 +++- tests/_files/TestGeneratorMaker.php | 8 +++ tests/_files/TestIncomplete.php | 8 +++ tests/_files/TestIterator.php | 10 +++- tests/_files/TestIterator2.php | 18 +++++-- tests/_files/TestIteratorAggregate.php | 9 +++- tests/_files/TestIteratorAggregate2.php | 11 ++-- tests/_files/TestSkipped.php | 8 +++ tests/_files/TestTestError.php | 8 +++ tests/_files/TestWithTest.php | 32 +++++++---- tests/_files/ThrowExceptionTestCase.php | 8 +++ tests/_files/ThrowNoExceptionTestCase.php | 8 +++ tests/_files/TruthyConstraint.php | 10 +++- .../VariousIterableDataProviderTest.php | 29 ++++++---- tests/_files/WasRun.php | 8 +++ tests/_files/WrapperIteratorAggregate.php | 11 +++- .../tests/OneTest.php | 8 +++ tests/bootstrap.php | 34 ++++++++++-- 211 files changed, 1997 insertions(+), 335 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index e23e1e35851..3e782bc94fc 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -164,8 +164,6 @@ return PhpCsFixer\Config::create() ->files() ->in(__DIR__ . '/build') ->in(__DIR__ . '/src') - ->in(__DIR__ . '/tests/Framework') - ->in(__DIR__ . '/tests/Runner') - ->in(__DIR__ . '/tests/Util') + ->in(__DIR__ . '/tests') ->name('*.php') ); diff --git a/tests/Regression/GitHub/1149/Issue1149Test.php b/tests/Regression/GitHub/1149/Issue1149Test.php index 99e80cb7318..382d9d8675a 100644 --- a/tests/Regression/GitHub/1149/Issue1149Test.php +++ b/tests/Regression/GitHub/1149/Issue1149Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1149Test extends TestCase diff --git a/tests/Regression/GitHub/1216/Issue1216Test.php b/tests/Regression/GitHub/1216/Issue1216Test.php index 37ddb154ef8..574b7dd23bd 100644 --- a/tests/Regression/GitHub/1216/Issue1216Test.php +++ b/tests/Regression/GitHub/1216/Issue1216Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1216Test extends TestCase diff --git a/tests/Regression/GitHub/1216/bootstrap1216.php b/tests/Regression/GitHub/1216/bootstrap1216.php index cec2724aa6f..9d0eb300579 100644 --- a/tests/Regression/GitHub/1216/bootstrap1216.php +++ b/tests/Regression/GitHub/1216/bootstrap1216.php @@ -1,2 +1,10 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ $_ENV['configAvailableInBootstrap'] = isset($_ENV['loadedFromConfig']); diff --git a/tests/Regression/GitHub/1265/Issue1265Test.php b/tests/Regression/GitHub/1265/Issue1265Test.php index f6c3f092212..5e550ea13b0 100644 --- a/tests/Regression/GitHub/1265/Issue1265Test.php +++ b/tests/Regression/GitHub/1265/Issue1265Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1265Test extends TestCase diff --git a/tests/Regression/GitHub/1330/Issue1330Test.php b/tests/Regression/GitHub/1330/Issue1330Test.php index 6e0213a20df..1e363e92274 100644 --- a/tests/Regression/GitHub/1330/Issue1330Test.php +++ b/tests/Regression/GitHub/1330/Issue1330Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1330Test extends TestCase diff --git a/tests/Regression/GitHub/1335/Issue1335Test.php b/tests/Regression/GitHub/1335/Issue1335Test.php index 352e53448bf..2fbfd0b90ce 100644 --- a/tests/Regression/GitHub/1335/Issue1335Test.php +++ b/tests/Regression/GitHub/1335/Issue1335Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** diff --git a/tests/Regression/GitHub/1335/bootstrap1335.php b/tests/Regression/GitHub/1335/bootstrap1335.php index 7165bb2b19f..51dad554b4f 100644 --- a/tests/Regression/GitHub/1335/bootstrap1335.php +++ b/tests/Regression/GitHub/1335/bootstrap1335.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ $globalString = 'Hello'; $globalIntTruthy = 1; $globalIntFalsey = 0; diff --git a/tests/Regression/GitHub/1337/Issue1337Test.php b/tests/Regression/GitHub/1337/Issue1337Test.php index fb2ceaa1b54..905edc5a63a 100644 --- a/tests/Regression/GitHub/1337/Issue1337Test.php +++ b/tests/Regression/GitHub/1337/Issue1337Test.php @@ -1,10 +1,20 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1337Test extends TestCase { /** * @dataProvider dataProvider + * + * @param mixed $a */ public function testProvider($a) { diff --git a/tests/Regression/GitHub/1348/Issue1348Test.php b/tests/Regression/GitHub/1348/Issue1348Test.php index a8dfc7cd668..526bf1d1312 100644 --- a/tests/Regression/GitHub/1348/Issue1348Test.php +++ b/tests/Regression/GitHub/1348/Issue1348Test.php @@ -1,16 +1,24 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1348Test extends TestCase { public function testSTDOUT() { - fwrite(STDOUT, "\nSTDOUT does not break test result\n"); + \fwrite(STDOUT, "\nSTDOUT does not break test result\n"); $this->assertTrue(true); } public function testSTDERR() { - fwrite(STDERR, 'STDERR works as usual.'); + \fwrite(STDERR, 'STDERR works as usual.'); } } diff --git a/tests/Regression/GitHub/1351/ChildProcessClass1351.php b/tests/Regression/GitHub/1351/ChildProcessClass1351.php index 24c05376667..2bac282f92f 100644 --- a/tests/Regression/GitHub/1351/ChildProcessClass1351.php +++ b/tests/Regression/GitHub/1351/ChildProcessClass1351.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class ChildProcessClass1351 { } diff --git a/tests/Regression/GitHub/1351/Issue1351Test.php b/tests/Regression/GitHub/1351/Issue1351Test.php index 47ebcbfcfd3..50d9af34b46 100644 --- a/tests/Regression/GitHub/1351/Issue1351Test.php +++ b/tests/Regression/GitHub/1351/Issue1351Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1351Test extends TestCase @@ -17,7 +25,7 @@ public function testFailurePre() public function testFailurePost() { $this->assertNull($this->instance); - $this->assertFalse(class_exists(ChildProcessClass1351::class, false), 'ChildProcessClass1351 is not loaded.'); + $this->assertFalse(\class_exists(ChildProcessClass1351::class, false), 'ChildProcessClass1351 is not loaded.'); } /** @@ -26,6 +34,7 @@ public function testFailurePost() public function testExceptionPre() { $this->instance = new ChildProcessClass1351(); + try { throw new LogicException('Expected exception.'); } catch (LogicException $e) { @@ -36,7 +45,7 @@ public function testExceptionPre() public function testExceptionPost() { $this->assertNull($this->instance); - $this->assertFalse(class_exists(ChildProcessClass1351::class, false), 'ChildProcessClass1351 is not loaded.'); + $this->assertFalse(\class_exists(ChildProcessClass1351::class, false), 'ChildProcessClass1351 is not loaded.'); } public function testPhpCoreLanguageException() diff --git a/tests/Regression/GitHub/1374/Issue1374Test.php b/tests/Regression/GitHub/1374/Issue1374Test.php index d9a97c5bf7f..1c590fe160f 100644 --- a/tests/Regression/GitHub/1374/Issue1374Test.php +++ b/tests/Regression/GitHub/1374/Issue1374Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** @@ -11,13 +19,13 @@ protected function setUp(): void print __FUNCTION__; } - public function testSomething() + protected function tearDown(): void { - $this->fail('This should not be reached'); + print __FUNCTION__; } - protected function tearDown(): void + public function testSomething() { - print __FUNCTION__; + $this->fail('This should not be reached'); } } diff --git a/tests/Regression/GitHub/1437/Issue1437Test.php b/tests/Regression/GitHub/1437/Issue1437Test.php index 08b799b7242..5b9c4b7b612 100644 --- a/tests/Regression/GitHub/1437/Issue1437Test.php +++ b/tests/Regression/GitHub/1437/Issue1437Test.php @@ -1,11 +1,19 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1437Test extends TestCase { public function testFailure() { - ob_start(); + \ob_start(); $this->assertTrue(false); } } diff --git a/tests/Regression/GitHub/1468/Issue1468Test.php b/tests/Regression/GitHub/1468/Issue1468Test.php index 94efc97635a..b61ce1cac13 100644 --- a/tests/Regression/GitHub/1468/Issue1468Test.php +++ b/tests/Regression/GitHub/1468/Issue1468Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1468Test extends TestCase diff --git a/tests/Regression/GitHub/1471/Issue1471Test.php b/tests/Regression/GitHub/1471/Issue1471Test.php index 013ccdb2302..b6b9159c649 100644 --- a/tests/Regression/GitHub/1471/Issue1471Test.php +++ b/tests/Regression/GitHub/1471/Issue1471Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1471Test extends TestCase diff --git a/tests/Regression/GitHub/1472/Issue1472Test.php b/tests/Regression/GitHub/1472/Issue1472Test.php index 8f517c187a4..76c9963d595 100644 --- a/tests/Regression/GitHub/1472/Issue1472Test.php +++ b/tests/Regression/GitHub/1472/Issue1472Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1472Test extends TestCase diff --git a/tests/Regression/GitHub/1570/Issue1570Test.php b/tests/Regression/GitHub/1570/Issue1570Test.php index dec80acf485..ecc399c7536 100644 --- a/tests/Regression/GitHub/1570/Issue1570Test.php +++ b/tests/Regression/GitHub/1570/Issue1570Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1570Test extends TestCase diff --git a/tests/Regression/GitHub/2137/Issue2137Test.php b/tests/Regression/GitHub/2137/Issue2137Test.php index b52c99b35c2..2b56ce5c25f 100644 --- a/tests/Regression/GitHub/2137/Issue2137Test.php +++ b/tests/Regression/GitHub/2137/Issue2137Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Issue2137Test extends PHPUnit\Framework\TestCase { /** @@ -16,7 +24,6 @@ public function testBrandService($provided, $expected) $this->assertSame($provided, $expected); } - public function provideBrandService() { return [ @@ -25,7 +32,6 @@ public function provideBrandService() ]; } - /** * @dataProvider provideBrandService * diff --git a/tests/Regression/GitHub/2145/Issue2145Test.php b/tests/Regression/GitHub/2145/Issue2145Test.php index 4076f5ce005..a2465e4c22b 100644 --- a/tests/Regression/GitHub/2145/Issue2145Test.php +++ b/tests/Regression/GitHub/2145/Issue2145Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Issue2145Test extends PHPUnit\Framework\TestCase { public static function setUpBeforeClass(): void diff --git a/tests/Regression/GitHub/2158/Issue2158Test.php b/tests/Regression/GitHub/2158/Issue2158Test.php index 2f6e01b91a1..b320077ee4d 100644 --- a/tests/Regression/GitHub/2158/Issue2158Test.php +++ b/tests/Regression/GitHub/2158/Issue2158Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue2158Test extends TestCase @@ -20,6 +28,6 @@ public function testSomething() */ public function testSomethingElse() { - $this->assertTrue(defined('TEST_CONSTANT')); + $this->assertTrue(\defined('TEST_CONSTANT')); } } diff --git a/tests/Regression/GitHub/2366/Issue2366Test.php b/tests/Regression/GitHub/2366/Issue2366Test.php index 17be78289fd..7426b1abe16 100644 --- a/tests/Regression/GitHub/2366/Issue2366Test.php +++ b/tests/Regression/GitHub/2366/Issue2366Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue2366 @@ -12,6 +20,8 @@ class Issue2366Test extends TestCase { /** * @dataProvider provider + * + * @param mixed $o */ public function testOne($o) { diff --git a/tests/Regression/GitHub/2380/Issue2380Test.php b/tests/Regression/GitHub/2380/Issue2380Test.php index 55c2b80a0fc..c038a5fe2ed 100644 --- a/tests/Regression/GitHub/2380/Issue2380Test.php +++ b/tests/Regression/GitHub/2380/Issue2380Test.php @@ -1,10 +1,20 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue2380Test extends TestCase { /** * @dataProvider generatorData + * + * @param mixed $data */ public function testGeneratorProvider($data) { diff --git a/tests/Regression/GitHub/2382/Issue2382Test.php b/tests/Regression/GitHub/2382/Issue2382Test.php index 9fd49cb0f97..45e02635ce4 100644 --- a/tests/Regression/GitHub/2382/Issue2382Test.php +++ b/tests/Regression/GitHub/2382/Issue2382Test.php @@ -1,10 +1,20 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue2382Test extends TestCase { /** * @dataProvider dataProvider + * + * @param mixed $test */ public function testOne($test) { diff --git a/tests/Regression/GitHub/2435/Issue2435Test.php b/tests/Regression/GitHub/2435/Issue2435Test.php index fdfd196b403..fba5ab3a92b 100644 --- a/tests/Regression/GitHub/2435/Issue2435Test.php +++ b/tests/Regression/GitHub/2435/Issue2435Test.php @@ -1,6 +1,11 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ class Issue2435Test extends PHPUnit\Framework\TestCase { diff --git a/tests/Regression/GitHub/244/Issue244Test.php b/tests/Regression/GitHub/244/Issue244Test.php index efa98f46e28..200bb48adab 100644 --- a/tests/Regression/GitHub/244/Issue244Test.php +++ b/tests/Regression/GitHub/244/Issue244Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue244Test extends TestCase diff --git a/tests/Regression/GitHub/2448-existing-test.phpt b/tests/Regression/GitHub/2448-existing-test.phpt index 5b27253dd39..6b968ce4d04 100644 --- a/tests/Regression/GitHub/2448-existing-test.phpt +++ b/tests/Regression/GitHub/2448-existing-test.phpt @@ -5,7 +5,7 @@ $_SERVER['argv'][1] = '--no-configuration'; $_SERVER['argv'][2] = 'Test'; -chdir(__DIR__.'/2448'); +\chdir(__DIR__ . '/2448'); require __DIR__ . '/../../bootstrap.php'; PHPUnit\TextUI\Command::main(); diff --git a/tests/Regression/GitHub/2448/Test.php b/tests/Regression/GitHub/2448/Test.php index 95a032c376a..401a2f8779f 100644 --- a/tests/Regression/GitHub/2448/Test.php +++ b/tests/Regression/GitHub/2448/Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Test extends PHPUnit\Framework\TestCase { public function testOne() diff --git a/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php b/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php index b6141d07e32..b2737996dab 100644 --- a/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php +++ b/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** @@ -24,5 +32,4 @@ public function testGlobalString() { $this->assertEquals('Hello', $GLOBALS['globalString']); } - } diff --git a/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php b/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php index 92c013ec796..2b099ae1f43 100644 --- a/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php +++ b/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** @@ -17,5 +25,4 @@ public function testGlobalString() { $this->assertEquals('Hello', $GLOBALS['globalString']); } - } diff --git a/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php b/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php index 61b2a78e237..be04b4a8601 100644 --- a/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php +++ b/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** @@ -17,5 +25,4 @@ public function testGlobalString() { $this->assertEquals('Hello', $GLOBALS['globalString']); } - } diff --git a/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php b/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php index ba308f2a2ac..bc1e307ac00 100644 --- a/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php +++ b/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php @@ -1,6 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +\ini_set('display_errors', 0); +\ini_set('log_errors', 1); $globalString = 'Hello'; diff --git a/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php b/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php index 656f7dcbd9a..75426911b14 100644 --- a/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php +++ b/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ $globalString = 'Hello'; -require __DIR__ . '/../../../bootstrap.php'; \ No newline at end of file +require __DIR__ . '/../../../bootstrap.php'; diff --git a/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php b/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php index 2907ee563c9..66c08c4314d 100644 --- a/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php +++ b/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php @@ -1,4 +1,11 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -require __DIR__ . '/../../../bootstrap.php'; \ No newline at end of file +require __DIR__ . '/../../../bootstrap.php'; diff --git a/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt b/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt index 859f730281c..e05078659dc 100644 --- a/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt +++ b/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt @@ -8,7 +8,7 @@ $_SERVER['argv'][3] = __DIR__ . '/2724/SeparateClassRunMethodInNewProcessTest.ph require __DIR__ . '/../../bootstrap.php'; -file_put_contents(__DIR__ . '/2724/parent_process_id.txt', getmypid()); +\file_put_contents(__DIR__ . '/2724/parent_process_id.txt', \getmypid()); PHPUnit\TextUI\Command::main(); ?> diff --git a/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php b/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php index 4d8cf4ba40b..a26d96dcc83 100644 --- a/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php +++ b/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ /** * @runClassInSeparateProcess @@ -6,18 +14,18 @@ class SeparateClassRunMethodInNewProcessTest extends PHPUnit\Framework\TestCase { const PROCESS_ID_FILE_PATH = __DIR__ . '/parent_process_id.txt'; - const INITIAL_MASTER_PID = 0; - const INITIAL_PID1 = 1; + const INITIAL_MASTER_PID = 0; + const INITIAL_PID1 = 1; public static $masterPid = self::INITIAL_MASTER_PID; - public static $pid1 = self::INITIAL_PID1; + public static $pid1 = self::INITIAL_PID1; public static function setUpBeforeClass() { parent::setUpBeforeClass(); - if (file_exists(self::PROCESS_ID_FILE_PATH)) { - static::$masterPid = (int) file_get_contents(self::PROCESS_ID_FILE_PATH); + if (\file_exists(self::PROCESS_ID_FILE_PATH)) { + static::$masterPid = (int) \file_get_contents(self::PROCESS_ID_FILE_PATH); } } @@ -25,14 +33,14 @@ public static function tearDownAfterClass() { parent::tearDownAfterClass(); - if (file_exists(self::PROCESS_ID_FILE_PATH)) { - unlink(self::PROCESS_ID_FILE_PATH); + if (\file_exists(self::PROCESS_ID_FILE_PATH)) { + \unlink(self::PROCESS_ID_FILE_PATH); } } public function testMethodShouldGetDifferentPidThanMaster() { - static::$pid1 = getmypid(); + static::$pid1 = \getmypid(); $this->assertNotEquals(self::INITIAL_PID1, static::$pid1); $this->assertNotEquals(self::INITIAL_MASTER_PID, static::$masterPid); diff --git a/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php b/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php index 2ea38a934a9..242edcda537 100644 --- a/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php +++ b/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Issue2725; use PHPUnit\Framework\TestCase; @@ -16,17 +23,7 @@ class BeforeAfterClassPidTest extends TestCase */ public static function showPidBefore() { - $GLOBALS[static::PID_VARIABLE] = getmypid(); - } - - public function testMethod1WithItsBeforeAndAfter() - { - $this->assertEquals($GLOBALS[static::PID_VARIABLE], getmypid()); - } - - public function testMethod2WithItsBeforeAndAfter() - { - $this->assertEquals($GLOBALS[static::PID_VARIABLE], getmypid()); + $GLOBALS[static::PID_VARIABLE] = \getmypid(); } /** @@ -34,10 +31,20 @@ public function testMethod2WithItsBeforeAndAfter() */ public static function showPidAfter() { - if ($GLOBALS[static::PID_VARIABLE] - getmypid() !== 0) { - echo "\n@afterClass output - PID difference should be zero!"; + if ($GLOBALS[static::PID_VARIABLE] - \getmypid() !== 0) { + print "\n@afterClass output - PID difference should be zero!"; } unset($GLOBALS[static::PID_VARIABLE]); } + + public function testMethod1WithItsBeforeAndAfter() + { + $this->assertEquals($GLOBALS[static::PID_VARIABLE], \getmypid()); + } + + public function testMethod2WithItsBeforeAndAfter() + { + $this->assertEquals($GLOBALS[static::PID_VARIABLE], \getmypid()); + } } diff --git a/tests/Regression/GitHub/2731/Issue2731Test.php b/tests/Regression/GitHub/2731/Issue2731Test.php index 0d1e6d3cd18..6e9e1397689 100644 --- a/tests/Regression/GitHub/2731/Issue2731Test.php +++ b/tests/Regression/GitHub/2731/Issue2731Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Issue2731Test extends PHPUnit\Framework\TestCase { public function testOne() diff --git a/tests/Regression/GitHub/2811/Issue2811Test.php b/tests/Regression/GitHub/2811/Issue2811Test.php index 20bb57037f2..ad5d37e68db 100644 --- a/tests/Regression/GitHub/2811/Issue2811Test.php +++ b/tests/Regression/GitHub/2811/Issue2811Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Issue2811Test extends PHPUnit\Framework\TestCase { public function testOne() diff --git a/tests/Regression/GitHub/2830/Issue2830Test.php b/tests/Regression/GitHub/2830/Issue2830Test.php index 4a9497680e9..811746c9ace 100644 --- a/tests/Regression/GitHub/2830/Issue2830Test.php +++ b/tests/Regression/GitHub/2830/Issue2830Test.php @@ -1,8 +1,13 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ + class Issue2830Test extends PHPUnit\Framework\TestCase { /** @@ -19,4 +24,4 @@ public function simpleDataProvider() ['foo'], ]; } -} \ No newline at end of file +} diff --git a/tests/Regression/GitHub/2972/issue-2972-test.phpt b/tests/Regression/GitHub/2972/issue-2972-test.phpt index 4d09cf5a94e..2d7dd750d1f 100644 --- a/tests/Regression/GitHub/2972/issue-2972-test.phpt +++ b/tests/Regression/GitHub/2972/issue-2972-test.phpt @@ -2,7 +2,7 @@ Just a sample test for issue 2972, does not actually test anything --FILE-- ===DONE=== --EXPECT-- diff --git a/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php b/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php index 3fd57f018ec..56aedf7edbc 100644 --- a/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php +++ b/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Issue2972; use PHPUnit\Framework\TestCase; diff --git a/tests/Regression/GitHub/322/Issue322Test.php b/tests/Regression/GitHub/322/Issue322Test.php index 894a06f2cac..f5750e0dad5 100644 --- a/tests/Regression/GitHub/322/Issue322Test.php +++ b/tests/Regression/GitHub/322/Issue322Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue322Test extends TestCase diff --git a/tests/Regression/GitHub/433/Issue433Test.php b/tests/Regression/GitHub/433/Issue433Test.php index eb865767107..ac31d6283d0 100644 --- a/tests/Regression/GitHub/433/Issue433Test.php +++ b/tests/Regression/GitHub/433/Issue433Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue433Test extends TestCase diff --git a/tests/Regression/GitHub/445/Issue445Test.php b/tests/Regression/GitHub/445/Issue445Test.php index 560835eba6e..f361081671a 100644 --- a/tests/Regression/GitHub/445/Issue445Test.php +++ b/tests/Regression/GitHub/445/Issue445Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue445Test extends TestCase diff --git a/tests/Regression/GitHub/498/Issue498Test.php b/tests/Regression/GitHub/498/Issue498Test.php index 993419f7a98..4d9da1e089f 100644 --- a/tests/Regression/GitHub/498/Issue498Test.php +++ b/tests/Regression/GitHub/498/Issue498Test.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue498Test extends TestCase @@ -8,6 +15,8 @@ class Issue498Test extends TestCase * @test * @dataProvider shouldBeTrueDataProvider * @group falseOnly + * + * @param mixed $testData */ public function shouldBeTrue($testData) { @@ -18,6 +27,8 @@ public function shouldBeTrue($testData) * @test * @dataProvider shouldBeFalseDataProvider * @group trueOnly + * + * @param mixed $testData */ public function shouldBeFalse($testData) { diff --git a/tests/Regression/GitHub/503/Issue503Test.php b/tests/Regression/GitHub/503/Issue503Test.php index 2d1af390c48..e9903ede5fe 100644 --- a/tests/Regression/GitHub/503/Issue503Test.php +++ b/tests/Regression/GitHub/503/Issue503Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue503Test extends TestCase diff --git a/tests/Regression/GitHub/581/Issue581Test.php b/tests/Regression/GitHub/581/Issue581Test.php index 05e01076b5a..8d5e00febd6 100644 --- a/tests/Regression/GitHub/581/Issue581Test.php +++ b/tests/Regression/GitHub/581/Issue581Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue581Test extends TestCase diff --git a/tests/Regression/GitHub/74/Issue74Test.php b/tests/Regression/GitHub/74/Issue74Test.php index 6e9faf3bcea..141bbe680e2 100644 --- a/tests/Regression/GitHub/74/Issue74Test.php +++ b/tests/Regression/GitHub/74/Issue74Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue74Test extends TestCase @@ -6,6 +14,7 @@ class Issue74Test extends TestCase public function testCreateAndThrowNewExceptionInProcessIsolation() { require_once __DIR__ . '/NewException.php'; + throw new NewException('Testing GH-74'); } } diff --git a/tests/Regression/GitHub/74/NewException.php b/tests/Regression/GitHub/74/NewException.php index abe2f7119a9..61dd361aa05 100644 --- a/tests/Regression/GitHub/74/NewException.php +++ b/tests/Regression/GitHub/74/NewException.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class NewException extends Exception { } diff --git a/tests/Regression/GitHub/765/Issue765Test.php b/tests/Regression/GitHub/765/Issue765Test.php index f8d732d0eb0..603bb89626e 100644 --- a/tests/Regression/GitHub/765/Issue765Test.php +++ b/tests/Regression/GitHub/765/Issue765Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue765Test extends TestCase @@ -11,6 +19,8 @@ public function testDependee() /** * @depends testDependee * @dataProvider dependentProvider + * + * @param mixed $a */ public function testDependent($a) { diff --git a/tests/Regression/GitHub/797/Issue797Test.php b/tests/Regression/GitHub/797/Issue797Test.php index a10d3dd9d54..43c8f2c2d95 100644 --- a/tests/Regression/GitHub/797/Issue797Test.php +++ b/tests/Regression/GitHub/797/Issue797Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue797Test extends TestCase diff --git a/tests/Regression/GitHub/797/bootstrap797.php b/tests/Regression/GitHub/797/bootstrap797.php index 03890a35a89..b51cb8e66bb 100644 --- a/tests/Regression/GitHub/797/bootstrap797.php +++ b/tests/Regression/GitHub/797/bootstrap797.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ // PHPUnit_Framework_TestCase itself does not exist. :-) require __DIR__ . '/../../../bootstrap.php'; diff --git a/tests/Regression/GitHub/863.phpt b/tests/Regression/GitHub/863.phpt index ef04db1b164..df1c62719bc 100644 --- a/tests/Regression/GitHub/863.phpt +++ b/tests/Regression/GitHub/863.phpt @@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration'; $_SERVER['argv'][2] = '--repeat'; $_SERVER['argv'][3] = '50'; $_SERVER['argv'][4] = 'BankAccountTest'; -$_SERVER['argv'][5] = dirname(dirname(__DIR__)) . '/_files/BankAccountTest.php'; +$_SERVER['argv'][5] = \dirname(\dirname(__DIR__)) . '/_files/BankAccountTest.php'; require __DIR__ . '/../../bootstrap.php'; PHPUnit\TextUI\Command::main(); diff --git a/tests/Regression/GitHub/873/Issue873Test.php b/tests/Regression/GitHub/873/Issue873Test.php index 70fd9046403..5a611380145 100644 --- a/tests/Regression/GitHub/873/Issue873Test.php +++ b/tests/Regression/GitHub/873/Issue873Test.php @@ -1,7 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +if (\extension_loaded('xdebug')) { + \xdebug_disable(); } throw new Exception( diff --git a/tests/Regression/Trac/1021/Issue1021Test.php b/tests/Regression/Trac/1021/Issue1021Test.php index f4b4c34510f..2d21a418913 100644 --- a/tests/Regression/Trac/1021/Issue1021Test.php +++ b/tests/Regression/Trac/1021/Issue1021Test.php @@ -1,10 +1,20 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue1021Test extends TestCase { /** * @dataProvider provider + * + * @param mixed $data */ public function testSomething($data) { diff --git a/tests/Regression/Trac/523/Issue523Test.php b/tests/Regression/Trac/523/Issue523Test.php index 1a10414a663..bbc527c190d 100644 --- a/tests/Regression/Trac/523/Issue523Test.php +++ b/tests/Regression/Trac/523/Issue523Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue523Test extends TestCase diff --git a/tests/Regression/Trac/578/Issue578Test.php b/tests/Regression/Trac/578/Issue578Test.php index 24b8248828b..e996037f442 100644 --- a/tests/Regression/Trac/578/Issue578Test.php +++ b/tests/Regression/Trac/578/Issue578Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Issue578Test extends TestCase @@ -6,13 +14,13 @@ class Issue578Test extends TestCase public function testNoticesDoublePrintStackTrace() { $this->iniSet('error_reporting', E_ALL | E_NOTICE); - trigger_error('Stack Trace Test Notice', E_NOTICE); + \trigger_error('Stack Trace Test Notice', E_NOTICE); } public function testWarningsDoublePrintStackTrace() { $this->iniSet('error_reporting', E_ALL | E_NOTICE); - trigger_error('Stack Trace Test Notice', E_WARNING); + \trigger_error('Stack Trace Test Notice', E_WARNING); } public function testUnexpectedExceptionsPrintsCorrectly() diff --git a/tests/Regression/Trac/684/Issue684Test.php b/tests/Regression/Trac/684/Issue684Test.php index 3a300b0e099..4e14dbb30bc 100644 --- a/tests/Regression/Trac/684/Issue684Test.php +++ b/tests/Regression/Trac/684/Issue684Test.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Foo_Bar_Issue684Test extends TestCase diff --git a/tests/Regression/Trac/783/ChildSuite.php b/tests/Regression/Trac/783/ChildSuite.php index 0825462b23b..6b64bda230d 100644 --- a/tests/Regression/Trac/783/ChildSuite.php +++ b/tests/Regression/Trac/783/ChildSuite.php @@ -1,7 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestSuite; require_once 'OneTest.php'; + require_once 'TwoTest.php'; class ChildSuite diff --git a/tests/Regression/Trac/783/OneTest.php b/tests/Regression/Trac/783/OneTest.php index 269ade905bf..2e41da458d4 100644 --- a/tests/Regression/Trac/783/OneTest.php +++ b/tests/Regression/Trac/783/OneTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** diff --git a/tests/Regression/Trac/783/ParentSuite.php b/tests/Regression/Trac/783/ParentSuite.php index 87d37672957..9803380a966 100644 --- a/tests/Regression/Trac/783/ParentSuite.php +++ b/tests/Regression/Trac/783/ParentSuite.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestSuite; require_once 'ChildSuite.php'; diff --git a/tests/Regression/Trac/783/TwoTest.php b/tests/Regression/Trac/783/TwoTest.php index c6a422e33b0..a3ea467c198 100644 --- a/tests/Regression/Trac/783/TwoTest.php +++ b/tests/Regression/Trac/783/TwoTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** diff --git a/tests/TextUI/_files/Extension.php b/tests/TextUI/_files/Extension.php index e7b0066ae83..fc411040826 100644 --- a/tests/TextUI/_files/Extension.php +++ b/tests/TextUI/_files/Extension.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace PHPUnit\Test; use PHPUnit\Runner\AfterIncompleteTestHook; @@ -9,8 +17,8 @@ use PHPUnit\Runner\AfterTestErrorHook; use PHPUnit\Runner\AfterTestFailureHook; use PHPUnit\Runner\AfterTestWarningHook; -use PHPUnit\Runner\BeforeTestHook; use PHPUnit\Runner\BeforeFirstTestHook; +use PHPUnit\Runner\BeforeTestHook; final class Extension implements BeforeFirstTestHook, BeforeTestHook, AfterSuccessfulTestHook, AfterSkippedTestHook, AfterRiskyTestHook, AfterIncompleteTestHook, AfterTestErrorHook, AfterTestWarningHook, AfterTestFailureHook, AfterLastTestHook { diff --git a/tests/TextUI/_files/HookTest.php b/tests/TextUI/_files/HookTest.php index 19fe80ff606..63280452072 100644 --- a/tests/TextUI/_files/HookTest.php +++ b/tests/TextUI/_files/HookTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace PHPUnit\Test; use PHPUnit\Framework\RiskyTestError; diff --git a/tests/TextUI/_files/NullPrinter.php b/tests/TextUI/_files/NullPrinter.php index 3d298ff83fc..f41ceb7f926 100644 --- a/tests/TextUI/_files/NullPrinter.php +++ b/tests/TextUI/_files/NullPrinter.php @@ -1,9 +1,17 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace PHPUnit\Test; -use PHPUnit\Util\Printer; use PHPUnit\Framework\TestListener; use PHPUnit\Framework\TestListenerDefaultImplementation; +use PHPUnit\Util\Printer; final class NullPrinter extends Printer implements TestListener { diff --git a/tests/TextUI/mycommand.phpt b/tests/TextUI/mycommand.phpt index ca8c8c7a7aa..fc63788a3f7 100644 --- a/tests/TextUI/mycommand.phpt +++ b/tests/TextUI/mycommand.phpt @@ -9,6 +9,7 @@ $_SERVER['argv'][4] = 'BankAccountTest'; $_SERVER['argv'][5] = __DIR__ . '/../_files/BankAccountTest.php'; require __DIR__ . '/../bootstrap.php'; + require __DIR__ . '/../_files/MyCommand.php'; MyCommand::main(); ?> diff --git a/tests/TextUI/teamcity-inner-exceptions.phpt b/tests/TextUI/teamcity-inner-exceptions.phpt index 55cd5907d0f..85436afd746 100644 --- a/tests/TextUI/teamcity-inner-exceptions.phpt +++ b/tests/TextUI/teamcity-inner-exceptions.phpt @@ -19,13 +19,13 @@ PHPUnit %s by Sebastian Bergmann and contributors. ##teamcity[testStarted name='testPrintingChildException' locationHint='php_qn://%s%etests%e_files%eExceptionStackTest.php::\ExceptionStackTest::testPrintingChildException' flowId='%d'] -##teamcity[testFailed name='testPrintingChildException' message='Child exception|nmessage|nFailed asserting that two arrays are equal.|n--- Expected|n+++ Actual|n@@ @@|n Array (|n- 0 => 1|n+ 0 => 2|n )|n' details=' %s_files%eExceptionStackTest.php:14|n |n Caused by|n message|n Failed asserting that two arrays are equal.|n --- Expected|n +++ Actual|n @@ @@|n Array (|n - 0 => 1|n + 0 => 2|n )|n |n %s_files%eExceptionStackTest.php:10|n ' flowId='%d'] +##teamcity[testFailed name='testPrintingChildException' message='Child exception|nmessage|nFailed asserting that two arrays are equal.|n--- Expected|n+++ Actual|n@@ @@|n Array (|n- 0 => 1|n+ 0 => 2|n )|n' details=' %s_files%eExceptionStackTest.php:%d|n |n Caused by|n message|n Failed asserting that two arrays are equal.|n --- Expected|n +++ Actual|n @@ @@|n Array (|n - 0 => 1|n + 0 => 2|n )|n |n %s_files%eExceptionStackTest.php:%d|n ' flowId='%d'] ##teamcity[testFinished name='testPrintingChildException' duration='%d' flowId='%d'] ##teamcity[testStarted name='testNestedExceptions' locationHint='php_qn://%s%etests%e_files%eExceptionStackTest.php::\ExceptionStackTest::testNestedExceptions' flowId='%d'] -##teamcity[testFailed name='testNestedExceptions' message='Exception : One' details=' %s%etests%e_files%eExceptionStackTest.php:22|n |n Caused by|n InvalidArgumentException: Two|n |n %s%etests%e_files%eExceptionStackTest.php:21|n |n Caused by|n Exception: Three|n |n %s%etests%e_files%eExceptionStackTest.php:20|n ' flowId='%d'] +##teamcity[testFailed name='testNestedExceptions' message='Exception : One' details=' %s%etests%e_files%eExceptionStackTest.php:%d|n |n Caused by|n InvalidArgumentException: Two|n |n %s%etests%e_files%eExceptionStackTest.php:%d|n |n Caused by|n Exception: Three|n |n %s%etests%e_files%eExceptionStackTest.php:%d|n ' flowId='%d'] ##teamcity[testFinished name='testNestedExceptions' duration='%d' flowId='%d'] diff --git a/tests/TextUI/testdox-xml.phpt b/tests/TextUI/testdox-xml.phpt index cde0e4ad930..eb1c450b54a 100644 --- a/tests/TextUI/testdox-xml.phpt +++ b/tests/TextUI/testdox-xml.phpt @@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann and contributors. .FEISRW 7 / 7 (100%) - + diff --git a/tests/Util/TestTest.php b/tests/Util/TestTest.php index e656cac46af..0b6ad396c13 100644 --- a/tests/Util/TestTest.php +++ b/tests/Util/TestTest.php @@ -872,7 +872,7 @@ public function testTwoCoversDefaultClassAnnotationsAreNotAllowed(): void public function testFunctionParenthesesAreAllowed(): void { $this->assertSame( - [TEST_FILES_PATH . 'CoveredFunction.php' => \range(2, 4)], + [TEST_FILES_PATH . 'CoveredFunction.php' => \range(10, 12)], Test::getLinesToBeCovered( 'CoverageFunctionParenthesesTest', 'testSomething' @@ -883,7 +883,7 @@ public function testFunctionParenthesesAreAllowed(): void public function testFunctionParenthesesAreAllowedWithWhitespace(): void { $this->assertSame( - [TEST_FILES_PATH . 'CoveredFunction.php' => \range(2, 4)], + [TEST_FILES_PATH . 'CoveredFunction.php' => \range(10, 12)], Test::getLinesToBeCovered( 'CoverageFunctionParenthesesWhitespaceTest', 'testSomething' @@ -894,7 +894,7 @@ public function testFunctionParenthesesAreAllowedWithWhitespace(): void public function testMethodParenthesesAreAllowed(): void { $this->assertSame( - [TEST_FILES_PATH . 'CoveredClass.php' => \range(31, 35)], + [TEST_FILES_PATH . 'CoveredClass.php' => \range(29, 33)], Test::getLinesToBeCovered( 'CoverageMethodParenthesesTest', 'testSomething' @@ -905,7 +905,7 @@ public function testMethodParenthesesAreAllowed(): void public function testMethodParenthesesAreAllowedWithWhitespace(): void { $this->assertSame( - [TEST_FILES_PATH . 'CoveredClass.php' => \range(31, 35)], + [TEST_FILES_PATH . 'CoveredClass.php' => \range(29, 33)], Test::getLinesToBeCovered( 'CoverageMethodParenthesesWhitespaceTest', 'testSomething' @@ -917,7 +917,7 @@ public function testNamespacedFunctionCanBeCoveredOrUsed(): void { $this->assertEquals( [ - TEST_FILES_PATH . 'NamespaceCoveredFunction.php' => \range(4, 7) + TEST_FILES_PATH . 'NamespaceCoveredFunction.php' => \range(12, 15) ], Test::getLinesToBeCovered( \CoverageNamespacedFunctionTest::class, @@ -935,91 +935,91 @@ public function getLinesToBeCoveredProvider() ], [ 'CoverageClassExtendedTest', - \array_merge(\range(19, 36), \range(2, 17)) + \array_merge(\range(27, 44), \range(10, 25)) ], [ 'CoverageClassTest', - \range(19, 36) + \range(27, 44) ], [ 'CoverageMethodTest', - \range(31, 35) + \range(29, 33) ], [ 'CoverageMethodOneLineAnnotationTest', - \range(31, 35) + \range(29, 33) ], [ 'CoverageNotPrivateTest', - \array_merge(\range(25, 29), \range(31, 35)) + \array_merge(\range(29, 33), \range(35, 39)) ], [ 'CoverageNotProtectedTest', - \array_merge(\range(21, 23), \range(31, 35)) + \array_merge(\range(29, 33), \range(41, 43)) ], [ 'CoverageNotPublicTest', - \array_merge(\range(21, 23), \range(25, 29)) + \array_merge(\range(35, 39), \range(41, 43)) ], [ 'CoveragePrivateTest', - \range(21, 23) + \range(41, 43) ], [ 'CoverageProtectedTest', - \range(25, 29) + \range(35, 39) ], [ 'CoveragePublicTest', - \range(31, 35) + \range(29, 33) ], [ 'CoverageFunctionTest', - \range(2, 4) + \range(10, 12) ], [ 'NamespaceCoverageClassExtendedTest', - \array_merge(\range(21, 38), \range(4, 19)) + \array_merge(\range(29, 46), \range(12, 27)) ], [ 'NamespaceCoverageClassTest', - \range(21, 38) + \range(29, 46) ], [ 'NamespaceCoverageMethodTest', - \range(33, 37) + \range(31, 35) ], [ 'NamespaceCoverageNotPrivateTest', - \array_merge(\range(27, 31), \range(33, 37)) + \array_merge(\range(31, 35), \range(37, 41)) ], [ 'NamespaceCoverageNotProtectedTest', - \array_merge(\range(23, 25), \range(33, 37)) + \array_merge(\range(31, 35), \range(43, 45)) ], [ 'NamespaceCoverageNotPublicTest', - \array_merge(\range(23, 25), \range(27, 31)) + \array_merge(\range(37, 41), \range(43, 45)) ], [ 'NamespaceCoveragePrivateTest', - \range(23, 25) + \range(43, 45) ], [ 'NamespaceCoverageProtectedTest', - \range(27, 31) + \range(37, 41) ], [ 'NamespaceCoveragePublicTest', - \range(33, 37) + \range(31, 35) ], [ 'NamespaceCoverageCoversClassTest', - \array_merge(\range(23, 25), \range(27, 31), \range(33, 37), \range(6, 8), \range(10, 13), \range(15, 18)) + \array_merge(\range(43, 45), \range(37, 41), \range(31, 35), \range(24, 26), \range(19, 22), \range(14, 17)) ], [ 'NamespaceCoverageCoversClassPublicTest', - \range(33, 37) + \range(31, 35) ], [ 'CoverageNothingTest', diff --git a/tests/_files/AbstractTest.php b/tests/_files/AbstractTest.php index 49f88b8e334..83a21faa180 100644 --- a/tests/_files/AbstractTest.php +++ b/tests/_files/AbstractTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; abstract class AbstractTest extends TestCase diff --git a/tests/_files/ArrayAccessible.php b/tests/_files/ArrayAccessible.php index 4eb2fd13d20..25058baa1ec 100644 --- a/tests/_files/ArrayAccessible.php +++ b/tests/_files/ArrayAccessible.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class ArrayAccessible implements ArrayAccess, IteratorAggregate { private $array; @@ -11,7 +18,7 @@ public function __construct(array $array = []) public function offsetExists($offset) { - return array_key_exists($offset, $this->array); + return \array_key_exists($offset, $this->array); } public function offsetGet($offset) diff --git a/tests/_files/AssertionExample.php b/tests/_files/AssertionExample.php index d830f155286..e931725c3db 100644 --- a/tests/_files/AssertionExample.php +++ b/tests/_files/AssertionExample.php @@ -1,8 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class AssertionExample { public function doSomething() { - assert(false); + \assert(false); } } diff --git a/tests/_files/AssertionExampleTest.php b/tests/_files/AssertionExampleTest.php index f78879c7838..457e7e12763 100644 --- a/tests/_files/AssertionExampleTest.php +++ b/tests/_files/AssertionExampleTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class AssertionExampleTest extends TestCase diff --git a/tests/_files/BankAccount.php b/tests/_files/BankAccount.php index 67b92329a5d..44a7273e27f 100644 --- a/tests/_files/BankAccount.php +++ b/tests/_files/BankAccount.php @@ -35,46 +35,46 @@ public function getBalance() } /** - * Sets the bank account's balance. + * Deposits an amount of money to the bank account. * * @param float $balance * * @throws BankAccountException */ - protected function setBalance($balance) + public function depositMoney($balance) { - if ($balance >= 0) { - $this->balance = $balance; - } else { - throw new BankAccountException; - } + $this->setBalance($this->getBalance() + $balance); + + return $this->getBalance(); } /** - * Deposits an amount of money to the bank account. + * Withdraws an amount of money from the bank account. * * @param float $balance * * @throws BankAccountException */ - public function depositMoney($balance) + public function withdrawMoney($balance) { - $this->setBalance($this->getBalance() + $balance); + $this->setBalance($this->getBalance() - $balance); return $this->getBalance(); } /** - * Withdraws an amount of money from the bank account. + * Sets the bank account's balance. * * @param float $balance * * @throws BankAccountException */ - public function withdrawMoney($balance) + protected function setBalance($balance) { - $this->setBalance($this->getBalance() - $balance); - - return $this->getBalance(); + if ($balance >= 0) { + $this->balance = $balance; + } else { + throw new BankAccountException; + } } } diff --git a/tests/_files/BeforeAndAfterTest.php b/tests/_files/BeforeAndAfterTest.php index 7c748109605..dadf57b68ce 100644 --- a/tests/_files/BeforeAndAfterTest.php +++ b/tests/_files/BeforeAndAfterTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class BeforeAndAfterTest extends TestCase @@ -31,6 +39,7 @@ public function finalTeardown() public function test1() { } + public function test2() { } diff --git a/tests/_files/BeforeClassAndAfterClassTest.php b/tests/_files/BeforeClassAndAfterClassTest.php index 4897f301654..a5f02979419 100644 --- a/tests/_files/BeforeClassAndAfterClassTest.php +++ b/tests/_files/BeforeClassAndAfterClassTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class BeforeClassAndAfterClassTest extends TestCase @@ -31,6 +39,7 @@ public static function finalClassTeardown() public function test1() { } + public function test2() { } diff --git a/tests/_files/BeforeClassWithOnlyDataProviderTest.php b/tests/_files/BeforeClassWithOnlyDataProviderTest.php index 37dad98e77b..d95edd6ba8c 100644 --- a/tests/_files/BeforeClassWithOnlyDataProviderTest.php +++ b/tests/_files/BeforeClassWithOnlyDataProviderTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class BeforeClassWithOnlyDataProviderTest extends \PHPUnit\Framework\TestCase { public static $setUpBeforeClassWasCalled; @@ -10,11 +18,6 @@ public static function resetProperties() self::$beforeClassWasCalled = false; } - public static function setUpBeforeClass(): void - { - self::$setUpBeforeClassWasCalled = true; - } - /** * @beforeClass */ @@ -23,6 +26,11 @@ public static function someAnnotatedSetupMethod() self::$beforeClassWasCalled = true; } + public static function setUpBeforeClass(): void + { + self::$setUpBeforeClassWasCalled = true; + } + public function dummyProvider() { return [[1]]; diff --git a/tests/_files/Book.php b/tests/_files/Book.php index 1f49ef0a8a6..2e0f88b1a8b 100644 --- a/tests/_files/Book.php +++ b/tests/_files/Book.php @@ -14,5 +14,5 @@ class Book { // the order of properties is important for testing the cycle! - public $author = null; + public $author; } diff --git a/tests/_files/Calculator.php b/tests/_files/Calculator.php index e269bd6ca0b..b8040418d41 100644 --- a/tests/_files/Calculator.php +++ b/tests/_files/Calculator.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Calculator { /** @@ -6,6 +14,9 @@ class Calculator * @assert (0, 1) == 1 * @assert (1, 0) == 1 * @assert (1, 1) == 2 + * + * @param mixed $a + * @param mixed $b */ public function add($a, $b) { diff --git a/tests/_files/ChangeCurrentWorkingDirectoryTest.php b/tests/_files/ChangeCurrentWorkingDirectoryTest.php index 2e8f0ac48e5..5bda82c0160 100644 --- a/tests/_files/ChangeCurrentWorkingDirectoryTest.php +++ b/tests/_files/ChangeCurrentWorkingDirectoryTest.php @@ -1,11 +1,19 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ChangeCurrentWorkingDirectoryTest extends TestCase { public function testSomethingThatChangesTheCwd() { - chdir('../'); + \chdir('../'); $this->assertTrue(true); } } diff --git a/tests/_files/ClassWithNonPublicAttributes.php b/tests/_files/ClassWithNonPublicAttributes.php index ec285b81fb2..bec350e8d2b 100644 --- a/tests/_files/ClassWithNonPublicAttributes.php +++ b/tests/_files/ClassWithNonPublicAttributes.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class ParentClassWithPrivateAttributes { private static $privateStaticParentAttribute = 'foo'; @@ -20,10 +28,10 @@ class ClassWithNonPublicAttributes extends ParentClassWithProtectedAttributes public $publicAttribute = 'foo'; public $foo = 1; public $bar = 2; + + public $publicArray = ['foo']; protected $protectedAttribute = 'bar'; protected $privateAttribute = 'baz'; - - public $publicArray = ['foo']; - protected $protectedArray = ['bar']; - protected $privateArray = ['baz']; + protected $protectedArray = ['bar']; + protected $privateArray = ['baz']; } diff --git a/tests/_files/ClassWithScalarTypeDeclarations.php b/tests/_files/ClassWithScalarTypeDeclarations.php index 8f20f32c801..c78f08137cc 100644 --- a/tests/_files/ClassWithScalarTypeDeclarations.php +++ b/tests/_files/ClassWithScalarTypeDeclarations.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class ClassWithScalarTypeDeclarations { public function foo(string $string, int $int) diff --git a/tests/_files/ClonedDependencyTest.php b/tests/_files/ClonedDependencyTest.php index 165760c2049..6f1c357fdd2 100644 --- a/tests/_files/ClonedDependencyTest.php +++ b/tests/_files/ClonedDependencyTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ClonedDependencyTest extends TestCase @@ -19,6 +27,8 @@ public function testOne() /** * @depends testOne + * + * @param mixed $dependency */ public function testTwo($dependency) { @@ -27,6 +37,8 @@ public function testTwo($dependency) /** * @depends !clone testOne + * + * @param mixed $dependency */ public function testThree($dependency) { @@ -35,6 +47,8 @@ public function testThree($dependency) /** * @depends clone testOne + * + * @param mixed $dependency */ public function testFour($dependency) { @@ -43,6 +57,8 @@ public function testFour($dependency) /** * @depends !shallowClone testOne + * + * @param mixed $dependency */ public function testFive($dependency) { @@ -51,6 +67,8 @@ public function testFive($dependency) /** * @depends shallowClone testOne + * + * @param mixed $dependency */ public function testSix($dependency) { diff --git a/tests/_files/ConcreteTest.my.php b/tests/_files/ConcreteTest.my.php index c795db550ff..a5043ad8c99 100644 --- a/tests/_files/ConcreteTest.my.php +++ b/tests/_files/ConcreteTest.my.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class ConcreteWithMyCustomExtensionTest extends AbstractTest { public function testTwo() diff --git a/tests/_files/ConcreteTest.php b/tests/_files/ConcreteTest.php index cccfb6a627a..862171cef20 100644 --- a/tests/_files/ConcreteTest.php +++ b/tests/_files/ConcreteTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class ConcreteTest extends AbstractTest { public function testTwo() diff --git a/tests/_files/CountConstraint.php b/tests/_files/CountConstraint.php index 84674a8802d..a0abea91100 100644 --- a/tests/_files/CountConstraint.php +++ b/tests/_files/CountConstraint.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\Constraint\Constraint; final class CountConstraint extends Constraint @@ -24,7 +32,7 @@ public function matches($other): bool public function toString(): string { - return sprintf( + return \sprintf( 'is accepted by %s', self::class ); diff --git a/tests/_files/CoverageClassExtendedTest.php b/tests/_files/CoverageClassExtendedTest.php index e6d496e4acc..1da1c37fa0f 100644 --- a/tests/_files/CoverageClassExtendedTest.php +++ b/tests/_files/CoverageClassExtendedTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageClassExtendedTest extends TestCase diff --git a/tests/_files/CoverageClassTest.php b/tests/_files/CoverageClassTest.php index baa04d8c7d1..559a4958c6a 100644 --- a/tests/_files/CoverageClassTest.php +++ b/tests/_files/CoverageClassTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageClassTest extends TestCase diff --git a/tests/_files/CoverageFunctionParenthesesTest.php b/tests/_files/CoverageFunctionParenthesesTest.php index 560e3817582..d2c3d76bbb2 100644 --- a/tests/_files/CoverageFunctionParenthesesTest.php +++ b/tests/_files/CoverageFunctionParenthesesTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageFunctionParenthesesTest extends TestCase diff --git a/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php index f51d298d481..705cf39f8f7 100644 --- a/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php +++ b/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageFunctionParenthesesWhitespaceTest extends TestCase diff --git a/tests/_files/CoverageFunctionTest.php b/tests/_files/CoverageFunctionTest.php index de963a27d3a..52851b7b9c9 100644 --- a/tests/_files/CoverageFunctionTest.php +++ b/tests/_files/CoverageFunctionTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageFunctionTest extends TestCase diff --git a/tests/_files/CoverageMethodOneLineAnnotationTest.php b/tests/_files/CoverageMethodOneLineAnnotationTest.php index 92cdfaef9b4..a07386ae535 100644 --- a/tests/_files/CoverageMethodOneLineAnnotationTest.php +++ b/tests/_files/CoverageMethodOneLineAnnotationTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageMethodOneLineAnnotationTest extends TestCase diff --git a/tests/_files/CoverageMethodParenthesesTest.php b/tests/_files/CoverageMethodParenthesesTest.php index b624ed95a1a..69b99190725 100644 --- a/tests/_files/CoverageMethodParenthesesTest.php +++ b/tests/_files/CoverageMethodParenthesesTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageMethodParenthesesTest extends TestCase diff --git a/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/tests/_files/CoverageMethodParenthesesWhitespaceTest.php index 20d2e751ac8..693bb5be7a3 100644 --- a/tests/_files/CoverageMethodParenthesesWhitespaceTest.php +++ b/tests/_files/CoverageMethodParenthesesWhitespaceTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageMethodParenthesesWhitespaceTest extends TestCase diff --git a/tests/_files/CoverageMethodTest.php b/tests/_files/CoverageMethodTest.php index fb7a88277dd..f9e366dfde9 100644 --- a/tests/_files/CoverageMethodTest.php +++ b/tests/_files/CoverageMethodTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageMethodTest extends TestCase diff --git a/tests/_files/CoverageNamespacedFunctionTest.php b/tests/_files/CoverageNamespacedFunctionTest.php index bc5fffb4f1b..23fdf5ee36f 100644 --- a/tests/_files/CoverageNamespacedFunctionTest.php +++ b/tests/_files/CoverageNamespacedFunctionTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageNamespacedFunctionTest extends TestCase diff --git a/tests/_files/CoverageNoneTest.php b/tests/_files/CoverageNoneTest.php index d8d9cae672a..dacfcaf0d6d 100644 --- a/tests/_files/CoverageNoneTest.php +++ b/tests/_files/CoverageNoneTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageNoneTest extends TestCase diff --git a/tests/_files/CoverageNotPrivateTest.php b/tests/_files/CoverageNotPrivateTest.php index e98efd85375..9244f00b2c3 100644 --- a/tests/_files/CoverageNotPrivateTest.php +++ b/tests/_files/CoverageNotPrivateTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageNotPrivateTest extends TestCase diff --git a/tests/_files/CoverageNotProtectedTest.php b/tests/_files/CoverageNotProtectedTest.php index 7c9c488cf21..19feebf69c3 100644 --- a/tests/_files/CoverageNotProtectedTest.php +++ b/tests/_files/CoverageNotProtectedTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageNotProtectedTest extends TestCase diff --git a/tests/_files/CoverageNotPublicTest.php b/tests/_files/CoverageNotPublicTest.php index 202724a05b3..fd4a71012e4 100644 --- a/tests/_files/CoverageNotPublicTest.php +++ b/tests/_files/CoverageNotPublicTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageNotPublicTest extends TestCase diff --git a/tests/_files/CoverageNothingTest.php b/tests/_files/CoverageNothingTest.php index 4e1c0d0f562..af8b22324f8 100644 --- a/tests/_files/CoverageNothingTest.php +++ b/tests/_files/CoverageNothingTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageNothingTest extends TestCase diff --git a/tests/_files/CoveragePrivateTest.php b/tests/_files/CoveragePrivateTest.php index 849c3480d41..3927f26bdf2 100644 --- a/tests/_files/CoveragePrivateTest.php +++ b/tests/_files/CoveragePrivateTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoveragePrivateTest extends TestCase diff --git a/tests/_files/CoverageProtectedTest.php b/tests/_files/CoverageProtectedTest.php index 6ae3544ca02..41910a75028 100644 --- a/tests/_files/CoverageProtectedTest.php +++ b/tests/_files/CoverageProtectedTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoverageProtectedTest extends TestCase diff --git a/tests/_files/CoveragePublicTest.php b/tests/_files/CoveragePublicTest.php index d977090ccdb..b8245ec3e24 100644 --- a/tests/_files/CoveragePublicTest.php +++ b/tests/_files/CoveragePublicTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class CoveragePublicTest extends TestCase diff --git a/tests/_files/CoverageTwoDefaultClassAnnotations.php b/tests/_files/CoverageTwoDefaultClassAnnotations.php index 1011769f796..43f7d95959f 100644 --- a/tests/_files/CoverageTwoDefaultClassAnnotations.php +++ b/tests/_files/CoverageTwoDefaultClassAnnotations.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ /** * @coversDefaultClass \NamespaceOne diff --git a/tests/_files/CoveredClass.php b/tests/_files/CoveredClass.php index f382ce99b5c..62cfbbfd190 100644 --- a/tests/_files/CoveredClass.php +++ b/tests/_files/CoveredClass.php @@ -1,8 +1,17 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class CoveredParentClass { - private function privateMethod() + public function publicMethod() { + $this->protectedMethod(); } protected function protectedMethod() @@ -10,16 +19,17 @@ protected function protectedMethod() $this->privateMethod(); } - public function publicMethod() + private function privateMethod() { - $this->protectedMethod(); } } class CoveredClass extends CoveredParentClass { - private function privateMethod() + public function publicMethod() { + parent::publicMethod(); + $this->protectedMethod(); } protected function protectedMethod() @@ -28,9 +38,7 @@ protected function protectedMethod() $this->privateMethod(); } - public function publicMethod() + private function privateMethod() { - parent::publicMethod(); - $this->protectedMethod(); } } diff --git a/tests/_files/CoveredFunction.php b/tests/_files/CoveredFunction.php index 9989eb02ed4..874737dc491 100644 --- a/tests/_files/CoveredFunction.php +++ b/tests/_files/CoveredFunction.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ function globalFunction() { } diff --git a/tests/_files/CustomPrinter.php b/tests/_files/CustomPrinter.php index 0db08978cfb..c3eea0504ea 100644 --- a/tests/_files/CustomPrinter.php +++ b/tests/_files/CustomPrinter.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\TextUI\ResultPrinter; class CustomPrinter extends ResultPrinter diff --git a/tests/_files/DataProviderDebugTest.php b/tests/_files/DataProviderDebugTest.php index 3556382c01b..a5302f7ce68 100644 --- a/tests/_files/DataProviderDebugTest.php +++ b/tests/_files/DataProviderDebugTest.php @@ -1,22 +1,22 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DataProviderDebugTest extends TestCase { - /** - * @dataProvider provider - */ - public function testProvider() - { - $this->assertTrue(true); - } - public static function provider() { $obj2 = new \stdClass(); $obj2->foo = 'bar'; - $obj3 = (object) [1,2,"Test\r\n",4,5,6,7,8]; + $obj3 = (object) [1, 2, "Test\r\n", 4, 5, 6, 7, 8]; $obj = new \stdClass(); //@codingStandardsIgnoreStart @@ -38,13 +38,21 @@ public static function provider() return [ [null, true, 1, 1.0], - [1.2, fopen('php://memory', 'r'), '1'], - [[[1,2,3], [3,4,5]]], + [1.2, \fopen('php://memory', 'r'), '1'], + [[[1, 2, 3], [3, 4, 5]]], // \n\r and \r is converted to \n ["this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext"], [new \stdClass(), $obj, [], $storage, $obj3], - [chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5), implode('', array_map('chr', range(0x0e, 0x1f)))], - [chr(0x00) . chr(0x09)] + [\chr(0) . \chr(1) . \chr(2) . \chr(3) . \chr(4) . \chr(5), \implode('', \array_map('chr', \range(0x0e, 0x1f)))], + [\chr(0x00) . \chr(0x09)] ]; } + + /** + * @dataProvider provider + */ + public function testProvider() + { + $this->assertTrue(true); + } } diff --git a/tests/_files/DataProviderDependencyTest.php b/tests/_files/DataProviderDependencyTest.php index 5adc0898a5f..c127d611fdc 100644 --- a/tests/_files/DataProviderDependencyTest.php +++ b/tests/_files/DataProviderDependencyTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class DataProviderDependencyTest extends PHPUnit\Framework\TestCase { public function testReference() @@ -11,6 +19,8 @@ public function testReference() * @see https://github.com/sebastianbergmann/phpunit/issues/1896 * @depends testReference * @dataProvider provider + * + * @param mixed $param */ public function testDependency($param) { @@ -19,6 +29,7 @@ public function testDependency($param) public function provider() { $this->markTestSkipped('Any test with this data provider should be skipped.'); + return []; } } diff --git a/tests/_files/DataProviderFilterTest.php b/tests/_files/DataProviderFilterTest.php index 156992336dd..d7589a38893 100644 --- a/tests/_files/DataProviderFilterTest.php +++ b/tests/_files/DataProviderFilterTest.php @@ -1,16 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DataProviderFilterTest extends TestCase { - /** - * @dataProvider truthProvider - */ - public function testTrue($truth) - { - $this->assertTrue($truth); - } - public static function truthProvider() { return [ @@ -21,14 +21,6 @@ public static function truthProvider() ]; } - /** - * @dataProvider falseProvider - */ - public function testFalse($false) - { - $this->assertFalse($false); - } - public static function falseProvider() { return [ @@ -38,4 +30,24 @@ public static function falseProvider() 'other false test2'=> [false] ]; } + + /** + * @dataProvider truthProvider + * + * @param mixed $truth + */ + public function testTrue($truth) + { + $this->assertTrue($truth); + } + + /** + * @dataProvider falseProvider + * + * @param mixed $false + */ + public function testFalse($false) + { + $this->assertFalse($false); + } } diff --git a/tests/_files/DataProviderIncompleteTest.php b/tests/_files/DataProviderIncompleteTest.php index 9ba6da92972..1898f039909 100644 --- a/tests/_files/DataProviderIncompleteTest.php +++ b/tests/_files/DataProviderIncompleteTest.php @@ -1,10 +1,30 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DataProviderIncompleteTest extends TestCase { + public static function providerMethod() + { + return [ + [0, 0, 0], + [0, 1, 1], + ]; + } + /** * @dataProvider incompleteTestProviderMethod + * + * @param mixed $a + * @param mixed $b + * @param mixed $c */ public function testIncomplete($a, $b, $c) { @@ -13,6 +33,10 @@ public function testIncomplete($a, $b, $c) /** * @dataProvider providerMethod + * + * @param mixed $a + * @param mixed $b + * @param mixed $c */ public function testAdd($a, $b, $c) { @@ -28,12 +52,4 @@ public function incompleteTestProviderMethod() [0, 1, 1], ]; } - - public static function providerMethod() - { - return [ - [0, 0, 0], - [0, 1, 1], - ]; - } } diff --git a/tests/_files/DataProviderIssue2833/FirstTest.php b/tests/_files/DataProviderIssue2833/FirstTest.php index 741aabf5813..199b4db4cf5 100644 --- a/tests/_files/DataProviderIssue2833/FirstTest.php +++ b/tests/_files/DataProviderIssue2833/FirstTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Foo\DataProviderIssue2833; use PHPUnit\Framework\TestCase; @@ -8,6 +15,8 @@ class FirstTest extends TestCase { /** * @dataProvider provide + * + * @param mixed $x */ public function testFirst($x) { diff --git a/tests/_files/DataProviderIssue2833/SecondTest.php b/tests/_files/DataProviderIssue2833/SecondTest.php index 86adb28bca2..02b0d61ad1e 100644 --- a/tests/_files/DataProviderIssue2833/SecondTest.php +++ b/tests/_files/DataProviderIssue2833/SecondTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Foo\DataProviderIssue2833; use PHPUnit\Framework\TestCase; diff --git a/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php b/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php index 4bffb49aeb2..c092cd60e05 100644 --- a/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php +++ b/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Foo\DataProviderIssue2859; use PHPUnit\Framework\TestCase; @@ -8,6 +15,8 @@ class TestWithDataProviderTest extends TestCase { /** * @dataProvider provide + * + * @param mixed $x */ public function testFirst($x) { diff --git a/tests/_files/DataProviderIssue2922/FirstTest.php b/tests/_files/DataProviderIssue2922/FirstTest.php index 8b3302ca1ca..1ec8aa9aabb 100644 --- a/tests/_files/DataProviderIssue2922/FirstTest.php +++ b/tests/_files/DataProviderIssue2922/FirstTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Foo\DataProviderIssue2922; use PHPUnit\Framework\TestCase; @@ -11,6 +18,8 @@ class FirstTest extends TestCase { /** * @dataProvider provide + * + * @param mixed $x */ public function testFirst($x) { diff --git a/tests/_files/DataProviderIssue2922/SecondTest.php b/tests/_files/DataProviderIssue2922/SecondTest.php index 570ae560908..afbb9fb0884 100644 --- a/tests/_files/DataProviderIssue2922/SecondTest.php +++ b/tests/_files/DataProviderIssue2922/SecondTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Foo\DataProviderIssue2922; use PHPUnit\Framework\TestCase; diff --git a/tests/_files/DataProviderSkippedTest.php b/tests/_files/DataProviderSkippedTest.php index 768f25bfb75..417f0045c70 100644 --- a/tests/_files/DataProviderSkippedTest.php +++ b/tests/_files/DataProviderSkippedTest.php @@ -1,10 +1,30 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DataProviderSkippedTest extends TestCase { + public static function providerMethod() + { + return [ + [0, 0, 0], + [0, 1, 1], + ]; + } + /** * @dataProvider skippedTestProviderMethod + * + * @param mixed $a + * @param mixed $b + * @param mixed $c */ public function testSkipped($a, $b, $c) { @@ -13,6 +33,10 @@ public function testSkipped($a, $b, $c) /** * @dataProvider providerMethod + * + * @param mixed $a + * @param mixed $b + * @param mixed $c */ public function testAdd($a, $b, $c) { @@ -28,12 +52,4 @@ public function skippedTestProviderMethod() [0, 1, 1], ]; } - - public static function providerMethod() - { - return [ - [0, 0, 0], - [0, 1, 1], - ]; - } } diff --git a/tests/_files/DataProviderTest.php b/tests/_files/DataProviderTest.php index e65e9e86648..f6ba9920935 100644 --- a/tests/_files/DataProviderTest.php +++ b/tests/_files/DataProviderTest.php @@ -1,16 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DataProviderTest extends TestCase { - /** - * @dataProvider providerMethod - */ - public function testAdd($a, $b, $c) - { - $this->assertEquals($c, $a + $b); - } - public static function providerMethod() { return [ @@ -20,4 +20,16 @@ public static function providerMethod() [1, 0, 1] ]; } + + /** + * @dataProvider providerMethod + * + * @param mixed $a + * @param mixed $b + * @param mixed $c + */ + public function testAdd($a, $b, $c) + { + $this->assertEquals($c, $a + $b); + } } diff --git a/tests/_files/DataProviderTestDoxTest.php b/tests/_files/DataProviderTestDoxTest.php index b137f331ae7..28785832baf 100644 --- a/tests/_files/DataProviderTestDoxTest.php +++ b/tests/_files/DataProviderTestDoxTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DataProviderTestDoxTest extends TestCase diff --git a/tests/_files/DependencyFailureTest.php b/tests/_files/DependencyFailureTest.php index 36a26a593bd..4bd5deb0549 100644 --- a/tests/_files/DependencyFailureTest.php +++ b/tests/_files/DependencyFailureTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DependencyFailureTest extends TestCase diff --git a/tests/_files/DependencySuccessTest.php b/tests/_files/DependencySuccessTest.php index 66bfe687006..9e57e4ce31e 100644 --- a/tests/_files/DependencySuccessTest.php +++ b/tests/_files/DependencySuccessTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DependencySuccessTest extends TestCase diff --git a/tests/_files/DependencyTestSuite.php b/tests/_files/DependencyTestSuite.php index 86ff892bc04..4f0e63ccba1 100644 --- a/tests/_files/DependencyTestSuite.php +++ b/tests/_files/DependencyTestSuite.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestSuite; class DependencyTestSuite diff --git a/tests/_files/DoubleTestCase.php b/tests/_files/DoubleTestCase.php index 08115c9c867..8862e8582a5 100644 --- a/tests/_files/DoubleTestCase.php +++ b/tests/_files/DoubleTestCase.php @@ -1,7 +1,15 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\Test; +use PHPUnit\Framework\TestCase; +use PHPUnit\Framework\TestResult; class DoubleTestCase implements Test { diff --git a/tests/_files/DummyException.php b/tests/_files/DummyException.php index 29a69b997dd..29758e98571 100644 --- a/tests/_files/DummyException.php +++ b/tests/_files/DummyException.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class DummyException extends Exception { } diff --git a/tests/_files/EmptyTestCaseTest.php b/tests/_files/EmptyTestCaseTest.php index 7da38eeaec1..ce9a1dedae6 100644 --- a/tests/_files/EmptyTestCaseTest.php +++ b/tests/_files/EmptyTestCaseTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class EmptyTestCaseTest extends TestCase diff --git a/tests/_files/ExceptionInAssertPostConditionsTest.php b/tests/_files/ExceptionInAssertPostConditionsTest.php index eb58992847e..187523c04d4 100644 --- a/tests/_files/ExceptionInAssertPostConditionsTest.php +++ b/tests/_files/ExceptionInAssertPostConditionsTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ExceptionInAssertPostConditionsTest extends TestCase @@ -14,9 +22,9 @@ protected function setUp(): void $this->setUp = true; } - protected function assertPreConditions() + protected function tearDown(): void { - $this->assertPreConditions = true; + $this->tearDown = true; } public function testSomething() @@ -24,14 +32,15 @@ public function testSomething() $this->testSomething = true; } - protected function assertPostConditions() + protected function assertPreConditions() { - $this->assertPostConditions = true; - throw new Exception; + $this->assertPreConditions = true; } - protected function tearDown(): void + protected function assertPostConditions() { - $this->tearDown = true; + $this->assertPostConditions = true; + + throw new Exception; } } diff --git a/tests/_files/ExceptionInAssertPreConditionsTest.php b/tests/_files/ExceptionInAssertPreConditionsTest.php index 94d08fb4378..9eedaece2cd 100644 --- a/tests/_files/ExceptionInAssertPreConditionsTest.php +++ b/tests/_files/ExceptionInAssertPreConditionsTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ExceptionInAssertPreConditionsTest extends TestCase @@ -14,10 +22,9 @@ protected function setUp(): void $this->setUp = true; } - protected function assertPreConditions() + protected function tearDown(): void { - $this->assertPreConditions = true; - throw new Exception; + $this->tearDown = true; } public function testSomething() @@ -25,13 +32,15 @@ public function testSomething() $this->testSomething = true; } - protected function assertPostConditions() + protected function assertPreConditions() { - $this->assertPostConditions = true; + $this->assertPreConditions = true; + + throw new Exception; } - protected function tearDown(): void + protected function assertPostConditions() { - $this->tearDown = true; + $this->assertPostConditions = true; } } diff --git a/tests/_files/ExceptionInSetUpTest.php b/tests/_files/ExceptionInSetUpTest.php index 8ae0fc0e56b..9dcedd128d0 100644 --- a/tests/_files/ExceptionInSetUpTest.php +++ b/tests/_files/ExceptionInSetUpTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ExceptionInSetUpTest extends TestCase @@ -12,12 +20,13 @@ class ExceptionInSetUpTest extends TestCase protected function setUp(): void { $this->setUp = true; + throw new Exception; } - protected function assertPreConditions() + protected function tearDown(): void { - $this->assertPreConditions = true; + $this->tearDown = true; } public function testSomething() @@ -25,13 +34,13 @@ public function testSomething() $this->testSomething = true; } - protected function assertPostConditions() + protected function assertPreConditions() { - $this->assertPostConditions = true; + $this->assertPreConditions = true; } - protected function tearDown(): void + protected function assertPostConditions() { - $this->tearDown = true; + $this->assertPostConditions = true; } } diff --git a/tests/_files/ExceptionInTearDownTest.php b/tests/_files/ExceptionInTearDownTest.php index 4f3e968f6f1..398e2c53f5b 100644 --- a/tests/_files/ExceptionInTearDownTest.php +++ b/tests/_files/ExceptionInTearDownTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ExceptionInTearDownTest extends TestCase @@ -14,9 +22,11 @@ protected function setUp(): void $this->setUp = true; } - protected function assertPreConditions() + protected function tearDown(): void { - $this->assertPreConditions = true; + $this->tearDown = true; + + throw new Exception; } public function testSomething() @@ -24,14 +34,13 @@ public function testSomething() $this->testSomething = true; } - protected function assertPostConditions() + protected function assertPreConditions() { - $this->assertPostConditions = true; + $this->assertPreConditions = true; } - protected function tearDown(): void + protected function assertPostConditions() { - $this->tearDown = true; - throw new Exception; + $this->assertPostConditions = true; } } diff --git a/tests/_files/ExceptionInTest.php b/tests/_files/ExceptionInTest.php index 6032d065cf3..9572cd3ac73 100644 --- a/tests/_files/ExceptionInTest.php +++ b/tests/_files/ExceptionInTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ExceptionInTest extends TestCase @@ -14,24 +22,25 @@ protected function setUp(): void $this->setUp = true; } - protected function assertPreConditions() + protected function tearDown(): void { - $this->assertPreConditions = true; + $this->tearDown = true; } public function testSomething() { $this->testSomething = true; + throw new Exception; } - protected function assertPostConditions() + protected function assertPreConditions() { - $this->assertPostConditions = true; + $this->assertPreConditions = true; } - protected function tearDown(): void + protected function assertPostConditions() { - $this->tearDown = true; + $this->assertPostConditions = true; } } diff --git a/tests/_files/ExceptionInTestDetectedInTeardown.php b/tests/_files/ExceptionInTestDetectedInTeardown.php index 3ae0185b134..6bf0573a528 100644 --- a/tests/_files/ExceptionInTestDetectedInTeardown.php +++ b/tests/_files/ExceptionInTestDetectedInTeardown.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; use PHPUnit\Runner\BaseTestRunner; @@ -6,11 +14,6 @@ class ExceptionInTestDetectedInTeardown extends TestCase { public $exceptionDetected = false; - - public function testSomething() - { - throw new Exception; - } protected function tearDown(): void { @@ -18,4 +21,9 @@ protected function tearDown(): void $this->exceptionDetected = true; } } + + public function testSomething() + { + throw new Exception; + } } diff --git a/tests/_files/ExceptionNamespaceTest.php b/tests/_files/ExceptionNamespaceTest.php index 70fa56e067e..86e7b232769 100644 --- a/tests/_files/ExceptionNamespaceTest.php +++ b/tests/_files/ExceptionNamespaceTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace My\Space; class ExceptionNamespaceTest extends \PHPUnit\Framework\TestCase diff --git a/tests/_files/ExceptionStackTest.php b/tests/_files/ExceptionStackTest.php index 15e70256434..d4aeb347a92 100644 --- a/tests/_files/ExceptionStackTest.php +++ b/tests/_files/ExceptionStackTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\ExpectationFailedException; use PHPUnit\Framework\TestCase; diff --git a/tests/_files/ExceptionTest.php b/tests/_files/ExceptionTest.php index af6895793fd..d82ab9e4e76 100644 --- a/tests/_files/ExceptionTest.php +++ b/tests/_files/ExceptionTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ExceptionTest extends TestCase diff --git a/tests/_files/Failure.php b/tests/_files/Failure.php index 52a65fb4216..55ed0f8f16e 100644 --- a/tests/_files/Failure.php +++ b/tests/_files/Failure.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Failure extends TestCase diff --git a/tests/_files/FailureTest.php b/tests/_files/FailureTest.php index fd32fc9ef17..95a621cdf0a 100644 --- a/tests/_files/FailureTest.php +++ b/tests/_files/FailureTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class FailureTest extends TestCase diff --git a/tests/_files/FalsyConstraint.php b/tests/_files/FalsyConstraint.php index 7752375e6af..cd1542d1a10 100644 --- a/tests/_files/FalsyConstraint.php +++ b/tests/_files/FalsyConstraint.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\Constraint\Constraint; final class FalsyConstraint extends Constraint @@ -10,7 +18,7 @@ public function matches($other): bool public function toString(): string { - return sprintf( + return \sprintf( 'is accepted by %s', self::class ); diff --git a/tests/_files/FatalTest.php b/tests/_files/FatalTest.php index bfb9509d5e1..aec87ad148b 100644 --- a/tests/_files/FatalTest.php +++ b/tests/_files/FatalTest.php @@ -1,13 +1,20 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class FatalTest extends TestCase { public function testFatalError() { - if (extension_loaded('xdebug')) { - xdebug_disable(); + if (\extension_loaded('xdebug')) { + \xdebug_disable(); } eval('class FatalTest {}'); diff --git a/tests/_files/IgnoreCodeCoverageClass.php b/tests/_files/IgnoreCodeCoverageClass.php index 88c86605e5c..f50bbcad77c 100644 --- a/tests/_files/IgnoreCodeCoverageClass.php +++ b/tests/_files/IgnoreCodeCoverageClass.php @@ -1,4 +1,13 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + /** * @codeCoverageIgnore */ diff --git a/tests/_files/IgnoreCodeCoverageClassTest.php b/tests/_files/IgnoreCodeCoverageClassTest.php index 0281e258bf3..c31bbaebd1d 100644 --- a/tests/_files/IgnoreCodeCoverageClassTest.php +++ b/tests/_files/IgnoreCodeCoverageClassTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class IgnoreCodeCoverageClassTest extends TestCase diff --git a/tests/_files/IncompleteTest.php b/tests/_files/IncompleteTest.php index 350b367a491..bfe8f2f8199 100644 --- a/tests/_files/IncompleteTest.php +++ b/tests/_files/IncompleteTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class IncompleteTest extends TestCase diff --git a/tests/_files/Inheritance/InheritanceA.php b/tests/_files/Inheritance/InheritanceA.php index 1fa5fd3fc23..fc4f9be68c5 100644 --- a/tests/_files/Inheritance/InheritanceA.php +++ b/tests/_files/Inheritance/InheritanceA.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ require_once __DIR__ . '/InheritanceB.php'; class InheritanceA extends InheritanceB diff --git a/tests/_files/Inheritance/InheritanceB.php b/tests/_files/Inheritance/InheritanceB.php index cfae7b3399b..2821220dd4d 100644 --- a/tests/_files/Inheritance/InheritanceB.php +++ b/tests/_files/Inheritance/InheritanceB.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class InheritanceB extends TestCase diff --git a/tests/_files/InheritedTestCase.php b/tests/_files/InheritedTestCase.php index 3df721563e0..18295756c69 100644 --- a/tests/_files/InheritedTestCase.php +++ b/tests/_files/InheritedTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class InheritedTestCase extends OneTestCase { public function test2() diff --git a/tests/_files/IniTest.php b/tests/_files/IniTest.php index 7773c4629fa..445f77ecd6d 100644 --- a/tests/_files/IniTest.php +++ b/tests/_files/IniTest.php @@ -1,10 +1,18 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class IniTest extends TestCase { public function testIni() { - $this->assertEquals('application/x-test', ini_get('default_mimetype')); + $this->assertEquals('application/x-test', \ini_get('default_mimetype')); } } diff --git a/tests/_files/IsolationTest.php b/tests/_files/IsolationTest.php index c67ae1cd93a..cb8a2adb7d3 100644 --- a/tests/_files/IsolationTest.php +++ b/tests/_files/IsolationTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class IsolationTest extends TestCase diff --git a/tests/_files/MockRunner.php b/tests/_files/MockRunner.php index 5da5b2f2df9..79917ddab01 100644 --- a/tests/_files/MockRunner.php +++ b/tests/_files/MockRunner.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Runner\BaseTestRunner; class MockRunner extends BaseTestRunner diff --git a/tests/_files/Mockable.php b/tests/_files/Mockable.php index 95024e9ed80..9e425be4ffe 100644 --- a/tests/_files/Mockable.php +++ b/tests/_files/Mockable.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Mockable { public $constructorCalled = false; @@ -9,18 +17,18 @@ public function __construct() $this->constructorCalled = false; } - public function foo() + public function __clone() { - return true; + $this->cloned = true; } - public function bar() + public function foo() { return true; } - public function __clone() + public function bar() { - $this->cloned = true; + return true; } } diff --git a/tests/_files/MultiDependencyTest.php b/tests/_files/MultiDependencyTest.php index 0fca2fd6af2..1832c395cf4 100644 --- a/tests/_files/MultiDependencyTest.php +++ b/tests/_files/MultiDependencyTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class MultiDependencyTest extends TestCase @@ -20,6 +28,9 @@ public function testTwo() /** * @depends testOne * @depends testTwo + * + * @param mixed $a + * @param mixed $b */ public function testThree($a, $b) { diff --git a/tests/_files/MultipleDataProviderTest.php b/tests/_files/MultipleDataProviderTest.php index 087c3cbfa41..c5fba3523f0 100644 --- a/tests/_files/MultipleDataProviderTest.php +++ b/tests/_files/MultipleDataProviderTest.php @@ -1,26 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class MultipleDataProviderTest extends TestCase { - /** - * @dataProvider providerA - * @dataProvider providerB - * @dataProvider providerC - */ - public function testOne() - { - } - - /** - * @dataProvider providerD - * @dataProvider providerE - * @dataProvider providerF - */ - public function testTwo() - { - } - public static function providerA() { return [ @@ -51,14 +41,18 @@ public static function providerC() public static function providerD() { yield ['ok', null, null]; + yield ['ok', null, null]; + yield ['ok', null, null]; } public static function providerE() { yield [null, 'ok', null]; + yield [null, 'ok', null]; + yield [null, 'ok', null]; } @@ -74,4 +68,22 @@ public static function providerF() return $object->getIterator(); } + + /** + * @dataProvider providerA + * @dataProvider providerB + * @dataProvider providerC + */ + public function testOne() + { + } + + /** + * @dataProvider providerD + * @dataProvider providerE + * @dataProvider providerF + */ + public function testTwo() + { + } } diff --git a/tests/_files/MyCommand.php b/tests/_files/MyCommand.php index 02947858102..a3b8f4e4278 100644 --- a/tests/_files/MyCommand.php +++ b/tests/_files/MyCommand.php @@ -1,16 +1,24 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\TextUI\Command; class MyCommand extends Command { public function __construct() { - $this->longOptions['my-option='] = 'myHandler'; + $this->longOptions['my-option='] = 'myHandler'; $this->longOptions['my-other-option'] = null; } public function myHandler($value) { - echo __METHOD__ . " $value\n"; + print __METHOD__ . " $value\n"; } } diff --git a/tests/_files/NamedConstraint.php b/tests/_files/NamedConstraint.php index 55aec256a42..4916cd79bf7 100644 --- a/tests/_files/NamedConstraint.php +++ b/tests/_files/NamedConstraint.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\Constraint\Constraint; final class NamedConstraint extends Constraint diff --git a/tests/_files/NamespaceCoverageClassExtendedTest.php b/tests/_files/NamespaceCoverageClassExtendedTest.php index 5348aed5daf..525cd773cf8 100644 --- a/tests/_files/NamespaceCoverageClassExtendedTest.php +++ b/tests/_files/NamespaceCoverageClassExtendedTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageClassExtendedTest extends TestCase diff --git a/tests/_files/NamespaceCoverageClassTest.php b/tests/_files/NamespaceCoverageClassTest.php index 2b91f1fdd75..dae07fb6afa 100644 --- a/tests/_files/NamespaceCoverageClassTest.php +++ b/tests/_files/NamespaceCoverageClassTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageClassTest extends TestCase diff --git a/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/tests/_files/NamespaceCoverageCoversClassPublicTest.php index d3bc1a93b0d..be00da75c1b 100644 --- a/tests/_files/NamespaceCoverageCoversClassPublicTest.php +++ b/tests/_files/NamespaceCoverageCoversClassPublicTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** diff --git a/tests/_files/NamespaceCoverageCoversClassTest.php b/tests/_files/NamespaceCoverageCoversClassTest.php index 67752dd9c56..81291baa158 100644 --- a/tests/_files/NamespaceCoverageCoversClassTest.php +++ b/tests/_files/NamespaceCoverageCoversClassTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** diff --git a/tests/_files/NamespaceCoverageMethodTest.php b/tests/_files/NamespaceCoverageMethodTest.php index f83ae5f0e52..a230e0a022b 100644 --- a/tests/_files/NamespaceCoverageMethodTest.php +++ b/tests/_files/NamespaceCoverageMethodTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageMethodTest extends TestCase diff --git a/tests/_files/NamespaceCoverageNotPrivateTest.php b/tests/_files/NamespaceCoverageNotPrivateTest.php index b4983c74763..b64bdd067c6 100644 --- a/tests/_files/NamespaceCoverageNotPrivateTest.php +++ b/tests/_files/NamespaceCoverageNotPrivateTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageNotPrivateTest extends TestCase diff --git a/tests/_files/NamespaceCoverageNotProtectedTest.php b/tests/_files/NamespaceCoverageNotProtectedTest.php index ceb7b35bf9a..d8baf807205 100644 --- a/tests/_files/NamespaceCoverageNotProtectedTest.php +++ b/tests/_files/NamespaceCoverageNotProtectedTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageNotProtectedTest extends TestCase diff --git a/tests/_files/NamespaceCoverageNotPublicTest.php b/tests/_files/NamespaceCoverageNotPublicTest.php index 60aff7a0184..5f275c9cc59 100644 --- a/tests/_files/NamespaceCoverageNotPublicTest.php +++ b/tests/_files/NamespaceCoverageNotPublicTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageNotPublicTest extends TestCase diff --git a/tests/_files/NamespaceCoveragePrivateTest.php b/tests/_files/NamespaceCoveragePrivateTest.php index d5eb77ec027..18f6658eeb1 100644 --- a/tests/_files/NamespaceCoveragePrivateTest.php +++ b/tests/_files/NamespaceCoveragePrivateTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoveragePrivateTest extends TestCase diff --git a/tests/_files/NamespaceCoverageProtectedTest.php b/tests/_files/NamespaceCoverageProtectedTest.php index 6a6eaca47e6..9f9c1d30912 100644 --- a/tests/_files/NamespaceCoverageProtectedTest.php +++ b/tests/_files/NamespaceCoverageProtectedTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoverageProtectedTest extends TestCase diff --git a/tests/_files/NamespaceCoveragePublicTest.php b/tests/_files/NamespaceCoveragePublicTest.php index f32803ecf80..f127fa2feec 100644 --- a/tests/_files/NamespaceCoveragePublicTest.php +++ b/tests/_files/NamespaceCoveragePublicTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NamespaceCoveragePublicTest extends TestCase diff --git a/tests/_files/NamespaceCoveredClass.php b/tests/_files/NamespaceCoveredClass.php index 5bd0ddfb237..49907a4263f 100644 --- a/tests/_files/NamespaceCoveredClass.php +++ b/tests/_files/NamespaceCoveredClass.php @@ -1,10 +1,19 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Foo; class CoveredParentClass { - private function privateMethod() + public function publicMethod() { + $this->protectedMethod(); } protected function protectedMethod() @@ -12,16 +21,17 @@ protected function protectedMethod() $this->privateMethod(); } - public function publicMethod() + private function privateMethod() { - $this->protectedMethod(); } } class CoveredClass extends CoveredParentClass { - private function privateMethod() + public function publicMethod() { + parent::publicMethod(); + $this->protectedMethod(); } protected function protectedMethod() @@ -30,9 +40,7 @@ protected function protectedMethod() $this->privateMethod(); } - public function publicMethod() + private function privateMethod() { - parent::publicMethod(); - $this->protectedMethod(); } } diff --git a/tests/_files/NamespaceCoveredFunction.php b/tests/_files/NamespaceCoveredFunction.php index afc00d7c32b..62d9582e067 100644 --- a/tests/_files/NamespaceCoveredFunction.php +++ b/tests/_files/NamespaceCoveredFunction.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace foo; function func() diff --git a/tests/_files/NoArgTestCaseTest.php b/tests/_files/NoArgTestCaseTest.php index 1715d8ba6c0..cb2c71b7ba7 100644 --- a/tests/_files/NoArgTestCaseTest.php +++ b/tests/_files/NoArgTestCaseTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NoArgTestCaseTest extends TestCase diff --git a/tests/_files/NoTestCaseClass.php b/tests/_files/NoTestCaseClass.php index d64e4e1c609..7dace27bb4f 100644 --- a/tests/_files/NoTestCaseClass.php +++ b/tests/_files/NoTestCaseClass.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class NoTestCaseClass { } diff --git a/tests/_files/NoTestCases.php b/tests/_files/NoTestCases.php index 4c352765257..14650031dd2 100644 --- a/tests/_files/NoTestCases.php +++ b/tests/_files/NoTestCases.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NoTestCases extends TestCase diff --git a/tests/_files/NonStatic.php b/tests/_files/NonStatic.php index 8cb064e8de7..38f3c4754ff 100644 --- a/tests/_files/NonStatic.php +++ b/tests/_files/NonStatic.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class NonStatic { public function suite() diff --git a/tests/_files/NotExistingCoveredElementTest.php b/tests/_files/NotExistingCoveredElementTest.php index 0836a8c84ae..1a1f4b2fb3f 100644 --- a/tests/_files/NotExistingCoveredElementTest.php +++ b/tests/_files/NotExistingCoveredElementTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NotExistingCoveredElementTest extends TestCase diff --git a/tests/_files/NotPublicTestCase.php b/tests/_files/NotPublicTestCase.php index 3a9a14939bd..95cb55a56f5 100644 --- a/tests/_files/NotPublicTestCase.php +++ b/tests/_files/NotPublicTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NotPublicTestCase extends TestCase diff --git a/tests/_files/NotVoidTestCase.php b/tests/_files/NotVoidTestCase.php index 77ee99e457b..4c8853eb72f 100644 --- a/tests/_files/NotVoidTestCase.php +++ b/tests/_files/NotVoidTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NotVoidTestCase extends TestCase diff --git a/tests/_files/NothingTest.php b/tests/_files/NothingTest.php index 08533855f52..94d6c0f37a5 100644 --- a/tests/_files/NothingTest.php +++ b/tests/_files/NothingTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class NothingTest extends TestCase diff --git a/tests/_files/OneTestCase.php b/tests/_files/OneTestCase.php index 4b86753c9cc..f611e100ad6 100644 --- a/tests/_files/OneTestCase.php +++ b/tests/_files/OneTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class OneTestCase extends TestCase diff --git a/tests/_files/OutputTestCase.php b/tests/_files/OutputTestCase.php index 5c8fcc227ef..58424e814c2 100644 --- a/tests/_files/OutputTestCase.php +++ b/tests/_files/OutputTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class OutputTestCase extends TestCase diff --git a/tests/_files/OverrideTestCase.php b/tests/_files/OverrideTestCase.php index fcc276c50fe..f8a985f73f5 100644 --- a/tests/_files/OverrideTestCase.php +++ b/tests/_files/OverrideTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class OverrideTestCase extends OneTestCase { public function testCase($arg = '') diff --git a/tests/_files/ParseTestMethodAnnotationsMock.php b/tests/_files/ParseTestMethodAnnotationsMock.php index 69ea33171e0..81f5bb28e80 100644 --- a/tests/_files/ParseTestMethodAnnotationsMock.php +++ b/tests/_files/ParseTestMethodAnnotationsMock.php @@ -1,4 +1,13 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + /** * @theClassAnnotation */ diff --git a/tests/_files/RequirementsClassBeforeClassHookTest.php b/tests/_files/RequirementsClassBeforeClassHookTest.php index 88420151e1a..c06fed146e0 100644 --- a/tests/_files/RequirementsClassBeforeClassHookTest.php +++ b/tests/_files/RequirementsClassBeforeClassHookTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; /** diff --git a/tests/_files/RequirementsClassDocBlockTest.php b/tests/_files/RequirementsClassDocBlockTest.php index c420afb5b7d..78880b002ad 100644 --- a/tests/_files/RequirementsClassDocBlockTest.php +++ b/tests/_files/RequirementsClassDocBlockTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ /** * @requires PHP 5.3 diff --git a/tests/_files/RequirementsTest.php b/tests/_files/RequirementsTest.php index 2df8838b765..3dc07bd5eef 100644 --- a/tests/_files/RequirementsTest.php +++ b/tests/_files/RequirementsTest.php @@ -417,6 +417,7 @@ public function testVersionConstraintTildeOr() public function testVersionConstraintTildeOrCaret() { } + /** * @requires PHP ^5.6 || ~7.0.17 * @requires PHPUnit ^5.6 || ~7.0.17 @@ -439,12 +440,14 @@ public function testVersionConstraintRegexpIgnoresWhitespace() public function testVersionConstraintInvalidPhpConstraint() { } + /** * @requires PHPUnit ~^12345 */ public function testVersionConstraintInvalidPhpUnitConstraint() { } + /** * @requires setting display_errors On */ diff --git a/tests/_files/SampleArrayAccess.php b/tests/_files/SampleArrayAccess.php index ff6f0bffbf6..85fae0cda89 100644 --- a/tests/_files/SampleArrayAccess.php +++ b/tests/_files/SampleArrayAccess.php @@ -1,9 +1,11 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ class SampleArrayAccess implements ArrayAccess { @@ -13,22 +15,26 @@ public function __construct() { $this->container = []; } + public function offsetSet($offset, $value) { - if (is_null($offset)) { + if (\is_null($offset)) { $this->container[] = $value; } else { $this->container[$offset] = $value; } } + public function offsetExists($offset) { return isset($this->container[$offset]); } + public function offsetUnset($offset) { unset($this->container[$offset]); } + public function offsetGet($offset) { return $this->container[$offset] ?? null; diff --git a/tests/_files/SampleClass.php b/tests/_files/SampleClass.php index b908bc78441..1042a1c4d85 100644 --- a/tests/_files/SampleClass.php +++ b/tests/_files/SampleClass.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class SampleClass { public $a; diff --git a/tests/_files/Singleton.php b/tests/_files/Singleton.php index bfdf3bb0aea..0bfeb3ef5e1 100644 --- a/tests/_files/Singleton.php +++ b/tests/_files/Singleton.php @@ -1,16 +1,16 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Singleton { private static $uniqueInstance = null; - protected function __construct() - { - } - - final private function __clone() - { - } - public static function getInstance() { if (self::$uniqueInstance === null) { @@ -19,4 +19,12 @@ public static function getInstance() return self::$uniqueInstance; } + + protected function __construct() + { + } + + private function __clone() + { + } } diff --git a/tests/_files/StackTest.php b/tests/_files/StackTest.php index 5b6de0abed3..7344d03dd2d 100644 --- a/tests/_files/StackTest.php +++ b/tests/_files/StackTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class StackTest extends TestCase @@ -9,7 +17,7 @@ public function testPush() $this->assertCount(0, $stack); $stack[] = 'foo'; - $this->assertEquals('foo', end($stack)); + $this->assertEquals('foo', \end($stack)); $this->assertCount(1, $stack); return $stack; @@ -20,7 +28,7 @@ public function testPush() */ public function testPop(array $stack) { - $this->assertEquals('foo', array_pop($stack)); + $this->assertEquals('foo', \array_pop($stack)); $this->assertCount(0, $stack); } } diff --git a/tests/_files/StatusTest.php b/tests/_files/StatusTest.php index 07761697873..0683e806320 100644 --- a/tests/_files/StatusTest.php +++ b/tests/_files/StatusTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace vendor\project; use PHPUnit\Framework\TestCase; diff --git a/tests/_files/StopOnWarningTestSuite.php b/tests/_files/StopOnWarningTestSuite.php index a4b6f131da6..862b37eb910 100644 --- a/tests/_files/StopOnWarningTestSuite.php +++ b/tests/_files/StopOnWarningTestSuite.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestSuite; class StopOnWarningTestSuite diff --git a/tests/_files/StopsOnWarningTest.php b/tests/_files/StopsOnWarningTest.php index 8967309ca49..fa15892a795 100644 --- a/tests/_files/StopsOnWarningTest.php +++ b/tests/_files/StopsOnWarningTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class StopsOnWarningTest extends TestCase diff --git a/tests/_files/Struct.php b/tests/_files/Struct.php index 12977a996af..6344b43ed3c 100644 --- a/tests/_files/Struct.php +++ b/tests/_files/Struct.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class Struct { public $var; diff --git a/tests/_files/Success.php b/tests/_files/Success.php index b444c006ba4..0352e233b0c 100644 --- a/tests/_files/Success.php +++ b/tests/_files/Success.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class Success extends TestCase diff --git a/tests/_files/TemplateMethodsTest.php b/tests/_files/TemplateMethodsTest.php index e6677f78625..42a7e658aae 100644 --- a/tests/_files/TemplateMethodsTest.php +++ b/tests/_files/TemplateMethodsTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TemplateMethodsTest extends TestCase @@ -8,12 +16,17 @@ public static function setUpBeforeClass(): void print __METHOD__ . "\n"; } + public static function tearDownAfterClass(): void + { + print __METHOD__ . "\n"; + } + protected function setUp(): void { print __METHOD__ . "\n"; } - protected function assertPreConditions() + protected function tearDown(): void { print __METHOD__ . "\n"; } @@ -30,17 +43,12 @@ public function testTwo() $this->assertTrue(false); } - protected function assertPostConditions() - { - print __METHOD__ . "\n"; - } - - protected function tearDown(): void + protected function assertPreConditions() { print __METHOD__ . "\n"; } - public static function tearDownAfterClass(): void + protected function assertPostConditions() { print __METHOD__ . "\n"; } @@ -48,6 +56,7 @@ public static function tearDownAfterClass(): void protected function onNotSuccessfulTest(Throwable $t) { print __METHOD__ . "\n"; + throw $t; } } diff --git a/tests/_files/TestAutoreferenced.php b/tests/_files/TestAutoreferenced.php index 8145bbc80c7..25ef9b67b10 100644 --- a/tests/_files/TestAutoreferenced.php +++ b/tests/_files/TestAutoreferenced.php @@ -1,9 +1,17 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TestAutoreferenced extends TestCase { - public $myTestData = null; + public $myTestData; public function testJsonEncodeException($data) { diff --git a/tests/_files/TestDoxGroupTest.php b/tests/_files/TestDoxGroupTest.php index 9f3fbfcfcca..a6526e10b93 100644 --- a/tests/_files/TestDoxGroupTest.php +++ b/tests/_files/TestDoxGroupTest.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TestDoxGroupTest extends TestCase diff --git a/tests/_files/TestGeneratorMaker.php b/tests/_files/TestGeneratorMaker.php index df7cb1e5a6e..bd8650ea83a 100644 --- a/tests/_files/TestGeneratorMaker.php +++ b/tests/_files/TestGeneratorMaker.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class TestGeneratorMaker { public function create($array = []) diff --git a/tests/_files/TestIncomplete.php b/tests/_files/TestIncomplete.php index 66768146b05..9cd5fd8a43a 100644 --- a/tests/_files/TestIncomplete.php +++ b/tests/_files/TestIncomplete.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TestIncomplete extends TestCase diff --git a/tests/_files/TestIterator.php b/tests/_files/TestIterator.php index d26ac853b43..64ecdbbf050 100644 --- a/tests/_files/TestIterator.php +++ b/tests/_files/TestIterator.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class TestIterator implements Iterator { protected $array; @@ -16,7 +24,7 @@ public function rewind() public function valid() { - return $this->position < count($this->array); + return $this->position < \count($this->array); } public function key() diff --git a/tests/_files/TestIterator2.php b/tests/_files/TestIterator2.php index 3b47fa36757..4c230a02196 100644 --- a/tests/_files/TestIterator2.php +++ b/tests/_files/TestIterator2.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class TestIterator2 implements Iterator { protected $data; @@ -10,26 +18,26 @@ public function __construct(array $array) public function current() { - return current($this->data); + return \current($this->data); } public function next() { - next($this->data); + \next($this->data); } public function key() { - return key($this->data); + return \key($this->data); } public function valid() { - return key($this->data) !== null; + return \key($this->data) !== null; } public function rewind() { - reset($this->data); + \reset($this->data); } } diff --git a/tests/_files/TestIteratorAggregate.php b/tests/_files/TestIteratorAggregate.php index 21424f2b1af..7c98561361e 100644 --- a/tests/_files/TestIteratorAggregate.php +++ b/tests/_files/TestIteratorAggregate.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class TestIteratorAggregate implements IteratorAggregate { private $traversable; diff --git a/tests/_files/TestIteratorAggregate2.php b/tests/_files/TestIteratorAggregate2.php index e02b89a03dd..338e340fac7 100644 --- a/tests/_files/TestIteratorAggregate2.php +++ b/tests/_files/TestIteratorAggregate2.php @@ -1,8 +1,13 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -/* This class is used for testing a chain of IteratorAggregate objects, since - * PHP does allow IteratorAggregate::getIterator() to return an instance of the - * same class. */ class TestIteratorAggregate2 implements IteratorAggregate { private $traversable; diff --git a/tests/_files/TestSkipped.php b/tests/_files/TestSkipped.php index 7a237738281..c1369860e82 100644 --- a/tests/_files/TestSkipped.php +++ b/tests/_files/TestSkipped.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TestSkipped extends TestCase diff --git a/tests/_files/TestTestError.php b/tests/_files/TestTestError.php index 103957910dd..38fa16f4ab3 100644 --- a/tests/_files/TestTestError.php +++ b/tests/_files/TestTestError.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TestError extends TestCase diff --git a/tests/_files/TestWithTest.php b/tests/_files/TestWithTest.php index 5bae95f3073..be910157527 100644 --- a/tests/_files/TestWithTest.php +++ b/tests/_files/TestWithTest.php @@ -1,26 +1,38 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class TestWithTest extends TestCase { + public static function providerMethod() + { + return [ + [0, 0, 0], + [0, 1, 1], + [1, 1, 3], + [1, 0, 1] + ]; + } + /** * @testWith [0, 0, 0] * [0, 1, 1] * [1, 2, 3] * [20, 22, 42] + * + * @param mixed $a + * @param mixed $b + * @param mixed $c */ public function testAdd($a, $b, $c) { $this->assertEquals($c, $a + $b); } - - public static function providerMethod() - { - return [ - [0, 0, 0], - [0, 1, 1], - [1, 1, 3], - [1, 0, 1] - ]; - } } diff --git a/tests/_files/ThrowExceptionTestCase.php b/tests/_files/ThrowExceptionTestCase.php index 0c325f94b15..92a4ed596dc 100644 --- a/tests/_files/ThrowExceptionTestCase.php +++ b/tests/_files/ThrowExceptionTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ThrowExceptionTestCase extends TestCase diff --git a/tests/_files/ThrowNoExceptionTestCase.php b/tests/_files/ThrowNoExceptionTestCase.php index f4a5da624d1..978c413e7ec 100644 --- a/tests/_files/ThrowNoExceptionTestCase.php +++ b/tests/_files/ThrowNoExceptionTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class ThrowNoExceptionTestCase extends TestCase diff --git a/tests/_files/TruthyConstraint.php b/tests/_files/TruthyConstraint.php index 77dc10d02fc..825ba8c2d8c 100644 --- a/tests/_files/TruthyConstraint.php +++ b/tests/_files/TruthyConstraint.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\Constraint\Constraint; final class TruthyConstraint extends Constraint @@ -10,7 +18,7 @@ public function matches($other): bool public function toString(): string { - return sprintf( + return \sprintf( 'is accepted by %s', self::class ); diff --git a/tests/_files/VariousIterableDataProviderTest.php b/tests/_files/VariousIterableDataProviderTest.php index 2da4492c9b6..c6fb23f9f7a 100644 --- a/tests/_files/VariousIterableDataProviderTest.php +++ b/tests/_files/VariousIterableDataProviderTest.php @@ -1,16 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class VariousIterableDataProviderTest { - /** - * @dataProvider asArrayProvider - * @dataProvider asIteratorProvider - * @dataProvider asTraversableProvider - */ - public function test() - { - } - public static function asArrayProvider() { return [ @@ -23,7 +21,9 @@ public static function asArrayProvider() public static function asIteratorProvider() { yield ['D']; + yield ['E']; + yield ['F']; } @@ -35,4 +35,13 @@ public static function asTraversableProvider() ['I'], ]); } + + /** + * @dataProvider asArrayProvider + * @dataProvider asIteratorProvider + * @dataProvider asTraversableProvider + */ + public function test() + { + } } diff --git a/tests/_files/WasRun.php b/tests/_files/WasRun.php index bf15dde4ff8..25c37d4e160 100644 --- a/tests/_files/WasRun.php +++ b/tests/_files/WasRun.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class WasRun extends TestCase diff --git a/tests/_files/WrapperIteratorAggregate.php b/tests/_files/WrapperIteratorAggregate.php index eae8647dfc9..0dadad641ec 100644 --- a/tests/_files/WrapperIteratorAggregate.php +++ b/tests/_files/WrapperIteratorAggregate.php @@ -1,5 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ class WrapperIteratorAggregate implements IteratorAggregate { /** @@ -9,7 +16,7 @@ class WrapperIteratorAggregate implements IteratorAggregate public function __construct($baseCollection) { - assert(is_array($baseCollection) || $baseCollection instanceof Traversable); + \assert(\is_array($baseCollection) || $baseCollection instanceof Traversable); $this->baseCollection = $baseCollection; } diff --git a/tests/_files/phpunit-example-extension/tests/OneTest.php b/tests/_files/phpunit-example-extension/tests/OneTest.php index 485276d4828..4df480bf8c2 100644 --- a/tests/_files/phpunit-example-extension/tests/OneTest.php +++ b/tests/_files/phpunit-example-extension/tests/OneTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\ExampleExtension\TestCaseTrait; use PHPUnit\Framework\TestCase; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index a3d83bbfb1e..b60f0767f6d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,30 +1,56 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +if (!\defined('TEST_FILES_PATH')) { + \define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } -ini_set('precision', 14); -ini_set('serialize_precision', 14); +\ini_set('precision', 14); +\ini_set('serialize_precision', 14); require_once __DIR__ . '/../vendor/autoload.php'; // TODO: Figure out why (some of) these are required (the classes should be autoloaded instead) require_once TEST_FILES_PATH . 'BeforeAndAfterTest.php'; + require_once TEST_FILES_PATH . 'BeforeClassAndAfterClassTest.php'; + require_once TEST_FILES_PATH . 'TestWithTest.php'; + require_once TEST_FILES_PATH . 'BeforeClassWithOnlyDataProviderTest.php'; + require_once TEST_FILES_PATH . 'DataProviderSkippedTest.php'; + require_once TEST_FILES_PATH . 'DataProviderDependencyTest.php'; + require_once TEST_FILES_PATH . 'DataProviderIncompleteTest.php'; + require_once TEST_FILES_PATH . 'InheritedTestCase.php'; + require_once TEST_FILES_PATH . 'NoTestCaseClass.php'; + require_once TEST_FILES_PATH . 'NoTestCases.php'; + require_once TEST_FILES_PATH . 'NotPublicTestCase.php'; + require_once TEST_FILES_PATH . 'NotVoidTestCase.php'; + require_once TEST_FILES_PATH . 'OverrideTestCase.php'; + require_once TEST_FILES_PATH . 'RequirementsClassBeforeClassHookTest.php'; + require_once TEST_FILES_PATH . 'NoArgTestCaseTest.php'; + require_once TEST_FILES_PATH . 'Singleton.php'; + require_once TEST_FILES_PATH . 'Mockable.php'; + require_once TEST_FILES_PATH . 'CoverageNamespacedFunctionTest.php'; + require_once TEST_FILES_PATH . 'NamespaceCoveredFunction.php'; From 6b51d8073451011b8458021a745ef7d5ea3fdb3e Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 08:21:36 +0200 Subject: [PATCH 17/28] Update ChangeLog --- ChangeLog-7.1.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index c8cfd531c9a..c1db2e6f5b8 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -2,6 +2,12 @@ All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [7.1.4] - 2018-MM-DD + +### Fixed + +* Fixed [#3034](https://github.com/sebastianbergmann/phpunit/pull/3034): `$this->getStatus()` returns `STATUS_PASSED` in `tearDown()` after unexpected exception + ## [7.1.3] - 2018-04-13 ### Fixed @@ -34,6 +40,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil * `PHPUnit\Framework\Assert` is no longer searched for test methods * `ReflectionMethod::invokeArgs()` is no longer used to invoke test methods +[7.1.4]: https://github.com/sebastianbergmann/phpunit/compare/7.1.3...7.1.4 [7.1.3]: https://github.com/sebastianbergmann/phpunit/compare/7.1.2...7.1.3 [7.1.2]: https://github.com/sebastianbergmann/phpunit/compare/7.1.1...7.1.2 [7.1.1]: https://github.com/sebastianbergmann/phpunit/compare/7.1.0...7.1.1 From 06b7fb5b1578077dc7a70ffe5e4c8272ebc00c53 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 08:23:00 +0200 Subject: [PATCH 18/28] Fix CS/WS issues --- tests/TextUI/_files/Extension.php | 2 +- ...oesNotPerformAssertionsButPerformingAssertionsTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/TextUI/_files/Extension.php b/tests/TextUI/_files/Extension.php index dbf5af817be..3936f0d4822 100644 --- a/tests/TextUI/_files/Extension.php +++ b/tests/TextUI/_files/Extension.php @@ -26,7 +26,7 @@ final class Extension implements BeforeFirstTestHook, BeforeTestHook, AfterSucce public function __construct() { - $this->amountOfInjectedArguments = count(func_get_args()); + $this->amountOfInjectedArguments = \count(\func_get_args()); } public function tellAmountOfInjectedArguments(): void diff --git a/tests/_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php b/tests/_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php index a992a0ed755..786ad1fac31 100644 --- a/tests/_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php +++ b/tests/_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DoesNotPerformAssertionsButPerformingAssertionsTest extends TestCase From e3d4bb72267864d5a163faedb77a20e23dfeb461 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Thu, 15 Mar 2018 16:24:56 +0100 Subject: [PATCH 19/28] Add TestCase::expectNotToPerformAssertions --- src/Framework/TestCase.php | 5 +++++ tests/Framework/TestCaseTest.php | 11 +++++++++++ tests/_files/DoNoAssertionTestCase.php | 9 +++++++++ tests/bootstrap.php | 1 + 4 files changed, 26 insertions(+) create mode 100644 tests/_files/DoNoAssertionTestCase.php diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php index 48a338a62d6..839d514ff2d 100644 --- a/src/Framework/TestCase.php +++ b/src/Framework/TestCase.php @@ -619,6 +619,11 @@ public function expectExceptionObject(\Exception $exception): void $this->expectExceptionCode($exception->getCode()); } + public function expectNotToPerformAssertions() + { + $this->doesNotPerformAssertions = true; + } + public function setRegisterMockObjectsFromTestArgumentsRecursively(bool $flag): void { $this->registerMockObjectsFromTestArgumentsRecursively = $flag; diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php index 35fe6829676..a88fdbaf5ee 100644 --- a/tests/Framework/TestCaseTest.php +++ b/tests/Framework/TestCaseTest.php @@ -330,6 +330,17 @@ public function testWrongException(): void $this->assertCount(1, $result); } + public function testDoesNotPerformAssertions() + { + $test = new \DoNoAssertionTestCase('testNothing'); + $test->expectNotToPerformAssertions(); + + $result = $test->run(); + + $this->assertEquals(0, $result->riskyCount()); + $this->assertCount(1, $result); + } + /** * @backupGlobals enabled */ diff --git a/tests/_files/DoNoAssertionTestCase.php b/tests/_files/DoNoAssertionTestCase.php new file mode 100644 index 00000000000..f3de1f9b971 --- /dev/null +++ b/tests/_files/DoNoAssertionTestCase.php @@ -0,0 +1,9 @@ + Date: Tue, 17 Apr 2018 08:29:13 +0200 Subject: [PATCH 20/28] Fix CS/WS issues --- tests/_files/DoNoAssertionTestCase.php | 8 ++++++++ tests/bootstrap.php | 1 + 2 files changed, 9 insertions(+) diff --git a/tests/_files/DoNoAssertionTestCase.php b/tests/_files/DoNoAssertionTestCase.php index f3de1f9b971..34e720e384d 100644 --- a/tests/_files/DoNoAssertionTestCase.php +++ b/tests/_files/DoNoAssertionTestCase.php @@ -1,4 +1,12 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ use PHPUnit\Framework\TestCase; class DoNoAssertionTestCase extends TestCase diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 5f084e82048..37f687b6bad 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -54,4 +54,5 @@ require_once TEST_FILES_PATH . 'CoverageNamespacedFunctionTest.php'; require_once TEST_FILES_PATH . 'NamespaceCoveredFunction.php'; + require_once TEST_FILES_PATH . 'DoNoAssertionTestCase.php'; From f837e29025dceebe19d0db6ccc80af8c22c7ede8 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 08:30:46 +0200 Subject: [PATCH 21/28] Update ChangeLog --- ChangeLog-7.2.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog-7.2.md b/ChangeLog-7.2.md index 5dfe9b1c4b9..b1b8d282fb6 100644 --- a/ChangeLog-7.2.md +++ b/ChangeLog-7.2.md @@ -6,6 +6,7 @@ All notable changes of the PHPUnit 7.2 release series are documented in this fil ### Added +* Implemented [#3042](https://github.com/sebastianbergmann/phpunit/pull/3042): Add `TestCase::expectNotToPerformAssertions()` method as alternative to `@doesNotPerformAssertions` annotation * Implemented [#3064](https://github.com/sebastianbergmann/phpunit/issues/3064): Mark tests as risky when they claim not to perform assertions but do * Implemented [#3066](https://github.com/sebastianbergmann/phpunit/issues/3066): Validate XML configuration against XSD * Implemented [#3076](https://github.com/sebastianbergmann/phpunit/issues/3076): Extensions can be configured via PHPUnit's XML configuration From f85e4255bfbc43ada63344b82b52750167b825e6 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 08:52:36 +0200 Subject: [PATCH 22/28] Closes https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/3710 --- .php_cs.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/.php_cs.dist b/.php_cs.dist index 3e782bc94fc..6562c955a9b 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -166,4 +166,5 @@ return PhpCsFixer\Config::create() ->in(__DIR__ . '/src') ->in(__DIR__ . '/tests') ->name('*.php') + ->notName('*.phpt') ); From 0e3816cc4ee413c765bc38ab6e233461929b7a89 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 09:55:43 +0200 Subject: [PATCH 23/28] The void sucks at your soul. It is content to feast slowly. --- src/Framework/ExceptionWrapper.php | 4 +- tests/Framework/TestCaseTest.php | 2 +- .../Regression/GitHub/1149/Issue1149Test.php | 4 +- .../Regression/GitHub/1216/Issue1216Test.php | 2 +- .../Regression/GitHub/1265/Issue1265Test.php | 2 +- .../Regression/GitHub/1330/Issue1330Test.php | 2 +- .../Regression/GitHub/1335/Issue1335Test.php | 24 ++-- .../Regression/GitHub/1337/Issue1337Test.php | 2 +- .../Regression/GitHub/1348/Issue1348Test.php | 4 +- .../Regression/GitHub/1351/Issue1351Test.php | 10 +- .../Regression/GitHub/1374/Issue1374Test.php | 2 +- .../Regression/GitHub/1437/Issue1437Test.php | 2 +- .../Regression/GitHub/1468/Issue1468Test.php | 2 +- .../Regression/GitHub/1471/Issue1471Test.php | 2 +- .../Regression/GitHub/1472/Issue1472Test.php | 2 +- .../Regression/GitHub/1570/Issue1570Test.php | 2 +- .../Regression/GitHub/2137/Issue2137Test.php | 4 +- .../Regression/GitHub/2145/Issue2145Test.php | 4 +- .../Regression/GitHub/2158/Issue2158Test.php | 4 +- .../Regression/GitHub/2366/Issue2366Test.php | 5 +- .../Regression/GitHub/2380/Issue2380Test.php | 2 +- .../Regression/GitHub/2382/Issue2382Test.php | 2 +- .../Regression/GitHub/2435/Issue2435Test.php | 2 +- tests/Regression/GitHub/244/Issue244Test.php | 8 +- tests/Regression/GitHub/2448/Test.php | 2 +- .../GitHub/2591/SeparateClassPreserveTest.php | 6 +- .../2591/SeparateFunctionNoPreserveTest.php | 4 +- .../2591/SeparateFunctionPreserveTest.php | 4 +- ...SeparateClassRunMethodInNewProcessTest.php | 6 +- .../GitHub/2725/BeforeAfterClassPidTest.php | 8 +- .../Regression/GitHub/2731/Issue2731Test.php | 2 +- .../Regression/GitHub/2811/Issue2811Test.php | 2 +- .../Regression/GitHub/2830/Issue2830Test.php | 2 +- .../2972/unconventiallyNamedIssue2972Test.php | 2 +- tests/Regression/GitHub/322/Issue322Test.php | 4 +- tests/Regression/GitHub/433/Issue433Test.php | 6 +- tests/Regression/GitHub/445/Issue445Test.php | 6 +- tests/Regression/GitHub/498/Issue498Test.php | 4 +- tests/Regression/GitHub/503/Issue503Test.php | 2 +- tests/Regression/GitHub/581/Issue581Test.php | 2 +- tests/Regression/GitHub/74/Issue74Test.php | 2 +- tests/Regression/GitHub/765/Issue765Test.php | 6 +- tests/Regression/GitHub/797/Issue797Test.php | 2 +- tests/Regression/Trac/1021/Issue1021Test.php | 4 +- tests/Regression/Trac/523/Issue523Test.php | 2 +- tests/Regression/Trac/578/Issue578Test.php | 6 +- tests/Regression/Trac/783/OneTest.php | 2 +- tests/Regression/Trac/783/TwoTest.php | 2 +- tests/_files/AbstractTest.php | 2 +- tests/_files/ArrayAccessible.php | 4 +- tests/_files/AssertionExample.php | 2 +- tests/_files/AssertionExampleTest.php | 2 +- tests/_files/BankAccount.php | 2 +- tests/_files/BankAccountTest.php | 6 +- tests/_files/BankAccountTest.test.php | 6 +- tests/_files/BankAccountTest2.php | 6 +- tests/_files/BeforeAndAfterTest.php | 10 +- tests/_files/BeforeClassAndAfterClassTest.php | 10 +- .../BeforeClassWithOnlyDataProviderTest.php | 6 +- .../ChangeCurrentWorkingDirectoryTest.php | 2 +- .../ClassWithScalarTypeDeclarations.php | 2 +- tests/_files/ClonedDependencyTest.php | 10 +- tests/_files/ConcreteTest.my.php | 2 +- tests/_files/ConcreteTest.php | 2 +- tests/_files/CoverageClassExtendedTest.php | 2 +- tests/_files/CoverageClassTest.php | 2 +- .../CoverageFunctionParenthesesTest.php | 2 +- ...erageFunctionParenthesesWhitespaceTest.php | 2 +- tests/_files/CoverageFunctionTest.php | 2 +- .../CoverageMethodOneLineAnnotationTest.php | 2 +- .../_files/CoverageMethodParenthesesTest.php | 2 +- ...overageMethodParenthesesWhitespaceTest.php | 2 +- tests/_files/CoverageMethodTest.php | 2 +- .../_files/CoverageNamespacedFunctionTest.php | 2 +- tests/_files/CoverageNoneTest.php | 2 +- tests/_files/CoverageNotPrivateTest.php | 2 +- tests/_files/CoverageNotProtectedTest.php | 2 +- tests/_files/CoverageNotPublicTest.php | 2 +- tests/_files/CoverageNothingTest.php | 2 +- tests/_files/CoveragePrivateTest.php | 2 +- tests/_files/CoverageProtectedTest.php | 2 +- tests/_files/CoveragePublicTest.php | 2 +- .../CoverageTwoDefaultClassAnnotations.php | 2 +- tests/_files/CoveredClass.php | 12 +- tests/_files/CoveredFunction.php | 2 +- tests/_files/DataProviderDebugTest.php | 2 +- tests/_files/DataProviderDependencyTest.php | 4 +- tests/_files/DataProviderFilterTest.php | 4 +- tests/_files/DataProviderIncompleteTest.php | 4 +- .../DataProviderIssue2833/FirstTest.php | 2 +- .../DataProviderIssue2833/SecondTest.php | 2 +- .../another/TestWithDataProviderTest.php | 2 +- .../DataProviderIssue2922/FirstTest.php | 4 +- .../DataProviderIssue2922/SecondTest.php | 2 +- tests/_files/DataProviderSkippedTest.php | 4 +- tests/_files/DataProviderTest.php | 2 +- tests/_files/DataProviderTestDoxTest.php | 4 +- tests/_files/DependencyFailureTest.php | 8 +- tests/_files/DependencySuccessTest.php | 6 +- tests/_files/DummyBarTest.php | 2 +- tests/_files/DummyFooTest.php | 2 +- .../ExceptionInAssertPostConditionsTest.php | 6 +- .../ExceptionInAssertPreConditionsTest.php | 6 +- tests/_files/ExceptionInSetUpTest.php | 6 +- tests/_files/ExceptionInTearDownTest.php | 6 +- tests/_files/ExceptionInTest.php | 6 +- .../ExceptionInTestDetectedInTeardown.php | 2 +- tests/_files/ExceptionNamespaceTest.php | 4 +- tests/_files/ExceptionStackTest.php | 4 +- tests/_files/ExceptionTest.php | 28 ++-- tests/_files/Failure.php | 2 +- tests/_files/FailureTest.php | 26 ++-- tests/_files/FatalTest.php | 2 +- tests/_files/IgnoreCodeCoverageClassTest.php | 4 +- tests/_files/IncompleteTest.php | 2 +- tests/_files/Inheritance/InheritanceB.php | 2 +- tests/_files/InheritedTestCase.php | 2 +- tests/_files/IniTest.php | 2 +- tests/_files/IsolationTest.php | 4 +- tests/_files/MockRunner.php | 2 +- tests/_files/MultiDependencyTest.php | 2 +- tests/_files/MultipleDataProviderTest.php | 4 +- tests/_files/MyCommand.php | 2 +- .../NamespaceCoverageClassExtendedTest.php | 2 +- tests/_files/NamespaceCoverageClassTest.php | 2 +- ...NamespaceCoverageCoversClassPublicTest.php | 2 +- .../NamespaceCoverageCoversClassTest.php | 2 +- tests/_files/NamespaceCoverageMethodTest.php | 2 +- .../NamespaceCoverageNotPrivateTest.php | 2 +- .../NamespaceCoverageNotProtectedTest.php | 2 +- .../_files/NamespaceCoverageNotPublicTest.php | 2 +- tests/_files/NamespaceCoveragePrivateTest.php | 2 +- .../_files/NamespaceCoverageProtectedTest.php | 2 +- tests/_files/NamespaceCoveragePublicTest.php | 2 +- tests/_files/NamespaceCoveredClass.php | 12 +- tests/_files/NoArgTestCaseTest.php | 2 +- tests/_files/NoTestCases.php | 2 +- tests/_files/NonStatic.php | 2 +- .../_files/NotExistingCoveredElementTest.php | 6 +- tests/_files/NotPublicTestCase.php | 4 +- tests/_files/NothingTest.php | 2 +- tests/_files/OneTestCase.php | 4 +- tests/_files/OutputTestCase.php | 8 +- tests/_files/OverrideTestCase.php | 2 +- .../_files/RequirementsClassDocBlockTest.php | 2 +- tests/_files/RequirementsTest.php | 122 +++++++++--------- tests/_files/SampleArrayAccess.php | 4 +- tests/_files/StackTest.php | 2 +- tests/_files/StatusTest.php | 14 +- tests/_files/StopsOnWarningTest.php | 2 +- tests/_files/Success.php | 2 +- tests/_files/TemplateMethodsTest.php | 10 +- tests/_files/TestAutoreferenced.php | 2 +- tests/_files/TestDoxGroupTest.php | 4 +- tests/_files/TestIncomplete.php | 2 +- tests/_files/TestIterator.php | 4 +- tests/_files/TestIterator2.php | 4 +- tests/_files/TestSkipped.php | 2 +- tests/_files/TestTestError.php | 2 +- tests/_files/TestWithTest.php | 2 +- tests/_files/ThrowExceptionTestCase.php | 2 +- tests/_files/ThrowNoExceptionTestCase.php | 2 +- .../VariousIterableDataProviderTest.php | 2 +- tests/_files/WasRun.php | 2 +- .../tests/OneTest.php | 2 +- 165 files changed, 374 insertions(+), 373 deletions(-) diff --git a/src/Framework/ExceptionWrapper.php b/src/Framework/ExceptionWrapper.php index 3ae217f9712..30a6a4e6d97 100644 --- a/src/Framework/ExceptionWrapper.php +++ b/src/Framework/ExceptionWrapper.php @@ -75,12 +75,12 @@ public function getPreviousWrapped(): ?self /** * @param string $className */ - public function setClassName(string $className) + public function setClassName(string $className): void { $this->className = $className; } - public function setOriginalException(\Throwable $t) + public function setOriginalException(\Throwable $t): void { $this->originalException($t); diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php index 35fe6829676..a42192ef8a5 100644 --- a/tests/Framework/TestCaseTest.php +++ b/tests/Framework/TestCaseTest.php @@ -729,7 +729,7 @@ public function testProvidingArrayThatMixesObjectsAndScalars(): void $this->assertSame($data, $test->myTestData); } - public function testGettingNullTestResultObject() + public function testGettingNullTestResultObject(): void { $test = new \Success(); $this->assertNull($test->getTestResultObject()); diff --git a/tests/Regression/GitHub/1149/Issue1149Test.php b/tests/Regression/GitHub/1149/Issue1149Test.php index 382d9d8675a..025124d43d8 100644 --- a/tests/Regression/GitHub/1149/Issue1149Test.php +++ b/tests/Regression/GitHub/1149/Issue1149Test.php @@ -11,7 +11,7 @@ class Issue1149Test extends TestCase { - public function testOne() + public function testOne(): void { $this->assertTrue(true); print '1'; @@ -20,7 +20,7 @@ public function testOne() /** * @runInSeparateProcess */ - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); print '2'; diff --git a/tests/Regression/GitHub/1216/Issue1216Test.php b/tests/Regression/GitHub/1216/Issue1216Test.php index 574b7dd23bd..61296351b18 100644 --- a/tests/Regression/GitHub/1216/Issue1216Test.php +++ b/tests/Regression/GitHub/1216/Issue1216Test.php @@ -11,7 +11,7 @@ class Issue1216Test extends TestCase { - public function testConfigAvailableInBootstrap() + public function testConfigAvailableInBootstrap(): void { $this->assertTrue($_ENV['configAvailableInBootstrap']); } diff --git a/tests/Regression/GitHub/1265/Issue1265Test.php b/tests/Regression/GitHub/1265/Issue1265Test.php index 5e550ea13b0..dcb43e8c8ab 100644 --- a/tests/Regression/GitHub/1265/Issue1265Test.php +++ b/tests/Regression/GitHub/1265/Issue1265Test.php @@ -11,7 +11,7 @@ class Issue1265Test extends TestCase { - public function testTrue() + public function testTrue(): void { $this->assertTrue(true); } diff --git a/tests/Regression/GitHub/1330/Issue1330Test.php b/tests/Regression/GitHub/1330/Issue1330Test.php index 1e363e92274..789238e6538 100644 --- a/tests/Regression/GitHub/1330/Issue1330Test.php +++ b/tests/Regression/GitHub/1330/Issue1330Test.php @@ -11,7 +11,7 @@ class Issue1330Test extends TestCase { - public function testTrue() + public function testTrue(): void { $this->assertTrue(PHPUNIT_1330); } diff --git a/tests/Regression/GitHub/1335/Issue1335Test.php b/tests/Regression/GitHub/1335/Issue1335Test.php index 2fbfd0b90ce..deba6f7a28b 100644 --- a/tests/Regression/GitHub/1335/Issue1335Test.php +++ b/tests/Regression/GitHub/1335/Issue1335Test.php @@ -15,62 +15,62 @@ */ class Issue1335Test extends TestCase { - public function testGlobalString() + public function testGlobalString(): void { $this->assertEquals('Hello', $GLOBALS['globalString']); } - public function testGlobalIntTruthy() + public function testGlobalIntTruthy(): void { $this->assertEquals(1, $GLOBALS['globalIntTruthy']); } - public function testGlobalIntFalsey() + public function testGlobalIntFalsey(): void { $this->assertEquals(0, $GLOBALS['globalIntFalsey']); } - public function testGlobalFloat() + public function testGlobalFloat(): void { $this->assertEquals(1.123, $GLOBALS['globalFloat']); } - public function testGlobalBoolTrue() + public function testGlobalBoolTrue(): void { $this->assertTrue($GLOBALS['globalBoolTrue']); } - public function testGlobalBoolFalse() + public function testGlobalBoolFalse(): void { $this->assertFalse($GLOBALS['globalBoolFalse']); } - public function testGlobalNull() + public function testGlobalNull(): void { $this->assertEquals(null, $GLOBALS['globalNull']); } - public function testGlobalArray() + public function testGlobalArray(): void { $this->assertEquals(['foo'], $GLOBALS['globalArray']); } - public function testGlobalNestedArray() + public function testGlobalNestedArray(): void { $this->assertEquals([['foo']], $GLOBALS['globalNestedArray']); } - public function testGlobalObject() + public function testGlobalObject(): void { $this->assertEquals((object) ['foo'=> 'bar'], $GLOBALS['globalObject']); } - public function testGlobalObjectWithBackSlashString() + public function testGlobalObjectWithBackSlashString(): void { $this->assertEquals((object) ['foo'=> 'back\\slash'], $GLOBALS['globalObjectWithBackSlashString']); } - public function testGlobalObjectWithDoubleBackSlashString() + public function testGlobalObjectWithDoubleBackSlashString(): void { $this->assertEquals((object) ['foo'=> 'back\\\\slash'], $GLOBALS['globalObjectWithDoubleBackSlashString']); } diff --git a/tests/Regression/GitHub/1337/Issue1337Test.php b/tests/Regression/GitHub/1337/Issue1337Test.php index 905edc5a63a..0678dbbaf75 100644 --- a/tests/Regression/GitHub/1337/Issue1337Test.php +++ b/tests/Regression/GitHub/1337/Issue1337Test.php @@ -16,7 +16,7 @@ class Issue1337Test extends TestCase * * @param mixed $a */ - public function testProvider($a) + public function testProvider($a): void { $this->assertTrue($a); } diff --git a/tests/Regression/GitHub/1348/Issue1348Test.php b/tests/Regression/GitHub/1348/Issue1348Test.php index 526bf1d1312..0ab9a14ce9d 100644 --- a/tests/Regression/GitHub/1348/Issue1348Test.php +++ b/tests/Regression/GitHub/1348/Issue1348Test.php @@ -11,13 +11,13 @@ class Issue1348Test extends TestCase { - public function testSTDOUT() + public function testSTDOUT(): void { \fwrite(STDOUT, "\nSTDOUT does not break test result\n"); $this->assertTrue(true); } - public function testSTDERR() + public function testSTDERR(): void { \fwrite(STDERR, 'STDERR works as usual.'); } diff --git a/tests/Regression/GitHub/1351/Issue1351Test.php b/tests/Regression/GitHub/1351/Issue1351Test.php index 50d9af34b46..6784fb9fd81 100644 --- a/tests/Regression/GitHub/1351/Issue1351Test.php +++ b/tests/Regression/GitHub/1351/Issue1351Test.php @@ -16,13 +16,13 @@ class Issue1351Test extends TestCase /** * @runInSeparateProcess */ - public function testFailurePre() + public function testFailurePre(): void { $this->instance = new ChildProcessClass1351(); $this->assertFalse(true, 'Expected failure.'); } - public function testFailurePost() + public function testFailurePost(): void { $this->assertNull($this->instance); $this->assertFalse(\class_exists(ChildProcessClass1351::class, false), 'ChildProcessClass1351 is not loaded.'); @@ -31,7 +31,7 @@ public function testFailurePost() /** * @runInSeparateProcess */ - public function testExceptionPre() + public function testExceptionPre(): void { $this->instance = new ChildProcessClass1351(); @@ -42,13 +42,13 @@ public function testExceptionPre() } } - public function testExceptionPost() + public function testExceptionPost(): void { $this->assertNull($this->instance); $this->assertFalse(\class_exists(ChildProcessClass1351::class, false), 'ChildProcessClass1351 is not loaded.'); } - public function testPhpCoreLanguageException() + public function testPhpCoreLanguageException(): void { // User-space code cannot instantiate a PDOException with a string code, // so trigger a real one. diff --git a/tests/Regression/GitHub/1374/Issue1374Test.php b/tests/Regression/GitHub/1374/Issue1374Test.php index 1c590fe160f..fd339ca43e4 100644 --- a/tests/Regression/GitHub/1374/Issue1374Test.php +++ b/tests/Regression/GitHub/1374/Issue1374Test.php @@ -24,7 +24,7 @@ protected function tearDown(): void print __FUNCTION__; } - public function testSomething() + public function testSomething(): void { $this->fail('This should not be reached'); } diff --git a/tests/Regression/GitHub/1437/Issue1437Test.php b/tests/Regression/GitHub/1437/Issue1437Test.php index 5b9c4b7b612..4ac4df9f46b 100644 --- a/tests/Regression/GitHub/1437/Issue1437Test.php +++ b/tests/Regression/GitHub/1437/Issue1437Test.php @@ -11,7 +11,7 @@ class Issue1437Test extends TestCase { - public function testFailure() + public function testFailure(): void { \ob_start(); $this->assertTrue(false); diff --git a/tests/Regression/GitHub/1468/Issue1468Test.php b/tests/Regression/GitHub/1468/Issue1468Test.php index b61ce1cac13..202dd3c2c15 100644 --- a/tests/Regression/GitHub/1468/Issue1468Test.php +++ b/tests/Regression/GitHub/1468/Issue1468Test.php @@ -14,7 +14,7 @@ class Issue1468Test extends TestCase /** * @todo Implement this test */ - public function testFailure() + public function testFailure(): void { $this->markTestIncomplete(); } diff --git a/tests/Regression/GitHub/1471/Issue1471Test.php b/tests/Regression/GitHub/1471/Issue1471Test.php index b6b9159c649..3a359516131 100644 --- a/tests/Regression/GitHub/1471/Issue1471Test.php +++ b/tests/Regression/GitHub/1471/Issue1471Test.php @@ -11,7 +11,7 @@ class Issue1471Test extends TestCase { - public function testFailure() + public function testFailure(): void { $this->expectOutputString('*'); diff --git a/tests/Regression/GitHub/1472/Issue1472Test.php b/tests/Regression/GitHub/1472/Issue1472Test.php index 76c9963d595..3633fd3f310 100644 --- a/tests/Regression/GitHub/1472/Issue1472Test.php +++ b/tests/Regression/GitHub/1472/Issue1472Test.php @@ -11,7 +11,7 @@ class Issue1472Test extends TestCase { - public function testAssertEqualXMLStructure() + public function testAssertEqualXMLStructure(): void { $doc = new DOMDocument; $doc->loadXML(''); diff --git a/tests/Regression/GitHub/1570/Issue1570Test.php b/tests/Regression/GitHub/1570/Issue1570Test.php index ecc399c7536..6fda1111b4f 100644 --- a/tests/Regression/GitHub/1570/Issue1570Test.php +++ b/tests/Regression/GitHub/1570/Issue1570Test.php @@ -11,7 +11,7 @@ class Issue1570Test extends TestCase { - public function testOne() + public function testOne(): void { print '*'; } diff --git a/tests/Regression/GitHub/2137/Issue2137Test.php b/tests/Regression/GitHub/2137/Issue2137Test.php index 2b56ce5c25f..d6799b11ddf 100644 --- a/tests/Regression/GitHub/2137/Issue2137Test.php +++ b/tests/Regression/GitHub/2137/Issue2137Test.php @@ -19,7 +19,7 @@ class Issue2137Test extends PHPUnit\Framework\TestCase * @throws \PHPUnit\Framework\ExpectationFailedException * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */ - public function testBrandService($provided, $expected) + public function testBrandService($provided, $expected): void { $this->assertSame($provided, $expected); } @@ -42,7 +42,7 @@ public function provideBrandService() * @throws \PHPUnit\Framework\ExpectationFailedException * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */ - public function testSomethingElseInvalid($provided, $expected) + public function testSomethingElseInvalid($provided, $expected): void { $this->assertSame($provided, $expected); } diff --git a/tests/Regression/GitHub/2145/Issue2145Test.php b/tests/Regression/GitHub/2145/Issue2145Test.php index a2465e4c22b..99c9dd7c1bd 100644 --- a/tests/Regression/GitHub/2145/Issue2145Test.php +++ b/tests/Regression/GitHub/2145/Issue2145Test.php @@ -14,11 +14,11 @@ public static function setUpBeforeClass(): void throw new Exception; } - public function testOne() + public function testOne(): void { } - public function testTwo() + public function testTwo(): void { } } diff --git a/tests/Regression/GitHub/2158/Issue2158Test.php b/tests/Regression/GitHub/2158/Issue2158Test.php index b320077ee4d..5e70ba332af 100644 --- a/tests/Regression/GitHub/2158/Issue2158Test.php +++ b/tests/Regression/GitHub/2158/Issue2158Test.php @@ -14,7 +14,7 @@ class Issue2158Test extends TestCase /** * Set constant in main process */ - public function testSomething() + public function testSomething(): void { include __DIR__ . '/constant.inc'; $this->assertTrue(true); @@ -26,7 +26,7 @@ public function testSomething() * * @runInSeparateProcess */ - public function testSomethingElse() + public function testSomethingElse(): void { $this->assertTrue(\defined('TEST_CONSTANT')); } diff --git a/tests/Regression/GitHub/2366/Issue2366Test.php b/tests/Regression/GitHub/2366/Issue2366Test.php index 7426b1abe16..b7790c64d35 100644 --- a/tests/Regression/GitHub/2366/Issue2366Test.php +++ b/tests/Regression/GitHub/2366/Issue2366Test.php @@ -11,8 +11,9 @@ class Issue2366 { - public function foo() + public function foo(): bool { + return false; } } @@ -23,7 +24,7 @@ class Issue2366Test extends TestCase * * @param mixed $o */ - public function testOne($o) + public function testOne($o): void { $this->assertEquals(1, $o->foo()); } diff --git a/tests/Regression/GitHub/2380/Issue2380Test.php b/tests/Regression/GitHub/2380/Issue2380Test.php index c038a5fe2ed..abc36be101e 100644 --- a/tests/Regression/GitHub/2380/Issue2380Test.php +++ b/tests/Regression/GitHub/2380/Issue2380Test.php @@ -16,7 +16,7 @@ class Issue2380Test extends TestCase * * @param mixed $data */ - public function testGeneratorProvider($data) + public function testGeneratorProvider($data): void { $this->assertNotEmpty($data); } diff --git a/tests/Regression/GitHub/2382/Issue2382Test.php b/tests/Regression/GitHub/2382/Issue2382Test.php index 45e02635ce4..b12349b9777 100644 --- a/tests/Regression/GitHub/2382/Issue2382Test.php +++ b/tests/Regression/GitHub/2382/Issue2382Test.php @@ -16,7 +16,7 @@ class Issue2382Test extends TestCase * * @param mixed $test */ - public function testOne($test) + public function testOne($test): void { $this->assertInstanceOf(\Exception::class, $test); } diff --git a/tests/Regression/GitHub/2435/Issue2435Test.php b/tests/Regression/GitHub/2435/Issue2435Test.php index fba5ab3a92b..f77833ddf6c 100644 --- a/tests/Regression/GitHub/2435/Issue2435Test.php +++ b/tests/Regression/GitHub/2435/Issue2435Test.php @@ -9,7 +9,7 @@ */ class Issue2435Test extends PHPUnit\Framework\TestCase { - public function testOne() + public function testOne(): void { $this->assertTrue(true); } diff --git a/tests/Regression/GitHub/244/Issue244Test.php b/tests/Regression/GitHub/244/Issue244Test.php index 200bb48adab..dc544b2cf72 100644 --- a/tests/Regression/GitHub/244/Issue244Test.php +++ b/tests/Regression/GitHub/244/Issue244Test.php @@ -15,7 +15,7 @@ class Issue244Test extends TestCase * @expectedException Issue244Exception * @expectedExceptionCode 123StringCode */ - public function testWorks() + public function testWorks(): void { throw new Issue244Exception; } @@ -24,7 +24,7 @@ public function testWorks() * @expectedException Issue244Exception * @expectedExceptionCode OtherString */ - public function testFails() + public function testFails(): void { throw new Issue244Exception; } @@ -33,7 +33,7 @@ public function testFails() * @expectedException Issue244Exception * @expectedExceptionCode 123 */ - public function testFailsTooIfExpectationIsANumber() + public function testFailsTooIfExpectationIsANumber(): void { throw new Issue244Exception; } @@ -42,7 +42,7 @@ public function testFailsTooIfExpectationIsANumber() * @expectedException Issue244ExceptionIntCode * @expectedExceptionCode 123String */ - public function testFailsTooIfExceptionCodeIsANumber() + public function testFailsTooIfExceptionCodeIsANumber(): void { throw new Issue244ExceptionIntCode; } diff --git a/tests/Regression/GitHub/2448/Test.php b/tests/Regression/GitHub/2448/Test.php index 401a2f8779f..308e66a488c 100644 --- a/tests/Regression/GitHub/2448/Test.php +++ b/tests/Regression/GitHub/2448/Test.php @@ -9,7 +9,7 @@ */ class Test extends PHPUnit\Framework\TestCase { - public function testOne() + public function testOne(): void { $this->assertTrue(true); } diff --git a/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php b/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php index b2737996dab..cee8492fc22 100644 --- a/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php +++ b/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php @@ -15,12 +15,12 @@ */ class Issue2591_SeparateClassPreserveTest extends TestCase { - public function testOriginalGlobalString() + public function testOriginalGlobalString(): void { $this->assertEquals('Hello', $GLOBALS['globalString']); } - public function testChangedGlobalString() + public function testChangedGlobalString(): void { $value = 'Hello! I am changed from inside!'; @@ -28,7 +28,7 @@ public function testChangedGlobalString() $this->assertEquals($value, $GLOBALS['globalString']); } - public function testGlobalString() + public function testGlobalString(): void { $this->assertEquals('Hello', $GLOBALS['globalString']); } diff --git a/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php b/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php index 2b099ae1f43..273e1e803c1 100644 --- a/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php +++ b/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php @@ -15,13 +15,13 @@ */ class Issue2591_SeparateFunctionNoPreserveTest extends TestCase { - public function testChangedGlobalString() + public function testChangedGlobalString(): void { $GLOBALS['globalString'] = 'Hello!'; $this->assertEquals('Hello!', $GLOBALS['globalString']); } - public function testGlobalString() + public function testGlobalString(): void { $this->assertEquals('Hello', $GLOBALS['globalString']); } diff --git a/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php b/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php index be04b4a8601..34047bc7e42 100644 --- a/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php +++ b/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php @@ -15,13 +15,13 @@ */ class Issue2591_SeparateFunctionPreserveTest extends TestCase { - public function testChangedGlobalString() + public function testChangedGlobalString(): void { $GLOBALS['globalString'] = 'Hello!'; $this->assertEquals('Hello!', $GLOBALS['globalString']); } - public function testGlobalString() + public function testGlobalString(): void { $this->assertEquals('Hello', $GLOBALS['globalString']); } diff --git a/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php b/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php index a26d96dcc83..1c73862d6ab 100644 --- a/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php +++ b/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php @@ -20,7 +20,7 @@ class SeparateClassRunMethodInNewProcessTest extends PHPUnit\Framework\TestCase public static $masterPid = self::INITIAL_MASTER_PID; public static $pid1 = self::INITIAL_PID1; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -29,7 +29,7 @@ public static function setUpBeforeClass() } } - public static function tearDownAfterClass() + public static function tearDownAfterClass(): void { parent::tearDownAfterClass(); @@ -38,7 +38,7 @@ public static function tearDownAfterClass() } } - public function testMethodShouldGetDifferentPidThanMaster() + public function testMethodShouldGetDifferentPidThanMaster(): void { static::$pid1 = \getmypid(); diff --git a/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php b/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php index 242edcda537..ac8804a6c8e 100644 --- a/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php +++ b/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php @@ -21,7 +21,7 @@ class BeforeAfterClassPidTest extends TestCase /** * @beforeClass */ - public static function showPidBefore() + public static function showPidBefore(): void { $GLOBALS[static::PID_VARIABLE] = \getmypid(); } @@ -29,7 +29,7 @@ public static function showPidBefore() /** * @afterClass */ - public static function showPidAfter() + public static function showPidAfter(): void { if ($GLOBALS[static::PID_VARIABLE] - \getmypid() !== 0) { print "\n@afterClass output - PID difference should be zero!"; @@ -38,12 +38,12 @@ public static function showPidAfter() unset($GLOBALS[static::PID_VARIABLE]); } - public function testMethod1WithItsBeforeAndAfter() + public function testMethod1WithItsBeforeAndAfter(): void { $this->assertEquals($GLOBALS[static::PID_VARIABLE], \getmypid()); } - public function testMethod2WithItsBeforeAndAfter() + public function testMethod2WithItsBeforeAndAfter(): void { $this->assertEquals($GLOBALS[static::PID_VARIABLE], \getmypid()); } diff --git a/tests/Regression/GitHub/2731/Issue2731Test.php b/tests/Regression/GitHub/2731/Issue2731Test.php index 6e9e1397689..b2530db410b 100644 --- a/tests/Regression/GitHub/2731/Issue2731Test.php +++ b/tests/Regression/GitHub/2731/Issue2731Test.php @@ -9,7 +9,7 @@ */ class Issue2731Test extends PHPUnit\Framework\TestCase { - public function testOne() + public function testOne(): void { $this->expectException(Exception::class); $this->expectExceptionMessage(''); diff --git a/tests/Regression/GitHub/2811/Issue2811Test.php b/tests/Regression/GitHub/2811/Issue2811Test.php index ad5d37e68db..340c68812c7 100644 --- a/tests/Regression/GitHub/2811/Issue2811Test.php +++ b/tests/Regression/GitHub/2811/Issue2811Test.php @@ -9,7 +9,7 @@ */ class Issue2811Test extends PHPUnit\Framework\TestCase { - public function testOne() + public function testOne(): void { $this->expectExceptionMessage('hello'); diff --git a/tests/Regression/GitHub/2830/Issue2830Test.php b/tests/Regression/GitHub/2830/Issue2830Test.php index 811746c9ace..bcf7c6a0a0e 100644 --- a/tests/Regression/GitHub/2830/Issue2830Test.php +++ b/tests/Regression/GitHub/2830/Issue2830Test.php @@ -13,7 +13,7 @@ class Issue2830Test extends PHPUnit\Framework\TestCase /** * @dataProvider simpleDataProvider */ - public function testMethodUsesDataProvider() + public function testMethodUsesDataProvider(): void { $this->assertTrue(true); } diff --git a/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php b/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php index 56aedf7edbc..e97849106b3 100644 --- a/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php +++ b/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php @@ -13,7 +13,7 @@ class Issue2972Test extends TestCase { - public function testHello() + public function testHello(): void { $this->assertNotEmpty('Hello world!'); } diff --git a/tests/Regression/GitHub/322/Issue322Test.php b/tests/Regression/GitHub/322/Issue322Test.php index f5750e0dad5..df698c7b3a9 100644 --- a/tests/Regression/GitHub/322/Issue322Test.php +++ b/tests/Regression/GitHub/322/Issue322Test.php @@ -14,7 +14,7 @@ class Issue322Test extends TestCase /** * @group one */ - public function testOne() + public function testOne(): void { $this->assertTrue(true); } @@ -22,7 +22,7 @@ public function testOne() /** * @group two */ - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); } diff --git a/tests/Regression/GitHub/433/Issue433Test.php b/tests/Regression/GitHub/433/Issue433Test.php index ac31d6283d0..799b7a7673f 100644 --- a/tests/Regression/GitHub/433/Issue433Test.php +++ b/tests/Regression/GitHub/433/Issue433Test.php @@ -11,19 +11,19 @@ class Issue433Test extends TestCase { - public function testOutputWithExpectationBefore() + public function testOutputWithExpectationBefore(): void { $this->expectOutputString('test'); print 'test'; } - public function testOutputWithExpectationAfter() + public function testOutputWithExpectationAfter(): void { print 'test'; $this->expectOutputString('test'); } - public function testNotMatchingOutput() + public function testNotMatchingOutput(): void { print 'bar'; $this->expectOutputString('foo'); diff --git a/tests/Regression/GitHub/445/Issue445Test.php b/tests/Regression/GitHub/445/Issue445Test.php index f361081671a..a506939e147 100644 --- a/tests/Regression/GitHub/445/Issue445Test.php +++ b/tests/Regression/GitHub/445/Issue445Test.php @@ -11,19 +11,19 @@ class Issue445Test extends TestCase { - public function testOutputWithExpectationBefore() + public function testOutputWithExpectationBefore(): void { $this->expectOutputString('test'); print 'test'; } - public function testOutputWithExpectationAfter() + public function testOutputWithExpectationAfter(): void { print 'test'; $this->expectOutputString('test'); } - public function testNotMatchingOutput() + public function testNotMatchingOutput(): void { print 'bar'; $this->expectOutputString('foo'); diff --git a/tests/Regression/GitHub/498/Issue498Test.php b/tests/Regression/GitHub/498/Issue498Test.php index 4d9da1e089f..b049421f218 100644 --- a/tests/Regression/GitHub/498/Issue498Test.php +++ b/tests/Regression/GitHub/498/Issue498Test.php @@ -18,7 +18,7 @@ class Issue498Test extends TestCase * * @param mixed $testData */ - public function shouldBeTrue($testData) + public function shouldBeTrue($testData): void { $this->assertTrue(true); } @@ -30,7 +30,7 @@ public function shouldBeTrue($testData) * * @param mixed $testData */ - public function shouldBeFalse($testData) + public function shouldBeFalse($testData): void { $this->assertFalse(false); } diff --git a/tests/Regression/GitHub/503/Issue503Test.php b/tests/Regression/GitHub/503/Issue503Test.php index e9903ede5fe..0b26c32fa27 100644 --- a/tests/Regression/GitHub/503/Issue503Test.php +++ b/tests/Regression/GitHub/503/Issue503Test.php @@ -11,7 +11,7 @@ class Issue503Test extends TestCase { - public function testCompareDifferentLineEndings() + public function testCompareDifferentLineEndings(): void { $this->assertSame( "foo\n", diff --git a/tests/Regression/GitHub/581/Issue581Test.php b/tests/Regression/GitHub/581/Issue581Test.php index 8d5e00febd6..6de48670d10 100644 --- a/tests/Regression/GitHub/581/Issue581Test.php +++ b/tests/Regression/GitHub/581/Issue581Test.php @@ -11,7 +11,7 @@ class Issue581Test extends TestCase { - public function testExportingObjectsDoesNotBreakWindowsLineFeeds() + public function testExportingObjectsDoesNotBreakWindowsLineFeeds(): void { $this->assertEquals( (object) [1, 2, "Test\r\n", 4, 5, 6, 7, 8], diff --git a/tests/Regression/GitHub/74/Issue74Test.php b/tests/Regression/GitHub/74/Issue74Test.php index 141bbe680e2..a20fddffebb 100644 --- a/tests/Regression/GitHub/74/Issue74Test.php +++ b/tests/Regression/GitHub/74/Issue74Test.php @@ -11,7 +11,7 @@ class Issue74Test extends TestCase { - public function testCreateAndThrowNewExceptionInProcessIsolation() + public function testCreateAndThrowNewExceptionInProcessIsolation(): void { require_once __DIR__ . '/NewException.php'; diff --git a/tests/Regression/GitHub/765/Issue765Test.php b/tests/Regression/GitHub/765/Issue765Test.php index 603bb89626e..577761959d0 100644 --- a/tests/Regression/GitHub/765/Issue765Test.php +++ b/tests/Regression/GitHub/765/Issue765Test.php @@ -11,7 +11,7 @@ class Issue765Test extends TestCase { - public function testDependee() + public function testDependee(): void { $this->assertTrue(true); } @@ -22,12 +22,12 @@ public function testDependee() * * @param mixed $a */ - public function testDependent($a) + public function testDependent($a): void { $this->assertTrue(true); } - public function dependentProvider() + public function dependentProvider(): void { throw new Exception; } diff --git a/tests/Regression/GitHub/797/Issue797Test.php b/tests/Regression/GitHub/797/Issue797Test.php index 43c8f2c2d95..f1424962cda 100644 --- a/tests/Regression/GitHub/797/Issue797Test.php +++ b/tests/Regression/GitHub/797/Issue797Test.php @@ -13,7 +13,7 @@ class Issue797Test extends TestCase { protected $preserveGlobalState = false; - public function testBootstrapPhpIsExecutedInIsolation() + public function testBootstrapPhpIsExecutedInIsolation(): void { $this->assertEquals(GITHUB_ISSUE, 797); } diff --git a/tests/Regression/Trac/1021/Issue1021Test.php b/tests/Regression/Trac/1021/Issue1021Test.php index 2d21a418913..13877f7afb2 100644 --- a/tests/Regression/Trac/1021/Issue1021Test.php +++ b/tests/Regression/Trac/1021/Issue1021Test.php @@ -16,7 +16,7 @@ class Issue1021Test extends TestCase * * @param mixed $data */ - public function testSomething($data) + public function testSomething($data): void { $this->assertTrue($data); } @@ -24,7 +24,7 @@ public function testSomething($data) /** * @depends testSomething */ - public function testSomethingElse() + public function testSomethingElse(): void { $this->assertTrue(true); } diff --git a/tests/Regression/Trac/523/Issue523Test.php b/tests/Regression/Trac/523/Issue523Test.php index bbc527c190d..a274f6a4e04 100644 --- a/tests/Regression/Trac/523/Issue523Test.php +++ b/tests/Regression/Trac/523/Issue523Test.php @@ -11,7 +11,7 @@ class Issue523Test extends TestCase { - public function testAttributeEquals() + public function testAttributeEquals(): void { $this->assertAttributeEquals('foo', 'field', new Issue523()); } diff --git a/tests/Regression/Trac/578/Issue578Test.php b/tests/Regression/Trac/578/Issue578Test.php index e996037f442..2a0b239162a 100644 --- a/tests/Regression/Trac/578/Issue578Test.php +++ b/tests/Regression/Trac/578/Issue578Test.php @@ -11,19 +11,19 @@ class Issue578Test extends TestCase { - public function testNoticesDoublePrintStackTrace() + public function testNoticesDoublePrintStackTrace(): void { $this->iniSet('error_reporting', E_ALL | E_NOTICE); \trigger_error('Stack Trace Test Notice', E_NOTICE); } - public function testWarningsDoublePrintStackTrace() + public function testWarningsDoublePrintStackTrace(): void { $this->iniSet('error_reporting', E_ALL | E_NOTICE); \trigger_error('Stack Trace Test Notice', E_WARNING); } - public function testUnexpectedExceptionsPrintsCorrectly() + public function testUnexpectedExceptionsPrintsCorrectly(): void { throw new Exception('Double printed exception'); } diff --git a/tests/Regression/Trac/783/OneTest.php b/tests/Regression/Trac/783/OneTest.php index 2e41da458d4..7e49161d6c6 100644 --- a/tests/Regression/Trac/783/OneTest.php +++ b/tests/Regression/Trac/783/OneTest.php @@ -14,7 +14,7 @@ */ class OneTest extends TestCase { - public function testSomething() + public function testSomething(): void { $this->assertTrue(true); } diff --git a/tests/Regression/Trac/783/TwoTest.php b/tests/Regression/Trac/783/TwoTest.php index a3ea467c198..dada5bbca32 100644 --- a/tests/Regression/Trac/783/TwoTest.php +++ b/tests/Regression/Trac/783/TwoTest.php @@ -14,7 +14,7 @@ */ class TwoTest extends TestCase { - public function testSomething() + public function testSomething(): void { $this->assertTrue(true); } diff --git a/tests/_files/AbstractTest.php b/tests/_files/AbstractTest.php index 83a21faa180..a519e37bcf2 100644 --- a/tests/_files/AbstractTest.php +++ b/tests/_files/AbstractTest.php @@ -11,7 +11,7 @@ abstract class AbstractTest extends TestCase { - public function testOne() + public function testOne(): void { $this->assertTrue(true); } diff --git a/tests/_files/ArrayAccessible.php b/tests/_files/ArrayAccessible.php index 25058baa1ec..171eebe7b2e 100644 --- a/tests/_files/ArrayAccessible.php +++ b/tests/_files/ArrayAccessible.php @@ -26,7 +26,7 @@ public function offsetGet($offset) return $this->array[$offset]; } - public function offsetSet($offset, $value) + public function offsetSet($offset, $value): void { if (null === $offset) { $this->array[] = $value; @@ -35,7 +35,7 @@ public function offsetSet($offset, $value) } } - public function offsetUnset($offset) + public function offsetUnset($offset): void { unset($this->array[$offset]); } diff --git a/tests/_files/AssertionExample.php b/tests/_files/AssertionExample.php index e931725c3db..30d659d6246 100644 --- a/tests/_files/AssertionExample.php +++ b/tests/_files/AssertionExample.php @@ -9,7 +9,7 @@ */ class AssertionExample { - public function doSomething() + public function doSomething(): void { \assert(false); } diff --git a/tests/_files/AssertionExampleTest.php b/tests/_files/AssertionExampleTest.php index 457e7e12763..26a6569f23c 100644 --- a/tests/_files/AssertionExampleTest.php +++ b/tests/_files/AssertionExampleTest.php @@ -11,7 +11,7 @@ class AssertionExampleTest extends TestCase { - public function testOne() + public function testOne(): void { $e = new AssertionExample; diff --git a/tests/_files/BankAccount.php b/tests/_files/BankAccount.php index 44a7273e27f..b7d51d00448 100644 --- a/tests/_files/BankAccount.php +++ b/tests/_files/BankAccount.php @@ -69,7 +69,7 @@ public function withdrawMoney($balance) * * @throws BankAccountException */ - protected function setBalance($balance) + protected function setBalance($balance): void { if ($balance >= 0) { $this->balance = $balance; diff --git a/tests/_files/BankAccountTest.php b/tests/_files/BankAccountTest.php index 5e83ea02d3f..b68dfc4c0c2 100644 --- a/tests/_files/BankAccountTest.php +++ b/tests/_files/BankAccountTest.php @@ -26,7 +26,7 @@ protected function setUp(): void * @group balanceIsInitiallyZero * @group specification */ - public function testBalanceIsInitiallyZero() + public function testBalanceIsInitiallyZero(): void { /* @Given a fresh bank account */ $ba = new BankAccount; @@ -43,7 +43,7 @@ public function testBalanceIsInitiallyZero() * @group balanceCannotBecomeNegative * @group specification */ - public function testBalanceCannotBecomeNegative() + public function testBalanceCannotBecomeNegative(): void { try { $this->ba->withdrawMoney(1); @@ -61,7 +61,7 @@ public function testBalanceCannotBecomeNegative() * @group balanceCannotBecomeNegative * @group specification */ - public function testBalanceCannotBecomeNegative2() + public function testBalanceCannotBecomeNegative2(): void { try { $this->ba->depositMoney(-1); diff --git a/tests/_files/BankAccountTest.test.php b/tests/_files/BankAccountTest.test.php index 9c427f2e619..ab2d60b7bfc 100644 --- a/tests/_files/BankAccountTest.test.php +++ b/tests/_files/BankAccountTest.test.php @@ -26,7 +26,7 @@ protected function setUp(): void * @group balanceIsInitiallyZero * @group specification */ - public function testBalanceIsInitiallyZero() + public function testBalanceIsInitiallyZero(): void { $this->assertEquals(0, $this->ba->getBalance()); } @@ -36,7 +36,7 @@ public function testBalanceIsInitiallyZero() * @group balanceCannotBecomeNegative * @group specification */ - public function testBalanceCannotBecomeNegative() + public function testBalanceCannotBecomeNegative(): void { try { $this->ba->withdrawMoney(1); @@ -54,7 +54,7 @@ public function testBalanceCannotBecomeNegative() * @group balanceCannotBecomeNegative * @group specification */ - public function testBalanceCannotBecomeNegative2() + public function testBalanceCannotBecomeNegative2(): void { try { $this->ba->depositMoney(-1); diff --git a/tests/_files/BankAccountTest2.php b/tests/_files/BankAccountTest2.php index b39d35dbc54..6e2aef7698f 100644 --- a/tests/_files/BankAccountTest2.php +++ b/tests/_files/BankAccountTest2.php @@ -19,7 +19,7 @@ protected function setUp(): void $this->ba = new BankAccount; } - public function testBalanceIsInitiallyZero() + public function testBalanceIsInitiallyZero(): void { $ba = new BankAccount; @@ -28,7 +28,7 @@ public function testBalanceIsInitiallyZero() $this->assertEquals(0, $balance); } - public function testBalanceCannotBecomeNegative() + public function testBalanceCannotBecomeNegative(): void { try { $this->ba->withdrawMoney(1); @@ -41,7 +41,7 @@ public function testBalanceCannotBecomeNegative() $this->fail(); } - public function testBalanceCannotBecomeNegative2() + public function testBalanceCannotBecomeNegative2(): void { try { $this->ba->depositMoney(-1); diff --git a/tests/_files/BeforeAndAfterTest.php b/tests/_files/BeforeAndAfterTest.php index dadf57b68ce..bfa53f5ac91 100644 --- a/tests/_files/BeforeAndAfterTest.php +++ b/tests/_files/BeforeAndAfterTest.php @@ -14,7 +14,7 @@ class BeforeAndAfterTest extends TestCase public static $beforeWasRun; public static $afterWasRun; - public static function resetProperties() + public static function resetProperties(): void { self::$beforeWasRun = 0; self::$afterWasRun = 0; @@ -23,7 +23,7 @@ public static function resetProperties() /** * @before */ - public function initialSetup() + public function initialSetup(): void { self::$beforeWasRun++; } @@ -31,16 +31,16 @@ public function initialSetup() /** * @after */ - public function finalTeardown() + public function finalTeardown(): void { self::$afterWasRun++; } - public function test1() + public function test1(): void { } - public function test2() + public function test2(): void { } } diff --git a/tests/_files/BeforeClassAndAfterClassTest.php b/tests/_files/BeforeClassAndAfterClassTest.php index a5f02979419..e74e9dfe454 100644 --- a/tests/_files/BeforeClassAndAfterClassTest.php +++ b/tests/_files/BeforeClassAndAfterClassTest.php @@ -14,7 +14,7 @@ class BeforeClassAndAfterClassTest extends TestCase public static $beforeClassWasRun = 0; public static $afterClassWasRun = 0; - public static function resetProperties() + public static function resetProperties(): void { self::$beforeClassWasRun = 0; self::$afterClassWasRun = 0; @@ -23,7 +23,7 @@ public static function resetProperties() /** * @beforeClass */ - public static function initialClassSetup() + public static function initialClassSetup(): void { self::$beforeClassWasRun++; } @@ -31,16 +31,16 @@ public static function initialClassSetup() /** * @afterClass */ - public static function finalClassTeardown() + public static function finalClassTeardown(): void { self::$afterClassWasRun++; } - public function test1() + public function test1(): void { } - public function test2() + public function test2(): void { } } diff --git a/tests/_files/BeforeClassWithOnlyDataProviderTest.php b/tests/_files/BeforeClassWithOnlyDataProviderTest.php index d95edd6ba8c..c5217fd5392 100644 --- a/tests/_files/BeforeClassWithOnlyDataProviderTest.php +++ b/tests/_files/BeforeClassWithOnlyDataProviderTest.php @@ -12,7 +12,7 @@ class BeforeClassWithOnlyDataProviderTest extends \PHPUnit\Framework\TestCase public static $setUpBeforeClassWasCalled; public static $beforeClassWasCalled; - public static function resetProperties() + public static function resetProperties(): void { self::$setUpBeforeClassWasCalled = false; self::$beforeClassWasCalled = false; @@ -21,7 +21,7 @@ public static function resetProperties() /** * @beforeClass */ - public static function someAnnotatedSetupMethod() + public static function someAnnotatedSetupMethod(): void { self::$beforeClassWasCalled = true; } @@ -40,7 +40,7 @@ public function dummyProvider() * @dataProvider dummyProvider * delete annotation to fail test case */ - public function testDummy() + public function testDummy(): void { $this->assertFalse(false); } diff --git a/tests/_files/ChangeCurrentWorkingDirectoryTest.php b/tests/_files/ChangeCurrentWorkingDirectoryTest.php index 5bda82c0160..c0cc608ddb4 100644 --- a/tests/_files/ChangeCurrentWorkingDirectoryTest.php +++ b/tests/_files/ChangeCurrentWorkingDirectoryTest.php @@ -11,7 +11,7 @@ class ChangeCurrentWorkingDirectoryTest extends TestCase { - public function testSomethingThatChangesTheCwd() + public function testSomethingThatChangesTheCwd(): void { \chdir('../'); $this->assertTrue(true); diff --git a/tests/_files/ClassWithScalarTypeDeclarations.php b/tests/_files/ClassWithScalarTypeDeclarations.php index c78f08137cc..0780e2489d5 100644 --- a/tests/_files/ClassWithScalarTypeDeclarations.php +++ b/tests/_files/ClassWithScalarTypeDeclarations.php @@ -9,7 +9,7 @@ */ class ClassWithScalarTypeDeclarations { - public function foo(string $string, int $int) + public function foo(string $string, int $int): void { } } diff --git a/tests/_files/ClonedDependencyTest.php b/tests/_files/ClonedDependencyTest.php index 6f1c357fdd2..50bb6547d87 100644 --- a/tests/_files/ClonedDependencyTest.php +++ b/tests/_files/ClonedDependencyTest.php @@ -30,7 +30,7 @@ public function testOne() * * @param mixed $dependency */ - public function testTwo($dependency) + public function testTwo($dependency): void { $this->assertSame(self::$dependency, $dependency); } @@ -40,7 +40,7 @@ public function testTwo($dependency) * * @param mixed $dependency */ - public function testThree($dependency) + public function testThree($dependency): void { $this->assertSame(self::$dependency, $dependency); } @@ -50,7 +50,7 @@ public function testThree($dependency) * * @param mixed $dependency */ - public function testFour($dependency) + public function testFour($dependency): void { $this->assertNotSame(self::$dependency, $dependency); } @@ -60,7 +60,7 @@ public function testFour($dependency) * * @param mixed $dependency */ - public function testFive($dependency) + public function testFive($dependency): void { $this->assertSame(self::$dependency, $dependency); } @@ -70,7 +70,7 @@ public function testFive($dependency) * * @param mixed $dependency */ - public function testSix($dependency) + public function testSix($dependency): void { $this->assertNotSame(self::$dependency, $dependency); } diff --git a/tests/_files/ConcreteTest.my.php b/tests/_files/ConcreteTest.my.php index a5043ad8c99..739cd0f4886 100644 --- a/tests/_files/ConcreteTest.my.php +++ b/tests/_files/ConcreteTest.my.php @@ -9,7 +9,7 @@ */ class ConcreteWithMyCustomExtensionTest extends AbstractTest { - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); } diff --git a/tests/_files/ConcreteTest.php b/tests/_files/ConcreteTest.php index 862171cef20..8e6d4968821 100644 --- a/tests/_files/ConcreteTest.php +++ b/tests/_files/ConcreteTest.php @@ -9,7 +9,7 @@ */ class ConcreteTest extends AbstractTest { - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); } diff --git a/tests/_files/CoverageClassExtendedTest.php b/tests/_files/CoverageClassExtendedTest.php index 1da1c37fa0f..cf1a85e6ec7 100644 --- a/tests/_files/CoverageClassExtendedTest.php +++ b/tests/_files/CoverageClassExtendedTest.php @@ -14,7 +14,7 @@ class CoverageClassExtendedTest extends TestCase /** * @covers CoveredClass */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageClassTest.php b/tests/_files/CoverageClassTest.php index 559a4958c6a..e9710a9d7d1 100644 --- a/tests/_files/CoverageClassTest.php +++ b/tests/_files/CoverageClassTest.php @@ -14,7 +14,7 @@ class CoverageClassTest extends TestCase /** * @covers CoveredClass */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageFunctionParenthesesTest.php b/tests/_files/CoverageFunctionParenthesesTest.php index d2c3d76bbb2..6f118f44e9d 100644 --- a/tests/_files/CoverageFunctionParenthesesTest.php +++ b/tests/_files/CoverageFunctionParenthesesTest.php @@ -14,7 +14,7 @@ class CoverageFunctionParenthesesTest extends TestCase /** * @covers ::globalFunction() */ - public function testSomething() + public function testSomething(): void { globalFunction(); } diff --git a/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php index 705cf39f8f7..ffea17c9678 100644 --- a/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php +++ b/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php @@ -14,7 +14,7 @@ class CoverageFunctionParenthesesWhitespaceTest extends TestCase /** * @covers ::globalFunction ( ) */ - public function testSomething() + public function testSomething(): void { globalFunction(); } diff --git a/tests/_files/CoverageFunctionTest.php b/tests/_files/CoverageFunctionTest.php index 52851b7b9c9..75479c7dc4f 100644 --- a/tests/_files/CoverageFunctionTest.php +++ b/tests/_files/CoverageFunctionTest.php @@ -14,7 +14,7 @@ class CoverageFunctionTest extends TestCase /** * @covers ::globalFunction */ - public function testSomething() + public function testSomething(): void { globalFunction(); } diff --git a/tests/_files/CoverageMethodOneLineAnnotationTest.php b/tests/_files/CoverageMethodOneLineAnnotationTest.php index a07386ae535..198f576c14f 100644 --- a/tests/_files/CoverageMethodOneLineAnnotationTest.php +++ b/tests/_files/CoverageMethodOneLineAnnotationTest.php @@ -12,7 +12,7 @@ class CoverageMethodOneLineAnnotationTest extends TestCase { /** @covers CoveredClass::publicMethod */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageMethodParenthesesTest.php b/tests/_files/CoverageMethodParenthesesTest.php index 69b99190725..341cbbea57e 100644 --- a/tests/_files/CoverageMethodParenthesesTest.php +++ b/tests/_files/CoverageMethodParenthesesTest.php @@ -14,7 +14,7 @@ class CoverageMethodParenthesesTest extends TestCase /** * @covers CoveredClass::publicMethod() */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/tests/_files/CoverageMethodParenthesesWhitespaceTest.php index 693bb5be7a3..58bf8b5792c 100644 --- a/tests/_files/CoverageMethodParenthesesWhitespaceTest.php +++ b/tests/_files/CoverageMethodParenthesesWhitespaceTest.php @@ -14,7 +14,7 @@ class CoverageMethodParenthesesWhitespaceTest extends TestCase /** * @covers CoveredClass::publicMethod ( ) */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageMethodTest.php b/tests/_files/CoverageMethodTest.php index f9e366dfde9..4013efc41dc 100644 --- a/tests/_files/CoverageMethodTest.php +++ b/tests/_files/CoverageMethodTest.php @@ -14,7 +14,7 @@ class CoverageMethodTest extends TestCase /** * @covers CoveredClass::publicMethod */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageNamespacedFunctionTest.php b/tests/_files/CoverageNamespacedFunctionTest.php index 23fdf5ee36f..97afd8779bf 100644 --- a/tests/_files/CoverageNamespacedFunctionTest.php +++ b/tests/_files/CoverageNamespacedFunctionTest.php @@ -14,7 +14,7 @@ class CoverageNamespacedFunctionTest extends TestCase /** * @covers foo\func() */ - public function testFunc() + public function testFunc(): void { foo\func(); } diff --git a/tests/_files/CoverageNoneTest.php b/tests/_files/CoverageNoneTest.php index dacfcaf0d6d..268de4c6c21 100644 --- a/tests/_files/CoverageNoneTest.php +++ b/tests/_files/CoverageNoneTest.php @@ -11,7 +11,7 @@ class CoverageNoneTest extends TestCase { - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageNotPrivateTest.php b/tests/_files/CoverageNotPrivateTest.php index 9244f00b2c3..2e37c280427 100644 --- a/tests/_files/CoverageNotPrivateTest.php +++ b/tests/_files/CoverageNotPrivateTest.php @@ -14,7 +14,7 @@ class CoverageNotPrivateTest extends TestCase /** * @covers CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageNotProtectedTest.php b/tests/_files/CoverageNotProtectedTest.php index 19feebf69c3..310154f761f 100644 --- a/tests/_files/CoverageNotProtectedTest.php +++ b/tests/_files/CoverageNotProtectedTest.php @@ -14,7 +14,7 @@ class CoverageNotProtectedTest extends TestCase /** * @covers CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageNotPublicTest.php b/tests/_files/CoverageNotPublicTest.php index fd4a71012e4..9f6c41b5889 100644 --- a/tests/_files/CoverageNotPublicTest.php +++ b/tests/_files/CoverageNotPublicTest.php @@ -14,7 +14,7 @@ class CoverageNotPublicTest extends TestCase /** * @covers CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageNothingTest.php b/tests/_files/CoverageNothingTest.php index af8b22324f8..e4c831fe35b 100644 --- a/tests/_files/CoverageNothingTest.php +++ b/tests/_files/CoverageNothingTest.php @@ -15,7 +15,7 @@ class CoverageNothingTest extends TestCase * @covers CoveredClass::publicMethod * @coversNothing */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoveragePrivateTest.php b/tests/_files/CoveragePrivateTest.php index 3927f26bdf2..741899ab88f 100644 --- a/tests/_files/CoveragePrivateTest.php +++ b/tests/_files/CoveragePrivateTest.php @@ -14,7 +14,7 @@ class CoveragePrivateTest extends TestCase /** * @covers CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageProtectedTest.php b/tests/_files/CoverageProtectedTest.php index 41910a75028..3fded37566d 100644 --- a/tests/_files/CoverageProtectedTest.php +++ b/tests/_files/CoverageProtectedTest.php @@ -14,7 +14,7 @@ class CoverageProtectedTest extends TestCase /** * @covers CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoveragePublicTest.php b/tests/_files/CoveragePublicTest.php index b8245ec3e24..e7f5f3e7ff3 100644 --- a/tests/_files/CoveragePublicTest.php +++ b/tests/_files/CoveragePublicTest.php @@ -14,7 +14,7 @@ class CoveragePublicTest extends TestCase /** * @covers CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoverageTwoDefaultClassAnnotations.php b/tests/_files/CoverageTwoDefaultClassAnnotations.php index 43f7d95959f..35a3e8bb911 100644 --- a/tests/_files/CoverageTwoDefaultClassAnnotations.php +++ b/tests/_files/CoverageTwoDefaultClassAnnotations.php @@ -17,7 +17,7 @@ class CoverageTwoDefaultClassAnnotations /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/CoveredClass.php b/tests/_files/CoveredClass.php index 62cfbbfd190..283b8498f34 100644 --- a/tests/_files/CoveredClass.php +++ b/tests/_files/CoveredClass.php @@ -9,36 +9,36 @@ */ class CoveredParentClass { - public function publicMethod() + public function publicMethod(): void { $this->protectedMethod(); } - protected function protectedMethod() + protected function protectedMethod(): void { $this->privateMethod(); } - private function privateMethod() + private function privateMethod(): void { } } class CoveredClass extends CoveredParentClass { - public function publicMethod() + public function publicMethod(): void { parent::publicMethod(); $this->protectedMethod(); } - protected function protectedMethod() + protected function protectedMethod(): void { parent::protectedMethod(); $this->privateMethod(); } - private function privateMethod() + private function privateMethod(): void { } } diff --git a/tests/_files/CoveredFunction.php b/tests/_files/CoveredFunction.php index 874737dc491..a2b3a3b6aaa 100644 --- a/tests/_files/CoveredFunction.php +++ b/tests/_files/CoveredFunction.php @@ -7,6 +7,6 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -function globalFunction() +function globalFunction(): void { } diff --git a/tests/_files/DataProviderDebugTest.php b/tests/_files/DataProviderDebugTest.php index a5302f7ce68..a0a54458823 100644 --- a/tests/_files/DataProviderDebugTest.php +++ b/tests/_files/DataProviderDebugTest.php @@ -51,7 +51,7 @@ public static function provider() /** * @dataProvider provider */ - public function testProvider() + public function testProvider(): void { $this->assertTrue(true); } diff --git a/tests/_files/DataProviderDependencyTest.php b/tests/_files/DataProviderDependencyTest.php index c127d611fdc..a5f745aa3c7 100644 --- a/tests/_files/DataProviderDependencyTest.php +++ b/tests/_files/DataProviderDependencyTest.php @@ -9,7 +9,7 @@ */ class DataProviderDependencyTest extends PHPUnit\Framework\TestCase { - public function testReference() + public function testReference(): void { $this->markTestSkipped('This test should be skipped.'); $this->assertTrue(true); @@ -22,7 +22,7 @@ public function testReference() * * @param mixed $param */ - public function testDependency($param) + public function testDependency($param): void { } diff --git a/tests/_files/DataProviderFilterTest.php b/tests/_files/DataProviderFilterTest.php index d7589a38893..0eba83d42c9 100644 --- a/tests/_files/DataProviderFilterTest.php +++ b/tests/_files/DataProviderFilterTest.php @@ -36,7 +36,7 @@ public static function falseProvider() * * @param mixed $truth */ - public function testTrue($truth) + public function testTrue($truth): void { $this->assertTrue($truth); } @@ -46,7 +46,7 @@ public function testTrue($truth) * * @param mixed $false */ - public function testFalse($false) + public function testFalse($false): void { $this->assertFalse($false); } diff --git a/tests/_files/DataProviderIncompleteTest.php b/tests/_files/DataProviderIncompleteTest.php index 1898f039909..60753e25e18 100644 --- a/tests/_files/DataProviderIncompleteTest.php +++ b/tests/_files/DataProviderIncompleteTest.php @@ -26,7 +26,7 @@ public static function providerMethod() * @param mixed $b * @param mixed $c */ - public function testIncomplete($a, $b, $c) + public function testIncomplete($a, $b, $c): void { $this->assertTrue(true); } @@ -38,7 +38,7 @@ public function testIncomplete($a, $b, $c) * @param mixed $b * @param mixed $c */ - public function testAdd($a, $b, $c) + public function testAdd($a, $b, $c): void { $this->assertEquals($c, $a + $b); } diff --git a/tests/_files/DataProviderIssue2833/FirstTest.php b/tests/_files/DataProviderIssue2833/FirstTest.php index 199b4db4cf5..074a7449c3d 100644 --- a/tests/_files/DataProviderIssue2833/FirstTest.php +++ b/tests/_files/DataProviderIssue2833/FirstTest.php @@ -18,7 +18,7 @@ class FirstTest extends TestCase * * @param mixed $x */ - public function testFirst($x) + public function testFirst($x): void { $this->assertTrue(true); } diff --git a/tests/_files/DataProviderIssue2833/SecondTest.php b/tests/_files/DataProviderIssue2833/SecondTest.php index 02b0d61ad1e..bbe2d10cf0f 100644 --- a/tests/_files/DataProviderIssue2833/SecondTest.php +++ b/tests/_files/DataProviderIssue2833/SecondTest.php @@ -15,7 +15,7 @@ class SecondTest extends TestCase { const DUMMY = 'dummy'; - public function testSecond() + public function testSecond(): void { $this->assertTrue(true); } diff --git a/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php b/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php index c092cd60e05..29963df394c 100644 --- a/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php +++ b/tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php @@ -18,7 +18,7 @@ class TestWithDataProviderTest extends TestCase * * @param mixed $x */ - public function testFirst($x) + public function testFirst($x): void { $this->assertTrue(true); } diff --git a/tests/_files/DataProviderIssue2922/FirstTest.php b/tests/_files/DataProviderIssue2922/FirstTest.php index 1ec8aa9aabb..873c543f8ef 100644 --- a/tests/_files/DataProviderIssue2922/FirstTest.php +++ b/tests/_files/DataProviderIssue2922/FirstTest.php @@ -21,12 +21,12 @@ class FirstTest extends TestCase * * @param mixed $x */ - public function testFirst($x) + public function testFirst($x): void { $this->assertTrue(true); } - public function provide() + public function provide(): void { throw new \Exception(); } diff --git a/tests/_files/DataProviderIssue2922/SecondTest.php b/tests/_files/DataProviderIssue2922/SecondTest.php index afbb9fb0884..3f3251d139a 100644 --- a/tests/_files/DataProviderIssue2922/SecondTest.php +++ b/tests/_files/DataProviderIssue2922/SecondTest.php @@ -14,7 +14,7 @@ // the name of the class cannot match file name - if they match all is fine class SecondHelloWorldTest extends TestCase { - public function testSecond() + public function testSecond(): void { $this->assertTrue(true); } diff --git a/tests/_files/DataProviderSkippedTest.php b/tests/_files/DataProviderSkippedTest.php index 417f0045c70..70d6614347f 100644 --- a/tests/_files/DataProviderSkippedTest.php +++ b/tests/_files/DataProviderSkippedTest.php @@ -26,7 +26,7 @@ public static function providerMethod() * @param mixed $b * @param mixed $c */ - public function testSkipped($a, $b, $c) + public function testSkipped($a, $b, $c): void { $this->assertTrue(true); } @@ -38,7 +38,7 @@ public function testSkipped($a, $b, $c) * @param mixed $b * @param mixed $c */ - public function testAdd($a, $b, $c) + public function testAdd($a, $b, $c): void { $this->assertEquals($c, $a + $b); } diff --git a/tests/_files/DataProviderTest.php b/tests/_files/DataProviderTest.php index f6ba9920935..50ee9aef4bd 100644 --- a/tests/_files/DataProviderTest.php +++ b/tests/_files/DataProviderTest.php @@ -28,7 +28,7 @@ public static function providerMethod() * @param mixed $b * @param mixed $c */ - public function testAdd($a, $b, $c) + public function testAdd($a, $b, $c): void { $this->assertEquals($c, $a + $b); } diff --git a/tests/_files/DataProviderTestDoxTest.php b/tests/_files/DataProviderTestDoxTest.php index 28785832baf..e03209408a9 100644 --- a/tests/_files/DataProviderTestDoxTest.php +++ b/tests/_files/DataProviderTestDoxTest.php @@ -15,7 +15,7 @@ class DataProviderTestDoxTest extends TestCase * @dataProvider provider * @testdox Does something with */ - public function testOne() + public function testOne(): void { $this->assertTrue(true); } @@ -23,7 +23,7 @@ public function testOne() /** * @dataProvider provider */ - public function testDoesSomethingElseWith() + public function testDoesSomethingElseWith(): void { $this->assertTrue(true); } diff --git a/tests/_files/DependencyFailureTest.php b/tests/_files/DependencyFailureTest.php index 4bd5deb0549..4695305d73d 100644 --- a/tests/_files/DependencyFailureTest.php +++ b/tests/_files/DependencyFailureTest.php @@ -11,7 +11,7 @@ class DependencyFailureTest extends TestCase { - public function testOne() + public function testOne(): void { $this->fail(); } @@ -19,7 +19,7 @@ public function testOne() /** * @depends testOne */ - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); } @@ -27,7 +27,7 @@ public function testTwo() /** * @depends !clone testTwo */ - public function testThree() + public function testThree(): void { $this->assertTrue(true); } @@ -35,7 +35,7 @@ public function testThree() /** * @depends clone testOne */ - public function testFour() + public function testFour(): void { $this->assertTrue(true); } diff --git a/tests/_files/DependencySuccessTest.php b/tests/_files/DependencySuccessTest.php index 9e57e4ce31e..0dd9626c06f 100644 --- a/tests/_files/DependencySuccessTest.php +++ b/tests/_files/DependencySuccessTest.php @@ -11,7 +11,7 @@ class DependencySuccessTest extends TestCase { - public function testOne() + public function testOne(): void { $this->assertTrue(true); } @@ -19,7 +19,7 @@ public function testOne() /** * @depends testOne */ - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); } @@ -27,7 +27,7 @@ public function testTwo() /** * @depends DependencySuccessTest::testTwo */ - public function testThree() + public function testThree(): void { $this->assertTrue(true); } diff --git a/tests/_files/DummyBarTest.php b/tests/_files/DummyBarTest.php index 421c737ec4a..5958871fd9d 100644 --- a/tests/_files/DummyBarTest.php +++ b/tests/_files/DummyBarTest.php @@ -11,7 +11,7 @@ class DummyBarTest extends TestCase { - public function testBarEqualsBar() + public function testBarEqualsBar(): void { $this->assertEquals('Bar', 'Bar'); } diff --git a/tests/_files/DummyFooTest.php b/tests/_files/DummyFooTest.php index 0a20c8d7982..abfb9e085bb 100644 --- a/tests/_files/DummyFooTest.php +++ b/tests/_files/DummyFooTest.php @@ -11,7 +11,7 @@ class DummyFooTest extends TestCase { - public function testFooEqualsFoo() + public function testFooEqualsFoo(): void { $this->assertEquals('Foo', 'Foo'); } diff --git a/tests/_files/ExceptionInAssertPostConditionsTest.php b/tests/_files/ExceptionInAssertPostConditionsTest.php index 187523c04d4..5b5f6c24ea0 100644 --- a/tests/_files/ExceptionInAssertPostConditionsTest.php +++ b/tests/_files/ExceptionInAssertPostConditionsTest.php @@ -27,17 +27,17 @@ protected function tearDown(): void $this->tearDown = true; } - public function testSomething() + public function testSomething(): void { $this->testSomething = true; } - protected function assertPreConditions() + protected function assertPreConditions(): void { $this->assertPreConditions = true; } - protected function assertPostConditions() + protected function assertPostConditions(): void { $this->assertPostConditions = true; diff --git a/tests/_files/ExceptionInAssertPreConditionsTest.php b/tests/_files/ExceptionInAssertPreConditionsTest.php index 9eedaece2cd..ccc9d1acd39 100644 --- a/tests/_files/ExceptionInAssertPreConditionsTest.php +++ b/tests/_files/ExceptionInAssertPreConditionsTest.php @@ -27,19 +27,19 @@ protected function tearDown(): void $this->tearDown = true; } - public function testSomething() + public function testSomething(): void { $this->testSomething = true; } - protected function assertPreConditions() + protected function assertPreConditions(): void { $this->assertPreConditions = true; throw new Exception; } - protected function assertPostConditions() + protected function assertPostConditions(): void { $this->assertPostConditions = true; } diff --git a/tests/_files/ExceptionInSetUpTest.php b/tests/_files/ExceptionInSetUpTest.php index 9dcedd128d0..154fe12da2e 100644 --- a/tests/_files/ExceptionInSetUpTest.php +++ b/tests/_files/ExceptionInSetUpTest.php @@ -29,17 +29,17 @@ protected function tearDown(): void $this->tearDown = true; } - public function testSomething() + public function testSomething(): void { $this->testSomething = true; } - protected function assertPreConditions() + protected function assertPreConditions(): void { $this->assertPreConditions = true; } - protected function assertPostConditions() + protected function assertPostConditions(): void { $this->assertPostConditions = true; } diff --git a/tests/_files/ExceptionInTearDownTest.php b/tests/_files/ExceptionInTearDownTest.php index 398e2c53f5b..c26f254bdb3 100644 --- a/tests/_files/ExceptionInTearDownTest.php +++ b/tests/_files/ExceptionInTearDownTest.php @@ -29,17 +29,17 @@ protected function tearDown(): void throw new Exception; } - public function testSomething() + public function testSomething(): void { $this->testSomething = true; } - protected function assertPreConditions() + protected function assertPreConditions(): void { $this->assertPreConditions = true; } - protected function assertPostConditions() + protected function assertPostConditions(): void { $this->assertPostConditions = true; } diff --git a/tests/_files/ExceptionInTest.php b/tests/_files/ExceptionInTest.php index 9572cd3ac73..d33049d735b 100644 --- a/tests/_files/ExceptionInTest.php +++ b/tests/_files/ExceptionInTest.php @@ -27,19 +27,19 @@ protected function tearDown(): void $this->tearDown = true; } - public function testSomething() + public function testSomething(): void { $this->testSomething = true; throw new Exception; } - protected function assertPreConditions() + protected function assertPreConditions(): void { $this->assertPreConditions = true; } - protected function assertPostConditions() + protected function assertPostConditions(): void { $this->assertPostConditions = true; } diff --git a/tests/_files/ExceptionInTestDetectedInTeardown.php b/tests/_files/ExceptionInTestDetectedInTeardown.php index 6bf0573a528..a8f2fb5b83f 100644 --- a/tests/_files/ExceptionInTestDetectedInTeardown.php +++ b/tests/_files/ExceptionInTestDetectedInTeardown.php @@ -22,7 +22,7 @@ protected function tearDown(): void } } - public function testSomething() + public function testSomething(): void { throw new Exception; } diff --git a/tests/_files/ExceptionNamespaceTest.php b/tests/_files/ExceptionNamespaceTest.php index 86e7b232769..7713a5d8540 100644 --- a/tests/_files/ExceptionNamespaceTest.php +++ b/tests/_files/ExceptionNamespaceTest.php @@ -30,7 +30,7 @@ class ExceptionNamespaceTest extends \PHPUnit\Framework\TestCase * @expectedExceptionMessage My\Space\ExceptionNamespaceTest::ERROR_MESSAGE * @expectedExceptionCode My\Space\ExceptionNamespaceTest::ERROR_CODE */ - public function testConstants() + public function testConstants(): void { } @@ -39,7 +39,7 @@ public function testConstants() * @expectedExceptionCode My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT * @expectedExceptionMessage My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT */ - public function testUnknownConstants() + public function testUnknownConstants(): void { } } diff --git a/tests/_files/ExceptionStackTest.php b/tests/_files/ExceptionStackTest.php index d4aeb347a92..62bc73319e1 100644 --- a/tests/_files/ExceptionStackTest.php +++ b/tests/_files/ExceptionStackTest.php @@ -12,7 +12,7 @@ class ExceptionStackTest extends TestCase { - public function testPrintingChildException() + public function testPrintingChildException(): void { try { $this->assertEquals([1], [2], 'message'); @@ -23,7 +23,7 @@ public function testPrintingChildException() } } - public function testNestedExceptions() + public function testNestedExceptions(): void { $exceptionThree = new Exception('Three'); $exceptionTwo = new InvalidArgumentException('Two', 0, $exceptionThree); diff --git a/tests/_files/ExceptionTest.php b/tests/_files/ExceptionTest.php index d82ab9e4e76..47855f1ef7d 100644 --- a/tests/_files/ExceptionTest.php +++ b/tests/_files/ExceptionTest.php @@ -35,35 +35,35 @@ class ExceptionTest extends TestCase /** * @expectedException FooBarBaz */ - public function testOne() + public function testOne(): void { } /** * @expectedException Foo_Bar_Baz */ - public function testTwo() + public function testTwo(): void { } /** * @expectedException Foo\Bar\Baz */ - public function testThree() + public function testThree(): void { } /** * @expectedException ほげ */ - public function testFour() + public function testFour(): void { } /** * @expectedException Class Message 1234 */ - public function testFive() + public function testFive(): void { } @@ -72,7 +72,7 @@ public function testFive() * @expectedExceptionMessage Message * @expectedExceptionCode 1234 */ - public function testSix() + public function testSix(): void { } @@ -81,7 +81,7 @@ public function testSix() * @expectedExceptionMessage Message * @expectedExceptionCode ExceptionCode */ - public function testSeven() + public function testSeven(): void { } @@ -90,7 +90,7 @@ public function testSeven() * @expectedExceptionMessage Message * @expectedExceptionCode 0 */ - public function testEight() + public function testEight(): void { } @@ -99,12 +99,12 @@ public function testEight() * @expectedExceptionMessage ExceptionTest::ERROR_MESSAGE * @expectedExceptionCode ExceptionTest::ERROR_CODE */ - public function testNine() + public function testNine(): void { } /** @expectedException Class */ - public function testSingleLine() + public function testSingleLine(): void { } @@ -113,7 +113,7 @@ public function testSingleLine() * @expectedExceptionCode ExceptionTest::UNKNOWN_CODE_CONSTANT * @expectedExceptionMessage ExceptionTest::UNKNOWN_MESSAGE_CONSTANT */ - public function testUnknownConstants() + public function testUnknownConstants(): void { } @@ -123,7 +123,7 @@ public function testUnknownConstants() * @expectedExceptionMessage Message * @expectedExceptionMessageRegExp #regex# */ - public function testWithRegexMessage() + public function testWithRegexMessage(): void { } @@ -133,7 +133,7 @@ public function testWithRegexMessage() * @expectedExceptionMessage Message * @expectedExceptionMessageRegExp ExceptionTest::ERROR_MESSAGE_REGEX */ - public function testWithRegexMessageFromClassConstant() + public function testWithRegexMessageFromClassConstant(): void { } @@ -143,7 +143,7 @@ public function testWithRegexMessageFromClassConstant() * @expectedExceptionMessage Message * @expectedExceptionMessageRegExp ExceptionTest::UNKNOWN_MESSAGE_REGEX_CONSTANT */ - public function testWithUnknowRegexMessageFromClassConstant() + public function testWithUnknowRegexMessageFromClassConstant(): void { } } diff --git a/tests/_files/Failure.php b/tests/_files/Failure.php index 55ed0f8f16e..2ced7cfd8bb 100644 --- a/tests/_files/Failure.php +++ b/tests/_files/Failure.php @@ -11,7 +11,7 @@ class Failure extends TestCase { - protected function runTest() + protected function runTest(): void { $this->fail(); } diff --git a/tests/_files/FailureTest.php b/tests/_files/FailureTest.php index 95a621cdf0a..e80b7470ace 100644 --- a/tests/_files/FailureTest.php +++ b/tests/_files/FailureTest.php @@ -11,17 +11,17 @@ class FailureTest extends TestCase { - public function testAssertArrayEqualsArray() + public function testAssertArrayEqualsArray(): void { $this->assertEquals([1], [2], 'message'); } - public function testAssertIntegerEqualsInteger() + public function testAssertIntegerEqualsInteger(): void { $this->assertEquals(1, 2, 'message'); } - public function testAssertObjectEqualsObject() + public function testAssertObjectEqualsObject(): void { $a = new stdClass; $a->foo = 'bar'; @@ -32,53 +32,53 @@ public function testAssertObjectEqualsObject() $this->assertEquals($a, $b, 'message'); } - public function testAssertNullEqualsString() + public function testAssertNullEqualsString(): void { $this->assertEquals(null, 'bar', 'message'); } - public function testAssertStringEqualsString() + public function testAssertStringEqualsString(): void { $this->assertEquals('foo', 'bar', 'message'); } - public function testAssertTextEqualsText() + public function testAssertTextEqualsText(): void { $this->assertEquals("foo\nbar\n", "foo\nbaz\n", 'message'); } - public function testAssertStringMatchesFormat() + public function testAssertStringMatchesFormat(): void { $this->assertStringMatchesFormat('*%s*', '**', 'message'); } - public function testAssertNumericEqualsNumeric() + public function testAssertNumericEqualsNumeric(): void { $this->assertEquals(1, 2, 'message'); } - public function testAssertTextSameText() + public function testAssertTextSameText(): void { $this->assertSame('foo', 'bar', 'message'); } - public function testAssertObjectSameObject() + public function testAssertObjectSameObject(): void { $this->assertSame(new stdClass, new stdClass, 'message'); } - public function testAssertObjectSameNull() + public function testAssertObjectSameNull(): void { $this->assertSame(new stdClass, null, 'message'); } - public function testAssertFloatSameFloat() + public function testAssertFloatSameFloat(): void { $this->assertSame(1.0, 1.5, 'message'); } // Note that due to the implementation of this assertion it counts as 2 asserts - public function testAssertStringMatchesFormatFile() + public function testAssertStringMatchesFormatFile(): void { $this->assertStringMatchesFormatFile(__DIR__ . '/expectedFileFormat.txt', '...BAR...'); } diff --git a/tests/_files/FatalTest.php b/tests/_files/FatalTest.php index aec87ad148b..847cfa0238a 100644 --- a/tests/_files/FatalTest.php +++ b/tests/_files/FatalTest.php @@ -11,7 +11,7 @@ class FatalTest extends TestCase { - public function testFatalError() + public function testFatalError(): void { if (\extension_loaded('xdebug')) { \xdebug_disable(); diff --git a/tests/_files/IgnoreCodeCoverageClassTest.php b/tests/_files/IgnoreCodeCoverageClassTest.php index c31bbaebd1d..73cc027b61f 100644 --- a/tests/_files/IgnoreCodeCoverageClassTest.php +++ b/tests/_files/IgnoreCodeCoverageClassTest.php @@ -11,13 +11,13 @@ class IgnoreCodeCoverageClassTest extends TestCase { - public function testReturnTrue() + public function testReturnTrue(): void { $sut = new IgnoreCodeCoverageClass(); $this->assertTrue($sut->returnTrue()); } - public function testReturnFalse() + public function testReturnFalse(): void { $sut = new IgnoreCodeCoverageClass(); $this->assertFalse($sut->returnFalse()); diff --git a/tests/_files/IncompleteTest.php b/tests/_files/IncompleteTest.php index bfe8f2f8199..15cddd9dc72 100644 --- a/tests/_files/IncompleteTest.php +++ b/tests/_files/IncompleteTest.php @@ -11,7 +11,7 @@ class IncompleteTest extends TestCase { - public function testIncomplete() + public function testIncomplete(): void { $this->markTestIncomplete('Test incomplete'); } diff --git a/tests/_files/Inheritance/InheritanceB.php b/tests/_files/Inheritance/InheritanceB.php index 2821220dd4d..796f1a7433a 100644 --- a/tests/_files/Inheritance/InheritanceB.php +++ b/tests/_files/Inheritance/InheritanceB.php @@ -11,7 +11,7 @@ class InheritanceB extends TestCase { - public function testSomething() + public function testSomething(): void { } } diff --git a/tests/_files/InheritedTestCase.php b/tests/_files/InheritedTestCase.php index 18295756c69..9fef5141625 100644 --- a/tests/_files/InheritedTestCase.php +++ b/tests/_files/InheritedTestCase.php @@ -9,7 +9,7 @@ */ class InheritedTestCase extends OneTestCase { - public function test2() + public function test2(): void { } } diff --git a/tests/_files/IniTest.php b/tests/_files/IniTest.php index 445f77ecd6d..45517d4d1c2 100644 --- a/tests/_files/IniTest.php +++ b/tests/_files/IniTest.php @@ -11,7 +11,7 @@ class IniTest extends TestCase { - public function testIni() + public function testIni(): void { $this->assertEquals('application/x-test', \ini_get('default_mimetype')); } diff --git a/tests/_files/IsolationTest.php b/tests/_files/IsolationTest.php index cb8a2adb7d3..63f7141dec2 100644 --- a/tests/_files/IsolationTest.php +++ b/tests/_files/IsolationTest.php @@ -11,12 +11,12 @@ class IsolationTest extends TestCase { - public function testIsInIsolationReturnsFalse() + public function testIsInIsolationReturnsFalse(): void { $this->assertFalse($this->isInIsolation()); } - public function testIsInIsolationReturnsTrue() + public function testIsInIsolationReturnsTrue(): void { $this->assertTrue($this->isInIsolation()); } diff --git a/tests/_files/MockRunner.php b/tests/_files/MockRunner.php index 79917ddab01..be9442fade1 100644 --- a/tests/_files/MockRunner.php +++ b/tests/_files/MockRunner.php @@ -11,7 +11,7 @@ class MockRunner extends BaseTestRunner { - protected function runFailed($message) + protected function runFailed($message): void { } } diff --git a/tests/_files/MultiDependencyTest.php b/tests/_files/MultiDependencyTest.php index 1832c395cf4..4d3d7320a62 100644 --- a/tests/_files/MultiDependencyTest.php +++ b/tests/_files/MultiDependencyTest.php @@ -32,7 +32,7 @@ public function testTwo() * @param mixed $a * @param mixed $b */ - public function testThree($a, $b) + public function testThree($a, $b): void { $this->assertEquals('foo', $a); $this->assertEquals('bar', $b); diff --git a/tests/_files/MultipleDataProviderTest.php b/tests/_files/MultipleDataProviderTest.php index c5fba3523f0..f87986a589e 100644 --- a/tests/_files/MultipleDataProviderTest.php +++ b/tests/_files/MultipleDataProviderTest.php @@ -74,7 +74,7 @@ public static function providerF() * @dataProvider providerB * @dataProvider providerC */ - public function testOne() + public function testOne(): void { } @@ -83,7 +83,7 @@ public function testOne() * @dataProvider providerE * @dataProvider providerF */ - public function testTwo() + public function testTwo(): void { } } diff --git a/tests/_files/MyCommand.php b/tests/_files/MyCommand.php index a3b8f4e4278..390f7fea0a4 100644 --- a/tests/_files/MyCommand.php +++ b/tests/_files/MyCommand.php @@ -17,7 +17,7 @@ public function __construct() $this->longOptions['my-other-option'] = null; } - public function myHandler($value) + public function myHandler($value): void { print __METHOD__ . " $value\n"; } diff --git a/tests/_files/NamespaceCoverageClassExtendedTest.php b/tests/_files/NamespaceCoverageClassExtendedTest.php index 525cd773cf8..7c60471198f 100644 --- a/tests/_files/NamespaceCoverageClassExtendedTest.php +++ b/tests/_files/NamespaceCoverageClassExtendedTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageClassExtendedTest extends TestCase /** * @covers Foo\CoveredClass */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageClassTest.php b/tests/_files/NamespaceCoverageClassTest.php index dae07fb6afa..efb6a447d3b 100644 --- a/tests/_files/NamespaceCoverageClassTest.php +++ b/tests/_files/NamespaceCoverageClassTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageClassTest extends TestCase /** * @covers Foo\CoveredClass */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/tests/_files/NamespaceCoverageCoversClassPublicTest.php index be00da75c1b..4e6d56d9a26 100644 --- a/tests/_files/NamespaceCoverageCoversClassPublicTest.php +++ b/tests/_files/NamespaceCoverageCoversClassPublicTest.php @@ -17,7 +17,7 @@ class NamespaceCoverageCoversClassPublicTest extends TestCase /** * @covers ::publicMethod */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageCoversClassTest.php b/tests/_files/NamespaceCoverageCoversClassTest.php index 81291baa158..78970cf08c7 100644 --- a/tests/_files/NamespaceCoverageCoversClassTest.php +++ b/tests/_files/NamespaceCoverageCoversClassTest.php @@ -22,7 +22,7 @@ class NamespaceCoverageCoversClassTest extends TestCase * @covers \Foo\CoveredParentClass::protectedMethod * @covers \Foo\CoveredParentClass::publicMethod */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageMethodTest.php b/tests/_files/NamespaceCoverageMethodTest.php index a230e0a022b..2b9cfd6eabb 100644 --- a/tests/_files/NamespaceCoverageMethodTest.php +++ b/tests/_files/NamespaceCoverageMethodTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageMethodTest extends TestCase /** * @covers Foo\CoveredClass::publicMethod */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageNotPrivateTest.php b/tests/_files/NamespaceCoverageNotPrivateTest.php index b64bdd067c6..63fe46d5fe4 100644 --- a/tests/_files/NamespaceCoverageNotPrivateTest.php +++ b/tests/_files/NamespaceCoverageNotPrivateTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageNotPrivateTest extends TestCase /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageNotProtectedTest.php b/tests/_files/NamespaceCoverageNotProtectedTest.php index d8baf807205..5d64a564908 100644 --- a/tests/_files/NamespaceCoverageNotProtectedTest.php +++ b/tests/_files/NamespaceCoverageNotProtectedTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageNotProtectedTest extends TestCase /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageNotPublicTest.php b/tests/_files/NamespaceCoverageNotPublicTest.php index 5f275c9cc59..eed2b0f3aa3 100644 --- a/tests/_files/NamespaceCoverageNotPublicTest.php +++ b/tests/_files/NamespaceCoverageNotPublicTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageNotPublicTest extends TestCase /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoveragePrivateTest.php b/tests/_files/NamespaceCoveragePrivateTest.php index 18f6658eeb1..370f2ed4324 100644 --- a/tests/_files/NamespaceCoveragePrivateTest.php +++ b/tests/_files/NamespaceCoveragePrivateTest.php @@ -14,7 +14,7 @@ class NamespaceCoveragePrivateTest extends TestCase /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoverageProtectedTest.php b/tests/_files/NamespaceCoverageProtectedTest.php index 9f9c1d30912..031a6cf60dd 100644 --- a/tests/_files/NamespaceCoverageProtectedTest.php +++ b/tests/_files/NamespaceCoverageProtectedTest.php @@ -14,7 +14,7 @@ class NamespaceCoverageProtectedTest extends TestCase /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoveragePublicTest.php b/tests/_files/NamespaceCoveragePublicTest.php index f127fa2feec..87a146f0de4 100644 --- a/tests/_files/NamespaceCoveragePublicTest.php +++ b/tests/_files/NamespaceCoveragePublicTest.php @@ -14,7 +14,7 @@ class NamespaceCoveragePublicTest extends TestCase /** * @covers Foo\CoveredClass:: */ - public function testSomething() + public function testSomething(): void { $o = new Foo\CoveredClass; $o->publicMethod(); diff --git a/tests/_files/NamespaceCoveredClass.php b/tests/_files/NamespaceCoveredClass.php index 49907a4263f..40651ba76f4 100644 --- a/tests/_files/NamespaceCoveredClass.php +++ b/tests/_files/NamespaceCoveredClass.php @@ -11,36 +11,36 @@ class CoveredParentClass { - public function publicMethod() + public function publicMethod(): void { $this->protectedMethod(); } - protected function protectedMethod() + protected function protectedMethod(): void { $this->privateMethod(); } - private function privateMethod() + private function privateMethod(): void { } } class CoveredClass extends CoveredParentClass { - public function publicMethod() + public function publicMethod(): void { parent::publicMethod(); $this->protectedMethod(); } - protected function protectedMethod() + protected function protectedMethod(): void { parent::protectedMethod(); $this->privateMethod(); } - private function privateMethod() + private function privateMethod(): void { } } diff --git a/tests/_files/NoArgTestCaseTest.php b/tests/_files/NoArgTestCaseTest.php index cb2c71b7ba7..f00c87fa68f 100644 --- a/tests/_files/NoArgTestCaseTest.php +++ b/tests/_files/NoArgTestCaseTest.php @@ -11,7 +11,7 @@ class NoArgTestCaseTest extends TestCase { - public function testNothing() + public function testNothing(): void { } } diff --git a/tests/_files/NoTestCases.php b/tests/_files/NoTestCases.php index 14650031dd2..1ec9957f5ec 100644 --- a/tests/_files/NoTestCases.php +++ b/tests/_files/NoTestCases.php @@ -11,7 +11,7 @@ class NoTestCases extends TestCase { - public function noTestCase() + public function noTestCase(): void { } } diff --git a/tests/_files/NonStatic.php b/tests/_files/NonStatic.php index 38f3c4754ff..1c9839e419e 100644 --- a/tests/_files/NonStatic.php +++ b/tests/_files/NonStatic.php @@ -9,7 +9,7 @@ */ class NonStatic { - public function suite() + public function suite(): void { } } diff --git a/tests/_files/NotExistingCoveredElementTest.php b/tests/_files/NotExistingCoveredElementTest.php index 1a1f4b2fb3f..a92f6dda3e4 100644 --- a/tests/_files/NotExistingCoveredElementTest.php +++ b/tests/_files/NotExistingCoveredElementTest.php @@ -14,21 +14,21 @@ class NotExistingCoveredElementTest extends TestCase /** * @covers NotExistingClass */ - public function testOne() + public function testOne(): void { } /** * @covers NotExistingClass::notExistingMethod */ - public function testTwo() + public function testTwo(): void { } /** * @covers NotExistingClass:: */ - public function testThree() + public function testThree(): void { } } diff --git a/tests/_files/NotPublicTestCase.php b/tests/_files/NotPublicTestCase.php index 95cb55a56f5..5175cabfc1f 100644 --- a/tests/_files/NotPublicTestCase.php +++ b/tests/_files/NotPublicTestCase.php @@ -11,11 +11,11 @@ class NotPublicTestCase extends TestCase { - public function testPublic() + public function testPublic(): void { } - protected function testNotPublic() + protected function testNotPublic(): void { } } diff --git a/tests/_files/NothingTest.php b/tests/_files/NothingTest.php index 94d6c0f37a5..88c91eefa5a 100644 --- a/tests/_files/NothingTest.php +++ b/tests/_files/NothingTest.php @@ -11,7 +11,7 @@ class NothingTest extends TestCase { - public function testNothing() + public function testNothing(): void { } } diff --git a/tests/_files/OneTestCase.php b/tests/_files/OneTestCase.php index f611e100ad6..118bfcb436d 100644 --- a/tests/_files/OneTestCase.php +++ b/tests/_files/OneTestCase.php @@ -11,11 +11,11 @@ class OneTestCase extends TestCase { - public function noTestCase() + public function noTestCase(): void { } - public function testCase($arg = '') + public function testCase($arg = ''): void { } } diff --git a/tests/_files/OutputTestCase.php b/tests/_files/OutputTestCase.php index 58424e814c2..52a46e96928 100644 --- a/tests/_files/OutputTestCase.php +++ b/tests/_files/OutputTestCase.php @@ -11,25 +11,25 @@ class OutputTestCase extends TestCase { - public function testExpectOutputStringFooActualFoo() + public function testExpectOutputStringFooActualFoo(): void { $this->expectOutputString('foo'); print 'foo'; } - public function testExpectOutputStringFooActualBar() + public function testExpectOutputStringFooActualBar(): void { $this->expectOutputString('foo'); print 'bar'; } - public function testExpectOutputRegexFooActualFoo() + public function testExpectOutputRegexFooActualFoo(): void { $this->expectOutputRegex('/foo/'); print 'foo'; } - public function testExpectOutputRegexFooActualBar() + public function testExpectOutputRegexFooActualBar(): void { $this->expectOutputRegex('/foo/'); print 'bar'; diff --git a/tests/_files/OverrideTestCase.php b/tests/_files/OverrideTestCase.php index f8a985f73f5..6cdb2dcfc9d 100644 --- a/tests/_files/OverrideTestCase.php +++ b/tests/_files/OverrideTestCase.php @@ -9,7 +9,7 @@ */ class OverrideTestCase extends OneTestCase { - public function testCase($arg = '') + public function testCase($arg = ''): void { } } diff --git a/tests/_files/RequirementsClassDocBlockTest.php b/tests/_files/RequirementsClassDocBlockTest.php index 78880b002ad..db10d9eae7a 100644 --- a/tests/_files/RequirementsClassDocBlockTest.php +++ b/tests/_files/RequirementsClassDocBlockTest.php @@ -24,7 +24,7 @@ class RequirementsClassDocBlockTest * @requires function testFuncMethod * @requires extension testExtMethod */ - public function testMethod() + public function testMethod(): void { } } diff --git a/tests/_files/RequirementsTest.php b/tests/_files/RequirementsTest.php index 3dc07bd5eef..43de8ea374d 100644 --- a/tests/_files/RequirementsTest.php +++ b/tests/_files/RequirementsTest.php @@ -11,21 +11,21 @@ class RequirementsTest extends TestCase { - public function testOne() + public function testOne(): void { } /** * @requires PHPUnit 1.0 */ - public function testTwo() + public function testTwo(): void { } /** * @requires PHP 2.0 */ - public function testThree() + public function testThree(): void { } @@ -33,49 +33,49 @@ public function testThree() * @requires PHPUnit 2.0 * @requires PHP 1.0 */ - public function testFour() + public function testFour(): void { } /** * @requires PHP 5.4.0RC6 */ - public function testFive() + public function testFive(): void { } /** * @requires PHP 5.4.0-alpha1 */ - public function testSix() + public function testSix(): void { } /** * @requires PHP 5.4.0beta2 */ - public function testSeven() + public function testSeven(): void { } /** * @requires PHP 5.4-dev */ - public function testEight() + public function testEight(): void { } /** * @requires function testFunc */ - public function testNine() + public function testNine(): void { } /** * @requires extension testExt */ - public function testTen() + public function testTen(): void { } @@ -83,7 +83,7 @@ public function testTen() * @requires OS SunOS * @requires OSFAMILY Solaris */ - public function testEleven() + public function testEleven(): void { } @@ -98,63 +98,63 @@ public function testEleven() * @requires extension testExtThree 2.0 * @requires setting not_a_setting Off */ - public function testAllPossibleRequirements() + public function testAllPossibleRequirements(): void { } /** * @requires function array_merge */ - public function testExistingFunction() + public function testExistingFunction(): void { } /** * @requires function ReflectionMethod::setAccessible */ - public function testExistingMethod() + public function testExistingMethod(): void { } /** * @requires extension spl */ - public function testExistingExtension() + public function testExistingExtension(): void { } /** * @requires OS .* */ - public function testExistingOs() + public function testExistingOs(): void { } /** * @requires PHPUnit 1111111 */ - public function testAlwaysSkip() + public function testAlwaysSkip(): void { } /** * @requires PHP 9999999 */ - public function testAlwaysSkip2() + public function testAlwaysSkip2(): void { } /** * @requires OS DOESNOTEXIST */ - public function testAlwaysSkip3() + public function testAlwaysSkip3(): void { } /** * @requires OSFAMILY DOESNOTEXIST */ - public function testAlwaysSkip4() + public function testAlwaysSkip4(): void { } @@ -162,203 +162,203 @@ public function testAlwaysSkip4() * @requires extension spl * @requires OS .* */ - public function testSpace() + public function testSpace(): void { } /** * @requires extension testExt 1.8.0 */ - public function testSpecificExtensionVersion() + public function testSpecificExtensionVersion(): void { } /** * @requires PHP < 5.4 */ - public function testPHPVersionOperatorLessThan() + public function testPHPVersionOperatorLessThan(): void { } /** * @requires PHP <= 5.4 */ - public function testPHPVersionOperatorLessThanEquals() + public function testPHPVersionOperatorLessThanEquals(): void { } /** * @requires PHP > 99 */ - public function testPHPVersionOperatorGreaterThan() + public function testPHPVersionOperatorGreaterThan(): void { } /** * @requires PHP >= 99 */ - public function testPHPVersionOperatorGreaterThanEquals() + public function testPHPVersionOperatorGreaterThanEquals(): void { } /** * @requires PHP = 5.4 */ - public function testPHPVersionOperatorEquals() + public function testPHPVersionOperatorEquals(): void { } /** * @requires PHP == 5.4 */ - public function testPHPVersionOperatorDoubleEquals() + public function testPHPVersionOperatorDoubleEquals(): void { } /** * @requires PHP != 99 */ - public function testPHPVersionOperatorBangEquals() + public function testPHPVersionOperatorBangEquals(): void { } /** * @requires PHP <> 99 */ - public function testPHPVersionOperatorNotEquals() + public function testPHPVersionOperatorNotEquals(): void { } /** * @requires PHP >=99 */ - public function testPHPVersionOperatorNoSpace() + public function testPHPVersionOperatorNoSpace(): void { } /** * @requires PHPUnit < 1.0 */ - public function testPHPUnitVersionOperatorLessThan() + public function testPHPUnitVersionOperatorLessThan(): void { } /** * @requires PHPUnit <= 1.0 */ - public function testPHPUnitVersionOperatorLessThanEquals() + public function testPHPUnitVersionOperatorLessThanEquals(): void { } /** * @requires PHPUnit > 99 */ - public function testPHPUnitVersionOperatorGreaterThan() + public function testPHPUnitVersionOperatorGreaterThan(): void { } /** * @requires PHPUnit >= 99 */ - public function testPHPUnitVersionOperatorGreaterThanEquals() + public function testPHPUnitVersionOperatorGreaterThanEquals(): void { } /** * @requires PHPUnit = 1.0 */ - public function testPHPUnitVersionOperatorEquals() + public function testPHPUnitVersionOperatorEquals(): void { } /** * @requires PHPUnit == 1.0 */ - public function testPHPUnitVersionOperatorDoubleEquals() + public function testPHPUnitVersionOperatorDoubleEquals(): void { } /** * @requires PHPUnit != 99 */ - public function testPHPUnitVersionOperatorBangEquals() + public function testPHPUnitVersionOperatorBangEquals(): void { } /** * @requires PHPUnit <> 99 */ - public function testPHPUnitVersionOperatorNotEquals() + public function testPHPUnitVersionOperatorNotEquals(): void { } /** * @requires PHPUnit >=99 */ - public function testPHPUnitVersionOperatorNoSpace() + public function testPHPUnitVersionOperatorNoSpace(): void { } /** * @requires extension testExtOne < 1.0 */ - public function testExtensionVersionOperatorLessThan() + public function testExtensionVersionOperatorLessThan(): void { } /** * @requires extension testExtOne <= 1.0 */ - public function testExtensionVersionOperatorLessThanEquals() + public function testExtensionVersionOperatorLessThanEquals(): void { } /** * @requires extension testExtOne > 99 */ - public function testExtensionVersionOperatorGreaterThan() + public function testExtensionVersionOperatorGreaterThan(): void { } /** * @requires extension testExtOne >= 99 */ - public function testExtensionVersionOperatorGreaterThanEquals() + public function testExtensionVersionOperatorGreaterThanEquals(): void { } /** * @requires extension testExtOne = 1.0 */ - public function testExtensionVersionOperatorEquals() + public function testExtensionVersionOperatorEquals(): void { } /** * @requires extension testExtOne == 1.0 */ - public function testExtensionVersionOperatorDoubleEquals() + public function testExtensionVersionOperatorDoubleEquals(): void { } /** * @requires extension testExtOne != 99 */ - public function testExtensionVersionOperatorBangEquals() + public function testExtensionVersionOperatorBangEquals(): void { } /** * @requires extension testExtOne <> 99 */ - public function testExtensionVersionOperatorNotEquals() + public function testExtensionVersionOperatorNotEquals(): void { } /** * @requires extension testExtOne >=99 */ - public function testExtensionVersionOperatorNoSpace() + public function testExtensionVersionOperatorNoSpace(): void { } @@ -366,7 +366,7 @@ public function testExtensionVersionOperatorNoSpace() * @requires PHP ~1.0 * @requires PHPUnit ~2.0 */ - public function testVersionConstraintTildeMajor() + public function testVersionConstraintTildeMajor(): void { } @@ -374,7 +374,7 @@ public function testVersionConstraintTildeMajor() * @requires PHP ^1.0 * @requires PHPUnit ^2.0 */ - public function testVersionConstraintCaretMajor() + public function testVersionConstraintCaretMajor(): void { } @@ -382,7 +382,7 @@ public function testVersionConstraintCaretMajor() * @requires PHP ~3.4.7 * @requires PHPUnit ~4.7.1 */ - public function testVersionConstraintTildeMinor() + public function testVersionConstraintTildeMinor(): void { } @@ -390,7 +390,7 @@ public function testVersionConstraintTildeMinor() * @requires PHP ^7.0.17 * @requires PHPUnit ^4.7.1 */ - public function testVersionConstraintCaretMinor() + public function testVersionConstraintCaretMinor(): void { } @@ -398,7 +398,7 @@ public function testVersionConstraintCaretMinor() * @requires PHP ^5.6 || ^7.0 * @requires PHPUnit ^5.0 || ^6.0 */ - public function testVersionConstraintCaretOr() + public function testVersionConstraintCaretOr(): void { } @@ -406,7 +406,7 @@ public function testVersionConstraintCaretOr() * @requires PHP ~5.6.22 || ~7.0.17 * @requires PHPUnit ^5.0.5 || ^6.0.6 */ - public function testVersionConstraintTildeOr() + public function testVersionConstraintTildeOr(): void { } @@ -414,7 +414,7 @@ public function testVersionConstraintTildeOr() * @requires PHP ~5.6.22 || ^7.0 * @requires PHPUnit ~5.6.22 || ^7.0 */ - public function testVersionConstraintTildeOrCaret() + public function testVersionConstraintTildeOrCaret(): void { } @@ -422,7 +422,7 @@ public function testVersionConstraintTildeOrCaret() * @requires PHP ^5.6 || ~7.0.17 * @requires PHPUnit ^5.6 || ~7.0.17 */ - public function testVersionConstraintCaretOrTilde() + public function testVersionConstraintCaretOrTilde(): void { } @@ -430,28 +430,28 @@ public function testVersionConstraintCaretOrTilde() * @requires PHP ~5.6.22 || ~7.0.17 * @requires PHPUnit ~5.6.22 || ~7.0.17 */ - public function testVersionConstraintRegexpIgnoresWhitespace() + public function testVersionConstraintRegexpIgnoresWhitespace(): void { } /** * @requires PHP ~^12345 */ - public function testVersionConstraintInvalidPhpConstraint() + public function testVersionConstraintInvalidPhpConstraint(): void { } /** * @requires PHPUnit ~^12345 */ - public function testVersionConstraintInvalidPhpUnitConstraint() + public function testVersionConstraintInvalidPhpUnitConstraint(): void { } /** * @requires setting display_errors On */ - public function testSettingDisplayErrorsOn() + public function testSettingDisplayErrorsOn(): void { } } diff --git a/tests/_files/SampleArrayAccess.php b/tests/_files/SampleArrayAccess.php index 85fae0cda89..3bd6501ed46 100644 --- a/tests/_files/SampleArrayAccess.php +++ b/tests/_files/SampleArrayAccess.php @@ -16,7 +16,7 @@ public function __construct() $this->container = []; } - public function offsetSet($offset, $value) + public function offsetSet($offset, $value): void { if (\is_null($offset)) { $this->container[] = $value; @@ -30,7 +30,7 @@ public function offsetExists($offset) return isset($this->container[$offset]); } - public function offsetUnset($offset) + public function offsetUnset($offset): void { unset($this->container[$offset]); } diff --git a/tests/_files/StackTest.php b/tests/_files/StackTest.php index 7344d03dd2d..76537d93747 100644 --- a/tests/_files/StackTest.php +++ b/tests/_files/StackTest.php @@ -26,7 +26,7 @@ public function testPush() /** * @depends testPush */ - public function testPop(array $stack) + public function testPop(array $stack): void { $this->assertEquals('foo', \array_pop($stack)); $this->assertCount(0, $stack); diff --git a/tests/_files/StatusTest.php b/tests/_files/StatusTest.php index 0683e806320..8f891dffc1d 100644 --- a/tests/_files/StatusTest.php +++ b/tests/_files/StatusTest.php @@ -14,36 +14,36 @@ class StatusTest extends TestCase { - public function testSuccess() + public function testSuccess(): void { $this->assertTrue(true); } - public function testFailure() + public function testFailure(): void { $this->assertTrue(false); } - public function testError() + public function testError(): void { throw new \RuntimeException; } - public function testIncomplete() + public function testIncomplete(): void { $this->markTestIncomplete(); } - public function testSkipped() + public function testSkipped(): void { $this->markTestSkipped(); } - public function testRisky() + public function testRisky(): void { } - public function testWarning() + public function testWarning(): void { throw new Warning; } diff --git a/tests/_files/StopsOnWarningTest.php b/tests/_files/StopsOnWarningTest.php index fa15892a795..2018d059dc9 100644 --- a/tests/_files/StopsOnWarningTest.php +++ b/tests/_files/StopsOnWarningTest.php @@ -11,7 +11,7 @@ class StopsOnWarningTest extends TestCase { - public function testOne() + public function testOne(): void { } } diff --git a/tests/_files/Success.php b/tests/_files/Success.php index 0352e233b0c..14c2ff92146 100644 --- a/tests/_files/Success.php +++ b/tests/_files/Success.php @@ -11,7 +11,7 @@ class Success extends TestCase { - protected function runTest() + protected function runTest(): void { $this->assertTrue(true); } diff --git a/tests/_files/TemplateMethodsTest.php b/tests/_files/TemplateMethodsTest.php index 42a7e658aae..c2f68b4c5e1 100644 --- a/tests/_files/TemplateMethodsTest.php +++ b/tests/_files/TemplateMethodsTest.php @@ -31,29 +31,29 @@ protected function tearDown(): void print __METHOD__ . "\n"; } - public function testOne() + public function testOne(): void { print __METHOD__ . "\n"; $this->assertTrue(true); } - public function testTwo() + public function testTwo(): void { print __METHOD__ . "\n"; $this->assertTrue(false); } - protected function assertPreConditions() + protected function assertPreConditions(): void { print __METHOD__ . "\n"; } - protected function assertPostConditions() + protected function assertPostConditions(): void { print __METHOD__ . "\n"; } - protected function onNotSuccessfulTest(Throwable $t) + protected function onNotSuccessfulTest(Throwable $t): void { print __METHOD__ . "\n"; diff --git a/tests/_files/TestAutoreferenced.php b/tests/_files/TestAutoreferenced.php index 25ef9b67b10..280d73c9f02 100644 --- a/tests/_files/TestAutoreferenced.php +++ b/tests/_files/TestAutoreferenced.php @@ -13,7 +13,7 @@ class TestAutoreferenced extends TestCase { public $myTestData; - public function testJsonEncodeException($data) + public function testJsonEncodeException($data): void { $this->myTestData = $data; } diff --git a/tests/_files/TestDoxGroupTest.php b/tests/_files/TestDoxGroupTest.php index a6526e10b93..4ad06293a4d 100644 --- a/tests/_files/TestDoxGroupTest.php +++ b/tests/_files/TestDoxGroupTest.php @@ -14,7 +14,7 @@ class TestDoxGroupTest extends TestCase /** * @group one */ - public function testOne() + public function testOne(): void { $this->assertTrue(true); } @@ -22,7 +22,7 @@ public function testOne() /** * @group two */ - public function testTwo() + public function testTwo(): void { $this->assertTrue(true); } diff --git a/tests/_files/TestIncomplete.php b/tests/_files/TestIncomplete.php index 9cd5fd8a43a..3ae44f3082e 100644 --- a/tests/_files/TestIncomplete.php +++ b/tests/_files/TestIncomplete.php @@ -11,7 +11,7 @@ class TestIncomplete extends TestCase { - protected function runTest() + protected function runTest(): void { $this->markTestIncomplete('Incomplete test'); } diff --git a/tests/_files/TestIterator.php b/tests/_files/TestIterator.php index 64ecdbbf050..23eee3f045f 100644 --- a/tests/_files/TestIterator.php +++ b/tests/_files/TestIterator.php @@ -17,7 +17,7 @@ public function __construct($array = []) $this->array = $array; } - public function rewind() + public function rewind(): void { $this->position = 0; } @@ -37,7 +37,7 @@ public function current() return $this->array[$this->position]; } - public function next() + public function next(): void { $this->position++; } diff --git a/tests/_files/TestIterator2.php b/tests/_files/TestIterator2.php index 4c230a02196..676141e7eba 100644 --- a/tests/_files/TestIterator2.php +++ b/tests/_files/TestIterator2.php @@ -21,7 +21,7 @@ public function current() return \current($this->data); } - public function next() + public function next(): void { \next($this->data); } @@ -36,7 +36,7 @@ public function valid() return \key($this->data) !== null; } - public function rewind() + public function rewind(): void { \reset($this->data); } diff --git a/tests/_files/TestSkipped.php b/tests/_files/TestSkipped.php index c1369860e82..00bab2be0ce 100644 --- a/tests/_files/TestSkipped.php +++ b/tests/_files/TestSkipped.php @@ -11,7 +11,7 @@ class TestSkipped extends TestCase { - protected function runTest() + protected function runTest(): void { $this->markTestSkipped('Skipped test'); } diff --git a/tests/_files/TestTestError.php b/tests/_files/TestTestError.php index 38fa16f4ab3..92f6c9b6337 100644 --- a/tests/_files/TestTestError.php +++ b/tests/_files/TestTestError.php @@ -11,7 +11,7 @@ class TestError extends TestCase { - protected function runTest() + protected function runTest(): void { throw new Exception; } diff --git a/tests/_files/TestWithTest.php b/tests/_files/TestWithTest.php index be910157527..7806c804c5d 100644 --- a/tests/_files/TestWithTest.php +++ b/tests/_files/TestWithTest.php @@ -31,7 +31,7 @@ public static function providerMethod() * @param mixed $b * @param mixed $c */ - public function testAdd($a, $b, $c) + public function testAdd($a, $b, $c): void { $this->assertEquals($c, $a + $b); } diff --git a/tests/_files/ThrowExceptionTestCase.php b/tests/_files/ThrowExceptionTestCase.php index 92a4ed596dc..203750b5d2f 100644 --- a/tests/_files/ThrowExceptionTestCase.php +++ b/tests/_files/ThrowExceptionTestCase.php @@ -11,7 +11,7 @@ class ThrowExceptionTestCase extends TestCase { - public function test() + public function test(): void { throw new RuntimeException('A runtime error occurred'); } diff --git a/tests/_files/ThrowNoExceptionTestCase.php b/tests/_files/ThrowNoExceptionTestCase.php index 978c413e7ec..a759f3279cf 100644 --- a/tests/_files/ThrowNoExceptionTestCase.php +++ b/tests/_files/ThrowNoExceptionTestCase.php @@ -11,7 +11,7 @@ class ThrowNoExceptionTestCase extends TestCase { - public function test() + public function test(): void { } } diff --git a/tests/_files/VariousIterableDataProviderTest.php b/tests/_files/VariousIterableDataProviderTest.php index c6fb23f9f7a..bff499e1feb 100644 --- a/tests/_files/VariousIterableDataProviderTest.php +++ b/tests/_files/VariousIterableDataProviderTest.php @@ -41,7 +41,7 @@ public static function asTraversableProvider() * @dataProvider asIteratorProvider * @dataProvider asTraversableProvider */ - public function test() + public function test(): void { } } diff --git a/tests/_files/WasRun.php b/tests/_files/WasRun.php index 25c37d4e160..ea3d057afb3 100644 --- a/tests/_files/WasRun.php +++ b/tests/_files/WasRun.php @@ -13,7 +13,7 @@ class WasRun extends TestCase { public $wasRun = false; - protected function runTest() + protected function runTest(): void { $this->wasRun = true; } diff --git a/tests/_files/phpunit-example-extension/tests/OneTest.php b/tests/_files/phpunit-example-extension/tests/OneTest.php index 4df480bf8c2..dc61f99dc23 100644 --- a/tests/_files/phpunit-example-extension/tests/OneTest.php +++ b/tests/_files/phpunit-example-extension/tests/OneTest.php @@ -14,7 +14,7 @@ class OneTest extends TestCase { use TestCaseTrait; - public function testOne() + public function testOne(): void { $this->assertTrue(true); } From 37d1e9add1e262704c23e3eb71339b6ac797e04a Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 10:09:06 +0200 Subject: [PATCH 24/28] WIP --- tests/bootstrap.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index b60f0767f6d..dd9e941ab55 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -16,7 +16,7 @@ require_once __DIR__ . '/../vendor/autoload.php'; -// TODO: Figure out why (some of) these are required (the classes should be autoloaded instead) +// TODO: Figure out why these are required (the classes should be autoloaded instead) require_once TEST_FILES_PATH . 'BeforeAndAfterTest.php'; require_once TEST_FILES_PATH . 'BeforeClassAndAfterClassTest.php'; @@ -48,9 +48,3 @@ require_once TEST_FILES_PATH . 'NoArgTestCaseTest.php'; require_once TEST_FILES_PATH . 'Singleton.php'; - -require_once TEST_FILES_PATH . 'Mockable.php'; - -require_once TEST_FILES_PATH . 'CoverageNamespacedFunctionTest.php'; - -require_once TEST_FILES_PATH . 'NamespaceCoveredFunction.php'; From 0b4ffc52e06d2cc40968e8184732411fec1e75da Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 17 Apr 2018 14:09:23 +0200 Subject: [PATCH 25/28] Add configuration for probot-stale --- .github/stale.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000000..ad14f6c48d6 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,47 @@ +# Configuration for probot-stale - https://github.com/probot/stale + +# Number of days of inactivity before an Issue or Pull Request becomes stale +daysUntilStale: 60 + +# Number of days of inactivity before a stale Issue or Pull Request is closed. +# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. +daysUntilClose: 7 + +# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable +exemptLabels: + - blocked + - enhancement + - backward-compatibility-break + - feature-removal + - php-support-removal + - process + - rfc + - refactoring + +# Set to true to ignore issues in a project (defaults to false) +exemptProjects: false + +# Set to true to ignore issues in a milestone (defaults to false) +exemptMilestones: false + +# Label to use when marking as stale +staleLabel: stale + +# Comment to post when marking as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had activity within the last 60 days. It will be closed after 7 days if no further activity occurs. Thank you for your contributions. + +# Comment to post when removing the stale label. +# unmarkComment: > +# Your comment here. + +# Comment to post when closing a stale Issue or Pull Request. +closeComment: > + This issue has been automatically closed because it has not had activity since it was marked as stale. Thank you for your contributions. + +# Limit the number of actions per hour, from 1-30. Default is 30 +limitPerRun: 30 + +# Limit to only `issues` or `pulls` +only: issues + From 6cc15b4fe1e828a12280e8456df81960ea26e7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20Rumi=C5=84ski?= Date: Tue, 17 Apr 2018 14:53:39 +0200 Subject: [PATCH 26/28] DX: PHP CS Fixer default finder is looking for .php by default, no need to claim it again --- .php_cs.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/.php_cs.dist b/.php_cs.dist index 6562c955a9b..3b3c086a060 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -165,6 +165,5 @@ return PhpCsFixer\Config::create() ->in(__DIR__ . '/build') ->in(__DIR__ . '/src') ->in(__DIR__ . '/tests') - ->name('*.php') ->notName('*.phpt') ); From fbdbf6f969ac622a206d065ef741a389a76a593c Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Wed, 18 Apr 2018 14:50:28 +0200 Subject: [PATCH 27/28] Allow sebastian/comparator ^3.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 712aca97614..b13338cb2bd 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.0", "phpunit/phpunit-mock-objects": "^6.1.1", - "sebastian/comparator": "^2.1", + "sebastian/comparator": "^2.1 || ^3.0", "sebastian/diff": "^3.0", "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", From 6d51299e307dc510149e0b7cd1931dd11770e1cb Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Wed, 18 Apr 2018 15:41:53 +0200 Subject: [PATCH 28/28] Prepare release --- ChangeLog-7.1.md | 2 +- src/Runner/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md index c1db2e6f5b8..2ce48de87de 100644 --- a/ChangeLog-7.1.md +++ b/ChangeLog-7.1.md @@ -2,7 +2,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. -## [7.1.4] - 2018-MM-DD +## [7.1.4] - 2018-04-18 ### Fixed diff --git a/src/Runner/Version.php b/src/Runner/Version.php index 6dfc3a239ec..5f946718b8e 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -30,7 +30,7 @@ public static function id(): string } if (self::$version === null) { - $version = new VersionId('7.1.3', \dirname(__DIR__, 2)); + $version = new VersionId('7.1.4', \dirname(__DIR__, 2)); self::$version = $version->getVersion(); }