From d81c73f7a0cc308c47306ca13b7c2e47fd605da2 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 19 Jun 2023 09:45:33 +0100 Subject: [PATCH] Bump to PHPUnit 10 (#26) --- .gitignore | 2 +- composer.json | 17 +++++------ phpunit.xml | 5 +++- rector.php | 1 + .../RemovePHPStormAnnotationFixerTest.php | 7 ++--- .../ArrayListItemNewlineFixerTest.php | 7 ++--- .../ArrayOpenerAndCloserNewlineFixerTest.php | 7 ++--- ...tandaloneLineInMultilineArrayFixerTest.php | 7 ++--- ...LineInMultilineArrayFixerTestPhp80Test.php | 7 ++--- .../ParamReturnAndVarTagMalformsFixerTest.php | 7 ++--- .../RemoveUselessDefaultCommentFixerTest.php | 7 ++--- .../ArrayLineLengthFixerTest.php | 7 ++--- .../ConfiguredLineLengthFixerTest.php | 7 ++--- .../Fixture/skip_correct_file.php.inc} | 0 .../LineLengthFixer/LineLengthFixerTest.php | 7 ++--- .../MethodChainingNewlineFixerTest.php | 7 ++--- .../SpaceAfterCommaHereNowDocFixerTest.php | 7 ++--- ...tructorParamFixerContraindicationsTest.php | 7 ++--- ...tandaloneLineConstructorParamFixerTest.php | 7 ++--- ...tandaloneLinePromotedPropertyFixerTest.php | 7 ++--- .../BlankLineAfterStrictTypesFixerTest.php | 7 ++--- tests/Issues/Fixture/correct973.php.inc | 24 --------------- tests/Issues/InlineArrayTest.php | 7 ++--- tests/Issues/Issue896Test.php | 29 ------------------- tests/Issues/Issue973Test.php | 29 ------------------- .../config/config_inline_long_array.php | 1 - tests/Issues/config/line_lenght_rule.php | 10 ------- 27 files changed, 65 insertions(+), 172 deletions(-) rename tests/{Issues/Fixture/correct896.php.inc => Fixer/LineLength/LineLengthFixer/Fixture/skip_correct_file.php.inc} (100%) delete mode 100644 tests/Issues/Fixture/correct973.php.inc delete mode 100644 tests/Issues/Issue896Test.php delete mode 100644 tests/Issues/Issue973Test.php delete mode 100644 tests/Issues/config/line_lenght_rule.php diff --git a/.gitignore b/.gitignore index 108b3ffde..8cb3953e4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ composer.lock -.phpunit.result.cache +.phpunit.cache diff --git a/composer.json b/composer.json index 9f60f99fa..73676647c 100644 --- a/composer.json +++ b/composer.json @@ -5,22 +5,21 @@ "require": { "php": ">=8.1", "nette/utils": "^3.2", - "friendsofphp/php-cs-fixer": "^3.13", + "friendsofphp/php-cs-fixer": "^3.18", "symplify/rule-doc-generator-contracts": "^11.1" }, "require-dev": { - "symplify/easy-coding-standard": "^11.1", - "symfony/framework-bundle": "6.1.*", + "symplify/easy-coding-standard": "^11.4", "squizlabs/php_codesniffer": "^3.7.1", - "phpunit/phpunit": "^9.5.26", + "phpunit/phpunit": "^10.2", "symplify/rule-doc-generator": "^11.1", "cweagans/composer-patches": "^1.7", "php-parallel-lint/php-parallel-lint": "^1.3", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9", - "rector/rector": "*", - "symplify/easy-ci": "^11.1", - "symplify/phpstan-extensions": "^11.1" + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "^1.10.19", + "rector/rector": "^0.17.1", + "symplify/easy-ci": "^11.2", + "symplify/phpstan-extensions": "^11.2" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index 1c2be343c..bb2ad05f1 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,10 @@ + tests diff --git a/rector.php b/rector.php index 723d8443e..8b8493338 100644 --- a/rector.php +++ b/rector.php @@ -18,6 +18,7 @@ SetList::PRIVATIZATION, SetList::EARLY_RETURN, PHPUnitSetList::PHPUNIT_CODE_QUALITY, + PHPUnitSetList::PHPUNIT_100, ]); $rectorConfig->paths([ diff --git a/tests/Fixer/Annotation/RemovePHPStormAnnotationFixer/RemovePHPStormAnnotationFixerTest.php b/tests/Fixer/Annotation/RemovePHPStormAnnotationFixer/RemovePHPStormAnnotationFixerTest.php index c61956c18..5addb0e5a 100644 --- a/tests/Fixer/Annotation/RemovePHPStormAnnotationFixer/RemovePHPStormAnnotationFixerTest.php +++ b/tests/Fixer/Annotation/RemovePHPStormAnnotationFixer/RemovePHPStormAnnotationFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Annotation\RemovePHPStormAnnotationFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class RemovePHPStormAnnotationFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/ArrayNotation/ArrayListItemNewlineFixer/ArrayListItemNewlineFixerTest.php b/tests/Fixer/ArrayNotation/ArrayListItemNewlineFixer/ArrayListItemNewlineFixerTest.php index a6f9cae65..687b8d725 100644 --- a/tests/Fixer/ArrayNotation/ArrayListItemNewlineFixer/ArrayListItemNewlineFixerTest.php +++ b/tests/Fixer/ArrayNotation/ArrayListItemNewlineFixer/ArrayListItemNewlineFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\ArrayListItemNewlineFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class ArrayListItemNewlineFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/ArrayNotation/ArrayOpenerAndCloserNewlineFixer/ArrayOpenerAndCloserNewlineFixerTest.php b/tests/Fixer/ArrayNotation/ArrayOpenerAndCloserNewlineFixer/ArrayOpenerAndCloserNewlineFixerTest.php index a4040f9f0..b7676274b 100644 --- a/tests/Fixer/ArrayNotation/ArrayOpenerAndCloserNewlineFixer/ArrayOpenerAndCloserNewlineFixerTest.php +++ b/tests/Fixer/ArrayNotation/ArrayOpenerAndCloserNewlineFixer/ArrayOpenerAndCloserNewlineFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class ArrayOpenerAndCloserNewlineFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTest.php b/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTest.php index a42fe63d5..cedacbe91 100644 --- a/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTest.php +++ b/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\StandaloneLineInMultilineArrayFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class StandaloneLineInMultilineArrayFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTestPhp80Test.php b/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTestPhp80Test.php index 46760c78a..f9d267818 100644 --- a/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTestPhp80Test.php +++ b/tests/Fixer/ArrayNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTestPhp80Test.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\StandaloneLineInMultilineArrayFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class StandaloneLineInMultilineArrayFixerTestPhp80Test extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/FixturePhp80'); } diff --git a/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php b/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php index a4c4925db..baa16e6f5 100644 --- a/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php +++ b/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php @@ -5,6 +5,7 @@ namespace Symplify\CodingStandard\Tests\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; /** @@ -12,15 +13,13 @@ */ final class ParamReturnAndVarTagMalformsFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/RemoveUselessDefaultCommentFixerTest.php b/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/RemoveUselessDefaultCommentFixerTest.php index 5014e58b5..894f7362e 100644 --- a/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/RemoveUselessDefaultCommentFixerTest.php +++ b/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/RemoveUselessDefaultCommentFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Commenting\RemoveUselessDefaultCommentFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class RemoveUselessDefaultCommentFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/LineLength/LineLengthFixer/ArrayLineLengthFixerTest.php b/tests/Fixer/LineLength/LineLengthFixer/ArrayLineLengthFixerTest.php index a8759a279..3a5df7ae3 100644 --- a/tests/Fixer/LineLength/LineLengthFixer/ArrayLineLengthFixerTest.php +++ b/tests/Fixer/LineLength/LineLengthFixer/ArrayLineLengthFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class ArrayLineLengthFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/FixtureArray'); } diff --git a/tests/Fixer/LineLength/LineLengthFixer/ConfiguredLineLengthFixerTest.php b/tests/Fixer/LineLength/LineLengthFixer/ConfiguredLineLengthFixerTest.php index a158dfc4a..0d08fed97 100644 --- a/tests/Fixer/LineLength/LineLengthFixer/ConfiguredLineLengthFixerTest.php +++ b/tests/Fixer/LineLength/LineLengthFixer/ConfiguredLineLengthFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class ConfiguredLineLengthFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/FixtureConfigured'); } diff --git a/tests/Issues/Fixture/correct896.php.inc b/tests/Fixer/LineLength/LineLengthFixer/Fixture/skip_correct_file.php.inc similarity index 100% rename from tests/Issues/Fixture/correct896.php.inc rename to tests/Fixer/LineLength/LineLengthFixer/Fixture/skip_correct_file.php.inc diff --git a/tests/Fixer/LineLength/LineLengthFixer/LineLengthFixerTest.php b/tests/Fixer/LineLength/LineLengthFixer/LineLengthFixerTest.php index 842ada352..3e14943d8 100644 --- a/tests/Fixer/LineLength/LineLengthFixer/LineLengthFixerTest.php +++ b/tests/Fixer/LineLength/LineLengthFixer/LineLengthFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class LineLengthFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/Spacing/MethodChainingNewlineFixer/MethodChainingNewlineFixerTest.php b/tests/Fixer/Spacing/MethodChainingNewlineFixer/MethodChainingNewlineFixerTest.php index dbe5357a3..fe9bcff2f 100644 --- a/tests/Fixer/Spacing/MethodChainingNewlineFixer/MethodChainingNewlineFixerTest.php +++ b/tests/Fixer/Spacing/MethodChainingNewlineFixer/MethodChainingNewlineFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Spacing\MethodChainingNewlineFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class MethodChainingNewlineFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/Spacing/SpaceAfterCommaHereNowDocFixer/SpaceAfterCommaHereNowDocFixerTest.php b/tests/Fixer/Spacing/SpaceAfterCommaHereNowDocFixer/SpaceAfterCommaHereNowDocFixerTest.php index e1b4021c2..6087af68e 100644 --- a/tests/Fixer/Spacing/SpaceAfterCommaHereNowDocFixer/SpaceAfterCommaHereNowDocFixerTest.php +++ b/tests/Fixer/Spacing/SpaceAfterCommaHereNowDocFixer/SpaceAfterCommaHereNowDocFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Spacing\SpaceAfterCommaHereNowDocFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class SpaceAfterCommaHereNowDocFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerContraindicationsTest.php b/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerContraindicationsTest.php index 009156804..a425b0742 100644 --- a/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerContraindicationsTest.php +++ b/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerContraindicationsTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Spacing\StandaloneLineConstructorParamFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class StandaloneLineConstructorParamFixerContraindicationsTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/FixtureContraindications'); } diff --git a/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerTest.php b/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerTest.php index 74af29f83..6bf99722c 100644 --- a/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerTest.php +++ b/tests/Fixer/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Spacing\StandaloneLineConstructorParamFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class StandaloneLineConstructorParamFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/Spacing/StandaloneLinePromotedPropertyFixer/StandaloneLinePromotedPropertyFixerTest.php b/tests/Fixer/Spacing/StandaloneLinePromotedPropertyFixer/StandaloneLinePromotedPropertyFixerTest.php index 195308ba5..8c0cb5df5 100644 --- a/tests/Fixer/Spacing/StandaloneLinePromotedPropertyFixer/StandaloneLinePromotedPropertyFixerTest.php +++ b/tests/Fixer/Spacing/StandaloneLinePromotedPropertyFixer/StandaloneLinePromotedPropertyFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Spacing\StandaloneLinePromotedPropertyFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class StandaloneLinePromotedPropertyFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Fixer/Strict/BlankLineAfterStrictTypesFixer/BlankLineAfterStrictTypesFixerTest.php b/tests/Fixer/Strict/BlankLineAfterStrictTypesFixer/BlankLineAfterStrictTypesFixerTest.php index 221649824..ee18188c5 100644 --- a/tests/Fixer/Strict/BlankLineAfterStrictTypesFixer/BlankLineAfterStrictTypesFixerTest.php +++ b/tests/Fixer/Strict/BlankLineAfterStrictTypesFixer/BlankLineAfterStrictTypesFixerTest.php @@ -5,19 +5,18 @@ namespace Symplify\CodingStandard\Tests\Fixer\Strict\BlankLineAfterStrictTypesFixer; use Iterator; +use PHPUnit\Framework\Attributes\DataProvider; use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase; final class BlankLineAfterStrictTypesFixerTest extends AbstractCheckerTestCase { - /** - * @dataProvider provideData() - */ + #[DataProvider('provideData')] public function test(string $filePath): void { $this->doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { return self::yieldFiles(__DIR__ . '/Fixture'); } diff --git a/tests/Issues/Fixture/correct973.php.inc b/tests/Issues/Fixture/correct973.php.inc deleted file mode 100644 index 6c4638922..000000000 --- a/tests/Issues/Fixture/correct973.php.inc +++ /dev/null @@ -1,24 +0,0 @@ -doTestFile($filePath); } - public function provideData(): Iterator + public static function provideData(): Iterator { yield [__DIR__ . '/Fixture/inline_array.php.inc']; yield [__DIR__ . '/Fixture/skip_already_inlined.php.inc']; diff --git a/tests/Issues/Issue896Test.php b/tests/Issues/Issue896Test.php deleted file mode 100644 index ff5531fb4..000000000 --- a/tests/Issues/Issue896Test.php +++ /dev/null @@ -1,29 +0,0 @@ -doTestFile($filePath); - } - - public function provideData(): Iterator - { - yield [__DIR__ . '/Fixture/correct896.php.inc']; - } - - public function provideConfig(): string - { - return __DIR__ . '/config/line_lenght_rule.php'; - } -} diff --git a/tests/Issues/Issue973Test.php b/tests/Issues/Issue973Test.php deleted file mode 100644 index 37eebe62b..000000000 --- a/tests/Issues/Issue973Test.php +++ /dev/null @@ -1,29 +0,0 @@ -doTestFile($filePath); - } - - public function provideData(): Iterator - { - yield [__DIR__ . '/Fixture/correct973.php.inc']; - } - - public function provideConfig(): string - { - return __DIR__ . '/config/line_lenght_rule.php'; - } -} diff --git a/tests/Issues/config/config_inline_long_array.php b/tests/Issues/config/config_inline_long_array.php index 15b6b948a..20687b29f 100644 --- a/tests/Issues/config/config_inline_long_array.php +++ b/tests/Issues/config/config_inline_long_array.php @@ -8,6 +8,5 @@ return static function (ECSConfig $ecsConfig): void { $ecsConfig->sets([SetList::ARRAY]); - $ecsConfig->rule(LineLengthFixer::class); }; diff --git a/tests/Issues/config/line_lenght_rule.php b/tests/Issues/config/line_lenght_rule.php deleted file mode 100644 index dc7c70fb7..000000000 --- a/tests/Issues/config/line_lenght_rule.php +++ /dev/null @@ -1,10 +0,0 @@ -rule(LineLengthFixer::class); -};