From 43359ffda62d9225165afda6db1442750ba44b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 29 Jan 2024 13:33:31 +0100 Subject: [PATCH] Enhancement: Add support for PHP 7.3 --- .github/settings.yml | 6 + .github/workflows/integrate.yaml | 11 +- .php-cs-fixer.php | 2 +- CHANGELOG.md | 5 + composer.json | 6 +- composer.lock | 107 +++--------- psalm-baseline.xml | 36 ++++ rector.php | 4 +- test/DataProvider/AbstractProvider.php | 85 ++++++++++ test/DataProvider/Exception/EmptyValues.php | 30 ++++ test/DataProvider/IntProvider.php | 104 ++++++++++++ test/DataProvider/StringProvider.php | 173 ++++++++++++++++++++ test/Unit/Attribute/MaximumDurationTest.php | 5 +- test/Unit/Console/ColorTest.php | 5 +- test/Unit/CountTest.php | 7 +- test/Unit/DurationTest.php | 9 +- test/Unit/PhaseIdentifierTest.php | 5 +- test/Unit/TestIdentifierTest.php | 5 +- test/Unit/Version/MajorTest.php | 7 +- test/Unit/Version/SeriesTest.php | 3 +- 20 files changed, 497 insertions(+), 118 deletions(-) create mode 100644 test/DataProvider/AbstractProvider.php create mode 100644 test/DataProvider/Exception/EmptyValues.php create mode 100644 test/DataProvider/IntProvider.php create mode 100644 test/DataProvider/StringProvider.php diff --git a/.github/settings.yml b/.github/settings.yml index 8d0d2439..2dbe0eeb 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -21,8 +21,12 @@ branches: - context: "Refactoring (7.4, locked)" - context: "Security Analysis (7.4, locked)" - context: "Static Code Analysis (7.4, locked)" + - context: "Tests (7.5.0, 7.3, highest)" + - context: "Tests (7.5.0, 7.3, lowest)" - context: "Tests (7.5.0, 7.4, highest)" - context: "Tests (7.5.0, 7.4, lowest)" + - context: "Tests (8.5.19, 7.3, highest)" + - context: "Tests (8.5.19, 7.3, lowest)" - context: "Tests (8.5.19, 7.4, highest)" - context: "Tests (8.5.19, 7.4, lowest)" - context: "Tests (8.5.19, 8.0, highest)" @@ -33,6 +37,8 @@ branches: - context: "Tests (8.5.19, 8.2, lowest)" - context: "Tests (8.5.19, 8.3, highest)" - context: "Tests (8.5.19, 8.3, lowest)" + - context: "Tests (9.0.0, 7.3, highest)" + - context: "Tests (9.0.0, 7.3, lowest)" - context: "Tests (9.0.0, 7.4, highest)" - context: "Tests (9.0.0, 7.4, lowest)" - context: "Tests (9.0.0, 8.0, highest)" diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 6d590cc2..cc94e6c2 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -461,6 +461,7 @@ jobs: - "9.0.0" php-version: + - "7.3" - "7.4" - "8.0" - "8.1" @@ -472,6 +473,14 @@ jobs: - "highest" include: + - phpunit-version: "7.5.0" + php-version: "7.3" + dependencies: "lowest" + + - phpunit-version: "7.5.0" + php-version: "7.3" + dependencies: "highest" + - phpunit-version: "7.5.0" php-version: "7.4" dependencies: "lowest" @@ -555,7 +564,7 @@ jobs: - name: "Remove incompatible dependencies with composer" if: "matrix.dependencies != 'locked'" - run: "composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress" + run: "composer remove ergebnis/composer-normalize ergebnis/license ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress" - name: "Remove platform configuration with composer" if: "matrix.dependencies != 'locked'" diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index d0ecd799..bb6d0272 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -26,7 +26,7 @@ $license->save(); -$ruleSet = PhpCsFixer\Config\RuleSet\Php74::create() +$ruleSet = PhpCsFixer\Config\RuleSet\Php73::create() ->withHeader($license->header()) ->withRules(PhpCsFixer\Config\Rules::fromArray([ 'mb_str_functions' => false, diff --git a/CHANGELOG.md b/CHANGELOG.md index adb874eb..4758df19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`2.10.0...main`][2.10.0...main]. +### Changed + +- Added support for PHP 7.3 ([#476]), by [@localheinz] + ## [`2.10.0`][2.10.0] For a full diff see [`2.9.0...2.10.0`][2.9.0...2.10.0]. @@ -276,6 +280,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0]. [#396]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/396 [#447]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/447 [#448]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/448 +[#476]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/476 [#485]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/485 [#491]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/491 [#494]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/494 diff --git a/composer.json b/composer.json index 17bbdb7b..559c7370 100644 --- a/composer.json +++ b/composer.json @@ -24,16 +24,16 @@ "security": "https://github.com/ergebnis/phpunit-slow-test-detector/blob/main/.github/SECURITY.md" }, "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "phpunit/phpunit": "^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0 || ^11.0.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.42.0", - "ergebnis/data-provider": "^3.2.0", "ergebnis/license": "^2.4.0", "ergebnis/php-cs-fixer-config": "^6.22.0", - "fakerphp/faker": "^1.23.1", + "fakerphp/faker": "^1.20.0", "psalm/plugin-phpunit": "~0.18.4", + "psr/container": "~1.0.0", "rector/rector": "^1.0.1", "vimeo/psalm": "^5.22.2" }, diff --git a/composer.lock b/composer.lock index bab662e6..86629027 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d345174f6d06c6add2c366b1cf7acaeb", + "content-hash": "e4986c4880b3642694ca7e5ac1a3b665", "packages": [ { "name": "doctrine/instantiator", @@ -2358,69 +2358,6 @@ }, "time": "2024-01-30T11:54:02+00:00" }, - { - "name": "ergebnis/data-provider", - "version": "3.2.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/data-provider.git", - "reference": "e2b0b79b833f5a5799f2ee52ebc8e08e8d52f9eb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/data-provider/zipball/e2b0b79b833f5a5799f2ee52ebc8e08e8d52f9eb", - "reference": "e2b0b79b833f5a5799f2ee52ebc8e08e8d52f9eb", - "shasum": "" - }, - "require": { - "fakerphp/faker": "^1.21.0", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.28.3", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.13.0", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.13", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.11", - "vimeo/psalm": "^5.16.0" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\DataProvider\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides generic data providers for use with phpunit/phpunit.", - "homepage": "https://github.com/ergebnis/data-provider", - "keywords": [ - "data-provider", - "phpunit" - ], - "support": { - "issues": "https://github.com/ergebnis/data-provider/issues", - "source": "https://github.com/ergebnis/data-provider" - }, - "time": "2023-11-30T17:30:28+00:00" - }, { "name": "ergebnis/json", "version": "1.2.0", @@ -2948,20 +2885,20 @@ }, { "name": "fakerphp/faker", - "version": "v1.23.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b", + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0", + "php": "^7.1 || ^8.0", "psr/container": "^1.0 || ^2.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" }, @@ -2972,8 +2909,7 @@ "bamarni/composer-bin-plugin": "^1.4.1", "doctrine/persistence": "^1.3 || ^2.0", "ext-intl": "*", - "phpunit/phpunit": "^9.5.26", - "symfony/phpunit-bridge": "^5.4.16" + "symfony/phpunit-bridge": "^4.4 || ^5.2" }, "suggest": { "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", @@ -2983,6 +2919,11 @@ "ext-mbstring": "Required for multibyte Unicode string functionality." }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "v1.20-dev" + } + }, "autoload": { "psr-4": { "Faker\\": "src/Faker/" @@ -3005,9 +2946,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + "source": "https://github.com/FakerPHP/Faker/tree/v1.20.0" }, - "time": "2024-01-02T13:46:09+00:00" + "time": "2022-07-20T13:12:54+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -3828,25 +3769,25 @@ }, { "name": "psr/container", - "version": "2.0.2", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", "shasum": "" }, "require": { - "php": ">=7.4.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -3861,7 +3802,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "http://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -3875,9 +3816,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/2.0.2" + "source": "https://github.com/php-fig/container/tree/master" }, - "time": "2021-11-05T16:47:00+00:00" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/event-dispatcher", @@ -5621,7 +5562,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": [], "platform-overrides": { diff --git a/psalm-baseline.xml b/psalm-baseline.xml index f5ef09e1..b7920710 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -60,6 +60,42 @@ + + + + + + + + ]]> + ]]> + ]]> + ]]> + ]]> + ]]> + ]]> + + + + + + + + + + ]]> + ]]> + ]]> + ]]> + ]]> + ]]> + + + + + + + diff --git a/rector.php b/rector.php index 55be202e..a3730081 100644 --- a/rector.php +++ b/rector.php @@ -18,12 +18,10 @@ return static function (Config\RectorConfig $rectorConfig): void { $rectorConfig->cacheDirectory(__DIR__ . '/.build/rector/'); - $rectorConfig->import(__DIR__ . '/vendor/fakerphp/faker/rector-migrate.php'); - $rectorConfig->paths([ __DIR__ . '/src/', __DIR__ . '/test/', ]); - $rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_74); + $rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_73); }; diff --git a/test/DataProvider/AbstractProvider.php b/test/DataProvider/AbstractProvider.php new file mode 100644 index 00000000..0b1d7a3d --- /dev/null +++ b/test/DataProvider/AbstractProvider.php @@ -0,0 +1,85 @@ + $fakers + */ + static $fakers = []; + + if (!\array_key_exists($locale, $fakers)) { + $faker = Factory::create($locale); + + $faker->seed(9001); + + $fakers[$locale] = $faker; + } + + return $fakers[$locale]; + } + + /** + * @param array $values + * + * @throws Exception\EmptyValues + * + * @return \Generator + */ + final protected static function provideDataForValues(array $values): \Generator + { + if ([] === $values) { + throw Exception\EmptyValues::create(); + } + + foreach ($values as $key => $value) { + yield $key => [ + $value, + ]; + } + } + + /** + * @param array $values + * + * @throws Exception\EmptyValues + * + * @return \Generator + */ + final protected static function provideDataForValuesWhere(array $values, \Closure $test): \Generator + { + if ([] === $values) { + throw Exception\EmptyValues::create(); + } + + $filtered = \array_filter($values, static function ($value) use ($test): bool { + return true === $test($value); + }); + + if ([] === $filtered) { + throw Exception\EmptyValues::filtered(); + } + + yield from self::provideDataForValues($filtered); + } +} diff --git a/test/DataProvider/Exception/EmptyValues.php b/test/DataProvider/Exception/EmptyValues.php new file mode 100644 index 00000000..7e93ad7b --- /dev/null +++ b/test/DataProvider/Exception/EmptyValues.php @@ -0,0 +1,30 @@ + + */ + public static function arbitrary(): \Generator + { + yield from self::provideDataForValues(self::values()); + } + + /** + * @return \Generator + */ + public static function lessThanZero(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (int $value): bool { + return 0 > $value; + }); + } + + /** + * @return \Generator + */ + public static function zero(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (int $value): bool { + return 0 === $value; + }); + } + + /** + * @return \Generator + */ + public static function greaterThanZero(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (int $value): bool { + return 0 < $value; + }); + } + + /** + * @return \Generator + */ + public static function lessThanOne(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (int $value): bool { + return 1 > $value; + }); + } + + /** + * @return \Generator + */ + public static function one(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (int $value): bool { + return 1 === $value; + }); + } + + /** + * @return \Generator + */ + public static function greaterThanOne(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (int $value): bool { + return 1 < $value; + }); + } + + /** + * @return array + */ + private static function values(): array + { + $faker = self::faker(); + + return [ + 'int-less-than-minus-one' => -1 * $faker->numberBetween(1), + 'int-minus-one' => -1, + 'int-zero' => 0, + 'int-plus-one' => 1, + 'int-greater-than-plus-one' => $faker->numberBetween(1), + ]; + } +} diff --git a/test/DataProvider/StringProvider.php b/test/DataProvider/StringProvider.php new file mode 100644 index 00000000..581f4101 --- /dev/null +++ b/test/DataProvider/StringProvider.php @@ -0,0 +1,173 @@ + + */ + public static function arbitrary(): \Generator + { + yield from self::provideDataForValues(self::values()); + } + + /** + * @return \Generator + */ + public static function blank(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (string $value): bool { + return '' === \trim($value) + && '' !== $value; + }); + } + + /** + * @return \Generator + */ + public static function empty(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (string $value): bool { + return '' === $value; + }); + } + + /** + * @return \Generator + */ + public static function trimmed(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (string $value): bool { + return \trim($value) === $value + && '' !== \trim($value); + }); + } + + /** + * @return \Generator + */ + public static function untrimmed(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (string $value): bool { + return \trim($value) !== $value + && '' !== \trim($value); + }); + } + + /** + * @return \Generator + */ + public static function withWhitespace(): \Generator + { + yield from self::provideDataForValuesWhere(self::values(), static function (string $value): bool { + return \trim($value) === $value + && 1 === \preg_match('/\s/', $value); + }); + } + + /** + * @return array + */ + private static function values(): array + { + $faker = self::faker(); + + $arbitraryValues = [ + 'string-arbitrary-sentence' => $faker->sentence(), + 'string-arbitrary-word' => $faker->word(), + ]; + + $whitespaceCharacters = self::whitespaceCharacters(); + + $blankValues = \array_combine( + \array_map(static function (string $key): string { + return \sprintf( + 'string-blank-%s', + $key, + ); + }, \array_keys($whitespaceCharacters)), + $whitespaceCharacters, + ); + + $emptyValues = [ + 'string-empty' => '', + ]; + + $untrimmedValues = \array_combine( + \array_map(static function (string $key): string { + return \sprintf( + 'string-untrimmed-%s', + $key, + ); + }, \array_keys($whitespaceCharacters)), + \array_map(static function (string $whitespaceCharacter) use ($faker): string { + return \sprintf( + '%s%s%s', + \str_repeat( + $whitespaceCharacter, + $faker->numberBetween(1, 5), + ), + $faker->word(), + \str_repeat( + $whitespaceCharacter, + $faker->numberBetween(1, 5), + ), + ); + }, $whitespaceCharacters), + ); + + $withWhitespaceValues = \array_combine( + \array_map(static function (string $key): string { + return \sprintf( + 'string-with-whitespace-%s', + $key, + ); + }, \array_keys($whitespaceCharacters)), + \array_map(static function (string $whitespaceCharacter) use ($faker): string { + /** @var list $words */ + $words = $faker->words($faker->numberBetween(2, 5)); + + return \implode( + $whitespaceCharacter, + $words, + ); + }, $whitespaceCharacters), + ); + + return \array_merge( + $arbitraryValues, + $blankValues, + $emptyValues, + $untrimmedValues, + $withWhitespaceValues, + ); + } + + /** + * @return array + */ + private static function whitespaceCharacters(): array + { + return [ + 'carriage-return' => "\r", + 'line-feed' => "\n", + 'space' => ' ', + 'tab' => "\t", + ]; + } +} diff --git a/test/Unit/Attribute/MaximumDurationTest.php b/test/Unit/Attribute/MaximumDurationTest.php index f42edf58..ae2706d6 100644 --- a/test/Unit/Attribute/MaximumDurationTest.php +++ b/test/Unit/Attribute/MaximumDurationTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit\Attribute; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Attribute; use Ergebnis\PHPUnit\SlowTestDetector\Exception; use Ergebnis\PHPUnit\SlowTestDetector\Test; @@ -29,8 +28,8 @@ final class MaximumDurationTest extends Framework\TestCase use Test\Util\Helper; /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::lessThanZero - * @dataProvider \Ergebnis\DataProvider\IntProvider::zero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::lessThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::zero */ public function testConstructorRejectsInvalidValue(int $milliseconds): void { diff --git a/test/Unit/Console/ColorTest.php b/test/Unit/Console/ColorTest.php index 65b71f9f..8b595639 100644 --- a/test/Unit/Console/ColorTest.php +++ b/test/Unit/Console/ColorTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit\Console; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Console; use Ergebnis\PHPUnit\SlowTestDetector\Test; use PHPUnit\Framework; @@ -26,8 +25,8 @@ final class ColorTest extends Framework\TestCase use Test\Util\Helper; /** - * @dataProvider \Ergebnis\DataProvider\StringProvider::blank - * @dataProvider \Ergebnis\DataProvider\StringProvider::empty + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::blank + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::empty */ public function testDimReturnsOriginalStringWhenItIsWhitespaceOnly(string $output): void { diff --git a/test/Unit/CountTest.php b/test/Unit/CountTest.php index fa98414d..9ef4e1be 100644 --- a/test/Unit/CountTest.php +++ b/test/Unit/CountTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Count; use Ergebnis\PHPUnit\SlowTestDetector\Exception; use PHPUnit\Framework; @@ -26,8 +25,8 @@ final class CountTest extends Framework\TestCase { /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::lessThanZero - * @dataProvider \Ergebnis\DataProvider\IntProvider::zero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::lessThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::zero */ public function testFromIntRejectsInvalidValue(int $value): void { @@ -37,7 +36,7 @@ public function testFromIntRejectsInvalidValue(int $value): void } /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::greaterThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::greaterThanZero */ public function testFromIntReturnsCount(int $value): void { diff --git a/test/Unit/DurationTest.php b/test/Unit/DurationTest.php index 03b8ac30..ffe1c0a5 100644 --- a/test/Unit/DurationTest.php +++ b/test/Unit/DurationTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Duration; use Ergebnis\PHPUnit\SlowTestDetector\Exception; use Ergebnis\PHPUnit\SlowTestDetector\Test; @@ -31,7 +30,7 @@ final class DurationTest extends Framework\TestCase use Test\Util\Helper; /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::lessThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::lessThanZero */ public function testFromSecondsAndNanosecondsRejectsSecondsLessThanZero(int $seconds): void { @@ -46,7 +45,7 @@ public function testFromSecondsAndNanosecondsRejectsSecondsLessThanZero(int $sec } /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::lessThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::lessThanZero */ public function testFromSecondsAndNanosecondsRejectsNanosecondsLessThanZero(int $nanoseconds): void { @@ -61,7 +60,7 @@ public function testFromSecondsAndNanosecondsRejectsNanosecondsLessThanZero(int } /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::greaterThanOne + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::greaterThanOne */ public function testFromSecondsAndNanosecondsRejectsNanosecondsGreaterThan999999999(int $offset): void { @@ -93,7 +92,7 @@ public function testFromSecondsAndNanosecondsReturnsDuration(): void } /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::lessThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::lessThanZero */ public function testFromMillisecondsRejectsInvalidValue(int $milliseconds): void { diff --git a/test/Unit/PhaseIdentifierTest.php b/test/Unit/PhaseIdentifierTest.php index 088e7af3..aa09d8ac 100644 --- a/test/Unit/PhaseIdentifierTest.php +++ b/test/Unit/PhaseIdentifierTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Exception; use Ergebnis\PHPUnit\SlowTestDetector\PhaseIdentifier; use Ergebnis\PHPUnit\SlowTestDetector\Test; @@ -29,8 +28,8 @@ final class PhaseIdentifierTest extends Framework\TestCase use Test\Util\Helper; /** - * @dataProvider \Ergebnis\DataProvider\StringProvider::blank - * @dataProvider \Ergebnis\DataProvider\StringProvider::empty + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::blank + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::empty */ public function testFromStringRejectsInvalidValue(string $value): void { diff --git a/test/Unit/TestIdentifierTest.php b/test/Unit/TestIdentifierTest.php index 5a2d0bce..72c47968 100644 --- a/test/Unit/TestIdentifierTest.php +++ b/test/Unit/TestIdentifierTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Exception; use Ergebnis\PHPUnit\SlowTestDetector\Test; use Ergebnis\PHPUnit\SlowTestDetector\TestIdentifier; @@ -29,8 +28,8 @@ final class TestIdentifierTest extends Framework\TestCase use Test\Util\Helper; /** - * @dataProvider \Ergebnis\DataProvider\StringProvider::blank - * @dataProvider \Ergebnis\DataProvider\StringProvider::empty + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::blank + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::empty */ public function testFromStringRejectsInvalidValue(string $value): void { diff --git a/test/Unit/Version/MajorTest.php b/test/Unit/Version/MajorTest.php index 3f6f1899..3c1c5e50 100644 --- a/test/Unit/Version/MajorTest.php +++ b/test/Unit/Version/MajorTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit\Version; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Test; use Ergebnis\PHPUnit\SlowTestDetector\Version; use PHPUnit\Framework; @@ -26,7 +25,7 @@ final class MajorTest extends Framework\TestCase use Test\Util\Helper; /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::lessThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::lessThanZero */ public function testFromIntRejectsInvalidValue(int $value): void { @@ -40,8 +39,8 @@ public function testFromIntRejectsInvalidValue(int $value): void } /** - * @dataProvider \Ergebnis\DataProvider\IntProvider::greaterThanZero - * @dataProvider \Ergebnis\DataProvider\IntProvider::zero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::greaterThanZero + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\IntProvider::zero */ public function testFromStringReturnsMajor(int $value): void { diff --git a/test/Unit/Version/SeriesTest.php b/test/Unit/Version/SeriesTest.php index 9164faa5..2b95c383 100644 --- a/test/Unit/Version/SeriesTest.php +++ b/test/Unit/Version/SeriesTest.php @@ -13,7 +13,6 @@ namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Unit\Version; -use Ergebnis\DataProvider; use Ergebnis\PHPUnit\SlowTestDetector\Test; use Ergebnis\PHPUnit\SlowTestDetector\Version; use PHPUnit\Framework; @@ -37,7 +36,7 @@ public function testCreateReturnsSeries(): void } /** - * @dataProvider \Ergebnis\DataProvider\StringProvider::arbitrary + * @dataProvider \Ergebnis\PHPUnit\SlowTestDetector\Test\DataProvider\StringProvider::arbitrary * @dataProvider provideInvalidValue */ public function testFromStringRejectsInvalidValue(string $value): void