diff --git a/packages/Architecture/tests/Rector/Class_/ConstructorInjectionToActionInjectionRector/ConstructorInjectionToActionInjectionRectorTest.php b/packages/Architecture/tests/Rector/Class_/ConstructorInjectionToActionInjectionRector/ConstructorInjectionToActionInjectionRectorTest.php index 9636f971a9b0..c125d72151f2 100644 --- a/packages/Architecture/tests/Rector/Class_/ConstructorInjectionToActionInjectionRector/ConstructorInjectionToActionInjectionRectorTest.php +++ b/packages/Architecture/tests/Rector/Class_/ConstructorInjectionToActionInjectionRector/ConstructorInjectionToActionInjectionRectorTest.php @@ -20,14 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/multiple.php.inc']; - yield [__DIR__ . '/Fixture/duplicate.php.inc']; - yield [__DIR__ . '/Fixture/skip_scalars.php.inc']; - yield [__DIR__ . '/Fixture/skip_non_action_methods.php.inc']; - yield [__DIR__ . '/Fixture/only_props_from_this.php.inc']; - yield [__DIR__ . '/Fixture/manage_different_naming.php.inc']; - yield [__DIR__ . '/Fixture/extra_calls_in_constructor.inc.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/AbstractPhpDocInfoPrinterTest.php b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/AbstractPhpDocInfoPrinterTest.php index ec18ca103774..a8298ed326a3 100644 --- a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/AbstractPhpDocInfoPrinterTest.php +++ b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/AbstractPhpDocInfoPrinterTest.php @@ -4,12 +4,14 @@ namespace Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfoPrinter; +use Iterator; use PhpParser\Comment\Doc; use PhpParser\Node; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\BetterPhpDocParser\Printer\PhpDocInfoPrinter; use Rector\HttpKernel\RectorKernel; +use Rector\Testing\StaticFixtureProvider; use Symplify\PackageBuilder\Tests\AbstractKernelTestCase; abstract class AbstractPhpDocInfoPrinterTest extends AbstractKernelTestCase @@ -38,4 +40,9 @@ protected function createPhpDocInfoFromDocCommentAndNode(string $docComment, Nod return $this->phpDocInfoFactory->createFromNode($node); } + + protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php'): Iterator + { + return StaticFixtureProvider::yieldFilesFromDirectory($directory, $suffix); + } } diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc10.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc10.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc10.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc10.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc11.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc11.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc11.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc11.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc13.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc13.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc13.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc13.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc14.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc14.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc14.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc14.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc15.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc15.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc15.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc15.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc2.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc2.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc2.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc2.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc3.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc3.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc3.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc3.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc4.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc4.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc4.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc4.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc5.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc5.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc5.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc5.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc6.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc6.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc6.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc6.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc7.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc7.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc7.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc7.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc8.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc8.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc8.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc8.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc9.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc9.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/doc9.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/doc9.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/empty-doc.txt b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureEmpty/empty-doc.txt similarity index 100% rename from packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Basic/empty-doc.txt rename to packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureEmpty/empty-doc.txt diff --git a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/PhpDocInfoPrinterTest.php b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/PhpDocInfoPrinterTest.php index 4c20fd18e24b..c0ec1f9d967b 100644 --- a/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/PhpDocInfoPrinterTest.php +++ b/packages/BetterPhpDocParser/tests/PhpDocInfo/PhpDocInfoPrinter/PhpDocInfoPrinterTest.php @@ -23,20 +23,7 @@ public function test(string $docFilePath): void public function provideData(): Iterator { - yield [__DIR__ . '/Source/Basic/doc.txt']; - yield [__DIR__ . '/Source/Basic/doc2.txt']; - yield [__DIR__ . '/Source/Basic/doc3.txt']; - yield [__DIR__ . '/Source/Basic/doc4.txt']; - yield [__DIR__ . '/Source/Basic/doc5.txt']; - yield [__DIR__ . '/Source/Basic/doc6.txt']; - yield [__DIR__ . '/Source/Basic/doc7.txt']; - yield [__DIR__ . '/Source/Basic/doc8.txt']; - yield [__DIR__ . '/Source/Basic/doc9.txt']; - yield [__DIR__ . '/Source/Basic/doc10.txt']; - yield [__DIR__ . '/Source/Basic/doc11.txt']; - yield [__DIR__ . '/Source/Basic/doc13.txt']; - yield [__DIR__ . '/Source/Basic/doc14.txt']; - yield [__DIR__ . '/Source/Basic/doc15.txt']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureBasic', '*.txt'); } /** @@ -52,6 +39,6 @@ public function testEmpty(string $docFilePath): void public function provideDataEmpty(): Iterator { - yield [__DIR__ . '/Source/Basic/empty-doc.txt']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureEmpty', '*.txt'); } } diff --git a/packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php b/packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php index b75d59031bd3..57212af12090 100644 --- a/packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php +++ b/packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php @@ -21,9 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/CakePHP/tests/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/RenameMethodCallBasedOnParameterRectorTest.php b/packages/CakePHP/tests/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/RenameMethodCallBasedOnParameterRectorTest.php index d6b89530f16a..196adedca654 100644 --- a/packages/CakePHP/tests/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/RenameMethodCallBasedOnParameterRectorTest.php +++ b/packages/CakePHP/tests/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/RenameMethodCallBasedOnParameterRectorTest.php @@ -23,8 +23,7 @@ public function test(string $file): void */ public function provideDataForTest(): iterable { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/CakePHP/tests/Rector/Name/ChangeSnakedFixtureNameToCamel/ChangeSnakedFixtureNameToCamelTest.php b/packages/CakePHP/tests/Rector/Name/ChangeSnakedFixtureNameToCamel/ChangeSnakedFixtureNameToCamelTest.php index 9add1d79c0de..e4ac58631fe2 100644 --- a/packages/CakePHP/tests/Rector/Name/ChangeSnakedFixtureNameToCamel/ChangeSnakedFixtureNameToCamelTest.php +++ b/packages/CakePHP/tests/Rector/Name/ChangeSnakedFixtureNameToCamel/ChangeSnakedFixtureNameToCamelTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Celebrity/tests/Rector/BooleanOp/LogicalToBooleanRector/LogicalToBooleanRectorTest.php b/packages/Celebrity/tests/Rector/BooleanOp/LogicalToBooleanRector/LogicalToBooleanRectorTest.php index bfdbdf39d92d..37c8415d02d2 100644 --- a/packages/Celebrity/tests/Rector/BooleanOp/LogicalToBooleanRector/LogicalToBooleanRectorTest.php +++ b/packages/Celebrity/tests/Rector/BooleanOp/LogicalToBooleanRector/LogicalToBooleanRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/or.php.inc']; - yield [__DIR__ . '/Fixture/and.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Celebrity/tests/Rector/FuncCall/SetTypeToCastRector/SetTypeToCastRectorTest.php b/packages/Celebrity/tests/Rector/FuncCall/SetTypeToCastRector/SetTypeToCastRectorTest.php index 476614fe0ea4..7212d06fd3b2 100644 --- a/packages/Celebrity/tests/Rector/FuncCall/SetTypeToCastRector/SetTypeToCastRectorTest.php +++ b/packages/Celebrity/tests/Rector/FuncCall/SetTypeToCastRector/SetTypeToCastRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/assign.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Celebrity/tests/Rector/NotEqual/CommonNotEqualRector/CommonNotEqualRectorTest.php b/packages/Celebrity/tests/Rector/NotEqual/CommonNotEqualRector/CommonNotEqualRectorTest.php index e953929dcc9e..f0a5dbd7a55a 100644 --- a/packages/Celebrity/tests/Rector/NotEqual/CommonNotEqualRector/CommonNotEqualRectorTest.php +++ b/packages/Celebrity/tests/Rector/NotEqual/CommonNotEqualRector/CommonNotEqualRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/src/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php b/packages/CodeQuality/src/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php index 0e962de506f8..9ad7df9db209 100644 --- a/packages/CodeQuality/src/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php +++ b/packages/CodeQuality/src/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php @@ -14,6 +14,8 @@ /** * @see https://3v4l.org/aLf96 + * @see https://3v4l.org/2r26K + * @see https://3v4l.org/anks3 * * @see \Rector\CodeQuality\Tests\Rector\FuncCall\ArrayMergeOfNonArraysToSimpleArrayRector\ArrayMergeOfNonArraysToSimpleArrayRectorTest */ diff --git a/packages/CodeQuality/tests/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/CallableThisArrayToAnonymousFunctionRectorTest.php b/packages/CodeQuality/tests/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/CallableThisArrayToAnonymousFunctionRectorTest.php index 6ab06885832c..ba10a726e7c0 100644 --- a/packages/CodeQuality/tests/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/CallableThisArrayToAnonymousFunctionRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/CallableThisArrayToAnonymousFunctionRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; - yield [__DIR__ . '/Fixture/another_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_another_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_empty_first_array.php.inc']; - yield [__DIR__ . '/Fixture/skip_as_well.php.inc']; - yield [__DIR__ . '/Fixture/no_return_for_void.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Assign/CombinedAssignRector/CombinedAssignRectorTest.php b/packages/CodeQuality/tests/Rector/Assign/CombinedAssignRector/CombinedAssignRectorTest.php index 53f2bf957902..a84550e9fc34 100644 --- a/packages/CodeQuality/tests/Rector/Assign/CombinedAssignRector/CombinedAssignRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Assign/CombinedAssignRector/CombinedAssignRectorTest.php @@ -25,8 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/BinaryOp/SimplifyDeMorganBinaryRector/SimplifyDeMorganBinaryRectorTest.php b/packages/CodeQuality/tests/Rector/BinaryOp/SimplifyDeMorganBinaryRector/SimplifyDeMorganBinaryRectorTest.php index 73da7a29eee5..ce5d36172541 100644 --- a/packages/CodeQuality/tests/Rector/BinaryOp/SimplifyDeMorganBinaryRector/SimplifyDeMorganBinaryRectorTest.php +++ b/packages/CodeQuality/tests/Rector/BinaryOp/SimplifyDeMorganBinaryRector/SimplifyDeMorganBinaryRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/binary_and.php.inc']; - yield [__DIR__ . '/Fixture/multi_binary.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php b/packages/CodeQuality/tests/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php index 063e88eb2c08..23ebe6f2ef3a 100644 --- a/packages/CodeQuality/tests/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php +++ b/packages/CodeQuality/tests/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php b/packages/CodeQuality/tests/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php index 9fcf53697c03..d2e424a94ae6 100644 --- a/packages/CodeQuality/tests/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Class_/CompleteDynamicPropertiesRector/CompleteDynamicPropertiesRectorTest.php b/packages/CodeQuality/tests/Rector/Class_/CompleteDynamicPropertiesRector/CompleteDynamicPropertiesRectorTest.php index a809869ac279..198db9bc6824 100644 --- a/packages/CodeQuality/tests/Rector/Class_/CompleteDynamicPropertiesRector/CompleteDynamicPropertiesRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Class_/CompleteDynamicPropertiesRector/CompleteDynamicPropertiesRectorTest.php @@ -20,16 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/multiple_types.php.inc']; - yield [__DIR__ . '/Fixture/skip_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_defined.php.inc']; - yield [__DIR__ . '/Fixture/skip_parent_property.php.inc']; - yield [__DIR__ . '/Fixture/skip_trait_used.php.inc']; - yield [__DIR__ . '/Fixture/skip_magic_parent.php.inc']; - yield [__DIR__ . '/Fixture/skip_magic.php.inc']; - yield [__DIR__ . '/Fixture/skip_laravel_closure_binding.php.inc']; - yield [__DIR__ . '/Fixture/skip_dynamic_properties.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Concat/JoinStringConcatRector/JoinStringConcatRectorTest.php b/packages/CodeQuality/tests/Rector/Concat/JoinStringConcatRector/JoinStringConcatRectorTest.php index fc2c5adb811b..bce8723219c9 100644 --- a/packages/CodeQuality/tests/Rector/Concat/JoinStringConcatRector/JoinStringConcatRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Concat/JoinStringConcatRector/JoinStringConcatRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_longer_than_120.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/UseIdenticalOverEqualWithSameTypeRectorTest.php b/packages/CodeQuality/tests/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/UseIdenticalOverEqualWithSameTypeRectorTest.php index 782fcb1aa5a7..5b0cb498f23f 100644 --- a/packages/CodeQuality/tests/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/UseIdenticalOverEqualWithSameTypeRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/UseIdenticalOverEqualWithSameTypeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_objects.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/For_/ForToForeachRector/ForToForeachRectorTest.php b/packages/CodeQuality/tests/Rector/For_/ForToForeachRector/ForToForeachRectorTest.php index b94879c09aaa..a56e4f27245f 100644 --- a/packages/CodeQuality/tests/Rector/For_/ForToForeachRector/ForToForeachRectorTest.php +++ b/packages/CodeQuality/tests/Rector/For_/ForToForeachRector/ForToForeachRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/for_with_count.php.inc']; - yield [__DIR__ . '/Fixture/for_with_switched_compare.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Foreach_/ForeachToInArrayRector/ForeachToInArrayRectorTest.php b/packages/CodeQuality/tests/Rector/Foreach_/ForeachToInArrayRector/ForeachToInArrayRectorTest.php index 3731456d0790..46cfde2c84b2 100644 --- a/packages/CodeQuality/tests/Rector/Foreach_/ForeachToInArrayRector/ForeachToInArrayRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Foreach_/ForeachToInArrayRector/ForeachToInArrayRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/skip_collections.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToArrayFilterRector/SimplifyForeachToArrayFilterRectorTest.php b/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToArrayFilterRector/SimplifyForeachToArrayFilterRectorTest.php index c8c7bdc9bfa2..481087c6f453 100644 --- a/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToArrayFilterRector/SimplifyForeachToArrayFilterRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToArrayFilterRector/SimplifyForeachToArrayFilterRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; - yield [__DIR__ . '/Fixture/skip_if_else.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToCoalescingRector/SimplifyForeachToCoalescingRectorTest.php b/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToCoalescingRector/SimplifyForeachToCoalescingRectorTest.php index e3af991ae0ca..81ced809889e 100644 --- a/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToCoalescingRector/SimplifyForeachToCoalescingRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Foreach_/SimplifyForeachToCoalescingRector/SimplifyForeachToCoalescingRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/foreach_key_value.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/AddPregQuoteDelimiterRector/AddPregQuoteDelimiterRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/AddPregQuoteDelimiterRector/AddPregQuoteDelimiterRectorTest.php index 303eb22c03ea..ec3ddca66383 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/AddPregQuoteDelimiterRector/AddPregQuoteDelimiterRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/AddPregQuoteDelimiterRector/AddPregQuoteDelimiterRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/ArrayMergeOfNonArraysToSimpleArrayRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/ArrayMergeOfNonArraysToSimpleArrayRectorTest.php index 59fcaa29684d..5171e3fc27e6 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/ArrayMergeOfNonArraysToSimpleArrayRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/ArrayMergeOfNonArraysToSimpleArrayRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - // https://3v4l.org/2r26K - yield [__DIR__ . '/Fixture/nested_arrays.php.inc']; - // skip multiple items https://3v4l.org/anks3 - yield [__DIR__ . '/Fixture/skip_non_arrays.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/CompactToVariablesRector/CompactToVariablesRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/CompactToVariablesRector/CompactToVariablesRectorTest.php index d8f7a659379a..e03b77793abd 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/CompactToVariablesRector/CompactToVariablesRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/CompactToVariablesRector/CompactToVariablesRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/InArrayAndArrayKeysToArrayKeyExistsRector/InArrayAndArrayKeysToArrayKeyExistsRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/InArrayAndArrayKeysToArrayKeyExistsRector/InArrayAndArrayKeysToArrayKeyExistsRectorTest.php index f5ece65887e8..4a0c6e04986e 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/InArrayAndArrayKeysToArrayKeyExistsRector/InArrayAndArrayKeysToArrayKeyExistsRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/InArrayAndArrayKeysToArrayKeyExistsRector/InArrayAndArrayKeysToArrayKeyExistsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/IsAWithStringWithThirdArgumentRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/IsAWithStringWithThirdArgumentRectorTest.php index e487bd14d12b..1d1d0fc7f06b 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/IsAWithStringWithThirdArgumentRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/IsAWithStringWithThirdArgumentRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/RemoveSoleValueSprintfRector/RemoveSoleValueSprintfRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/RemoveSoleValueSprintfRector/RemoveSoleValueSprintfRectorTest.php index 1b95d357f8e0..7fb0bc605370 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/RemoveSoleValueSprintfRector/RemoveSoleValueSprintfRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/RemoveSoleValueSprintfRector/RemoveSoleValueSprintfRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyFuncGetArgsCountRector/SimplifyFuncGetArgsCountRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyFuncGetArgsCountRector/SimplifyFuncGetArgsCountRectorTest.php index e79440bd6f00..c888839d89ba 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyFuncGetArgsCountRector/SimplifyFuncGetArgsCountRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyFuncGetArgsCountRector/SimplifyFuncGetArgsCountRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyInArrayValuesRector/SimplifyInArrayValuesRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyInArrayValuesRector/SimplifyInArrayValuesRectorTest.php index f7aa91a7d88f..7b445b79b28b 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyInArrayValuesRector/SimplifyInArrayValuesRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyInArrayValuesRector/SimplifyInArrayValuesRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyRegexPatternRector/SimplifyRegexPatternRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyRegexPatternRector/SimplifyRegexPatternRectorTest.php index 73c184b80773..643ca01bda5c 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyRegexPatternRector/SimplifyRegexPatternRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyRegexPatternRector/SimplifyRegexPatternRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/pattern_in_constant.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyStrposLowerRector/SimplifyStrposLowerRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyStrposLowerRector/SimplifyStrposLowerRectorTest.php index 1ee59e4b7ada..f9e0a09f6d5c 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/SimplifyStrposLowerRector/SimplifyStrposLowerRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/SimplifyStrposLowerRector/SimplifyStrposLowerRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/SingleInArrayToCompareRector/SingleInArrayToCompareRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/SingleInArrayToCompareRector/SingleInArrayToCompareRectorTest.php index 79cc43b0e18a..dfc95de65d29 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/SingleInArrayToCompareRector/SingleInArrayToCompareRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/SingleInArrayToCompareRector/SingleInArrayToCompareRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector/StrlenZeroToIdenticalEmptyStringRectorTest.php b/packages/CodeQuality/tests/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector/StrlenZeroToIdenticalEmptyStringRectorTest.php index d8bebc8f4f5a..5295c0d36d7b 100644 --- a/packages/CodeQuality/tests/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector/StrlenZeroToIdenticalEmptyStringRectorTest.php +++ b/packages/CodeQuality/tests/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector/StrlenZeroToIdenticalEmptyStringRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/BooleanNotIdenticalToNotIdenticalRectorTest.php b/packages/CodeQuality/tests/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/BooleanNotIdenticalToNotIdenticalRectorTest.php index 9bf1511eb438..fc325e629822 100644 --- a/packages/CodeQuality/tests/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/BooleanNotIdenticalToNotIdenticalRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/BooleanNotIdenticalToNotIdenticalRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/just_first.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Identical/GetClassToInstanceOfRector/GetClassToInstanceOfRectorTest.php b/packages/CodeQuality/tests/Rector/Identical/GetClassToInstanceOfRector/GetClassToInstanceOfRectorTest.php index 17f4f74e6408..2858cb6c1a21 100644 --- a/packages/CodeQuality/tests/Rector/Identical/GetClassToInstanceOfRector/GetClassToInstanceOfRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Identical/GetClassToInstanceOfRector/GetClassToInstanceOfRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Identical/SimplifyArraySearchRector/SimplifyArraySearchRectorTest.php b/packages/CodeQuality/tests/Rector/Identical/SimplifyArraySearchRector/SimplifyArraySearchRectorTest.php index 9b0986ed5fbd..a66d4013bf76 100644 --- a/packages/CodeQuality/tests/Rector/Identical/SimplifyArraySearchRector/SimplifyArraySearchRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Identical/SimplifyArraySearchRector/SimplifyArraySearchRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Identical/SimplifyBoolIdenticalTrueRector/SimplifyBoolIdenticalTrueRectorTest.php b/packages/CodeQuality/tests/Rector/Identical/SimplifyBoolIdenticalTrueRector/SimplifyBoolIdenticalTrueRectorTest.php index ef6bfbe5d66b..9aae033a1cdd 100644 --- a/packages/CodeQuality/tests/Rector/Identical/SimplifyBoolIdenticalTrueRector/SimplifyBoolIdenticalTrueRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Identical/SimplifyBoolIdenticalTrueRector/SimplifyBoolIdenticalTrueRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/directly.php.inc']; - yield [__DIR__ . '/Fixture/negate.php.inc']; - yield [__DIR__ . '/Fixture/double_negate.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Identical/SimplifyConditionsRector/SimplifyConditionsRectorTest.php b/packages/CodeQuality/tests/Rector/Identical/SimplifyConditionsRector/SimplifyConditionsRectorTest.php index 02c8f3442bbe..f174e819ea1a 100644 --- a/packages/CodeQuality/tests/Rector/Identical/SimplifyConditionsRector/SimplifyConditionsRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Identical/SimplifyConditionsRector/SimplifyConditionsRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/boolean_not.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/dual_null.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/ConsecutiveNullCompareReturnsToNullCoalesceQueueRectorTest.php b/packages/CodeQuality/tests/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/ConsecutiveNullCompareReturnsToNullCoalesceQueueRectorTest.php index 95da423e2839..af82cbfc0c1a 100644 --- a/packages/CodeQuality/tests/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/ConsecutiveNullCompareReturnsToNullCoalesceQueueRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/ConsecutiveNullCompareReturnsToNullCoalesceQueueRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/triplets.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/ExplicitBoolCompareRector/ExplicitBoolCompareRectorTest.php b/packages/CodeQuality/tests/Rector/If_/ExplicitBoolCompareRector/ExplicitBoolCompareRectorTest.php index bc0aa6cb8aad..6688c0040c0a 100644 --- a/packages/CodeQuality/tests/Rector/If_/ExplicitBoolCompareRector/ExplicitBoolCompareRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/ExplicitBoolCompareRector/ExplicitBoolCompareRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/count.php.inc']; - yield [__DIR__ . '/Fixture/array_compare.php.inc']; - yield [__DIR__ . '/Fixture/string.php.inc']; - yield [__DIR__ . '/Fixture/numbers.php.inc']; - yield [__DIR__ . '/Fixture/nullable.php.inc']; - yield [__DIR__ . '/Fixture/with_ternary.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/RemoveAlwaysTrueConditionSetInConstructorRector/RemoveAlwaysTrueConditionSetInConstructorRectorTest.php b/packages/CodeQuality/tests/Rector/If_/RemoveAlwaysTrueConditionSetInConstructorRector/RemoveAlwaysTrueConditionSetInConstructorRectorTest.php index 6d7db26b97a5..9b912a85a65b 100644 --- a/packages/CodeQuality/tests/Rector/If_/RemoveAlwaysTrueConditionSetInConstructorRector/RemoveAlwaysTrueConditionSetInConstructorRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/RemoveAlwaysTrueConditionSetInConstructorRector/RemoveAlwaysTrueConditionSetInConstructorRectorTest.php @@ -20,29 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/skip_constant_strings_without_value.php.inc']; - yield [__DIR__ . '/Fixture/constant_string_with_value.php.inc']; - - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/numbers.php.inc']; - - yield [__DIR__ . '/Fixture/various_types.php.inc']; - yield [__DIR__ . '/Fixture/multiple_lines.php.inc']; - yield [__DIR__ . '/Fixture/multiple_lines_in_callable.php.inc']; - yield [__DIR__ . '/Fixture/multiple_lines_removed.php.inc']; - yield [__DIR__ . '/Fixture/fix_static_array.php.inc']; - - // skip - yield [__DIR__ . '/Fixture/skip_public.php.inc']; - yield [__DIR__ . '/Fixture/skip_not_yet_used.php.inc']; - yield [__DIR__ . '/Fixture/skip_after_overridden.php.inc']; - yield [__DIR__ . '/Fixture/skip_array.php.inc']; - yield [__DIR__ . '/Fixture/skip_changed_value.php.inc']; - yield [__DIR__ . '/Fixture/skip_scalars.php.inc']; - yield [__DIR__ . '/Fixture/skip_unknown.php.inc']; - yield [__DIR__ . '/Fixture/skip_optional_argument_value.php.inc']; - yield [__DIR__ . '/Fixture/skip_trait.php.inc']; - yield [__DIR__ . '/Fixture/skip_nullable_set.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested-else.php.inc b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested_else.php.inc similarity index 100% rename from packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested-else.php.inc rename to packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested_else.php.inc diff --git a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested-elseif.php.inc b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested_elseif.php.inc similarity index 100% rename from packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested-elseif.php.inc rename to packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/nested_elseif.php.inc diff --git a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip-multiple-stmts.php.inc b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip_multiple_stmts.php.inc similarity index 94% rename from packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip-multiple-stmts.php.inc rename to packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip_multiple_stmts.php.inc index 3cbd46e40ee4..0cb10fe115b8 100644 --- a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip-multiple-stmts.php.inc +++ b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip_multiple_stmts.php.inc @@ -2,7 +2,7 @@ namespace Rector\Php\Tests\Rector\If_\ShortenElseIfRector\Fixture; -class MultipleStmtsClass +class SkipMultipleStmtsClass { /** * @var bool diff --git a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip-no-else-if.php.inc b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip_no_else_if.php.inc similarity index 100% rename from packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip-no-else-if.php.inc rename to packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/Fixture/skip_no_else_if.php.inc diff --git a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/ShortenElseIfRectorTest.php b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/ShortenElseIfRectorTest.php index c9fd5ce95355..cfe4128cfc19 100644 --- a/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/ShortenElseIfRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/ShortenElseIfRector/ShortenElseIfRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/simple.php.inc']; - yield [__DIR__ . '/Fixture/nested-else.php.inc']; - yield [__DIR__ . '/Fixture/nested-elseif.php.inc']; - yield [__DIR__ . '/Fixture/recursive.php.inc']; - yield [__DIR__ . '/Fixture/skip-no-else-if.php.inc']; - yield [__DIR__ . '/Fixture/skip-multiple-stmts.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/SimplifyIfElseToTernaryRector/SimplifyIfElseToTernaryRectorTest.php b/packages/CodeQuality/tests/Rector/If_/SimplifyIfElseToTernaryRector/SimplifyIfElseToTernaryRectorTest.php index 767223317263..d17cea017617 100644 --- a/packages/CodeQuality/tests/Rector/If_/SimplifyIfElseToTernaryRector/SimplifyIfElseToTernaryRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/SimplifyIfElseToTernaryRector/SimplifyIfElseToTernaryRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; - yield [__DIR__ . '/Fixture/too_long.php.inc']; - yield [__DIR__ . '/Fixture/keep_nested_ternary.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/SimplifyIfIssetToNullCoalescingRector/SimplifyIfIssetToNullCoalescingRectorTest.php b/packages/CodeQuality/tests/Rector/If_/SimplifyIfIssetToNullCoalescingRector/SimplifyIfIssetToNullCoalescingRectorTest.php index 5f1de55912c8..cf07692ce9d0 100644 --- a/packages/CodeQuality/tests/Rector/If_/SimplifyIfIssetToNullCoalescingRector/SimplifyIfIssetToNullCoalescingRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/SimplifyIfIssetToNullCoalescingRector/SimplifyIfIssetToNullCoalescingRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/SimplifyIfNotNullReturnRector/SimplifyIfNotNullReturnRectorTest.php b/packages/CodeQuality/tests/Rector/If_/SimplifyIfNotNullReturnRector/SimplifyIfNotNullReturnRectorTest.php index 45e571ad2a79..c06ebd620e99 100644 --- a/packages/CodeQuality/tests/Rector/If_/SimplifyIfNotNullReturnRector/SimplifyIfNotNullReturnRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/SimplifyIfNotNullReturnRector/SimplifyIfNotNullReturnRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php b/packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php index 22bb1f0f797e..974fe63fa1c2 100644 --- a/packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php +++ b/packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php @@ -20,21 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/fixture6.php.inc']; - yield [__DIR__ . '/Fixture/fixture7.php.inc']; - yield [__DIR__ . '/Fixture/fixture8.php.inc']; - yield [__DIR__ . '/Fixture/fixture9.php.inc']; - yield [__DIR__ . '/Fixture/fixture10.php.inc']; - - // skip - yield [__DIR__ . '/Fixture/skip_constant_scalar_type.php.inc']; - yield [__DIR__ . '/Fixture/should_keep_comments.php.inc']; - yield [__DIR__ . '/Fixture/should_keep_doc_blocks.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/AndAssignsToSeparateLinesRectorTest.php b/packages/CodeQuality/tests/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/AndAssignsToSeparateLinesRectorTest.php index 1fbbaad925e3..6e464d86a30e 100644 --- a/packages/CodeQuality/tests/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/AndAssignsToSeparateLinesRectorTest.php +++ b/packages/CodeQuality/tests/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/AndAssignsToSeparateLinesRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_in_condition.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php b/packages/CodeQuality/tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php index 5849bbb5c6cb..128a12a7d4b1 100644 --- a/packages/CodeQuality/tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php @@ -25,11 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/in_a_function.php.inc']; - yield [__DIR__ . '/Fixture/keep_visual.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Ternary/SimplifyDuplicatedTernaryRector/SimplifyDuplicatedTernaryRectorTest.php b/packages/CodeQuality/tests/Rector/Ternary/SimplifyDuplicatedTernaryRector/SimplifyDuplicatedTernaryRectorTest.php index 4b45a8e64aa6..93544d96b406 100644 --- a/packages/CodeQuality/tests/Rector/Ternary/SimplifyDuplicatedTernaryRector/SimplifyDuplicatedTernaryRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Ternary/SimplifyDuplicatedTernaryRector/SimplifyDuplicatedTernaryRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Ternary/SimplifyTautologyTernaryRector/SimplifyTautologyTernaryRectorTest.php b/packages/CodeQuality/tests/Rector/Ternary/SimplifyTautologyTernaryRector/SimplifyTautologyTernaryRectorTest.php index 03dfea19239e..9d2776c9e601 100644 --- a/packages/CodeQuality/tests/Rector/Ternary/SimplifyTautologyTernaryRector/SimplifyTautologyTernaryRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Ternary/SimplifyTautologyTernaryRector/SimplifyTautologyTernaryRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodeQuality/tests/Rector/Ternary/UnnecessaryTernaryExpressionRector/UnnecessaryTernaryExpressionRectorTest.php b/packages/CodeQuality/tests/Rector/Ternary/UnnecessaryTernaryExpressionRector/UnnecessaryTernaryExpressionRectorTest.php index 01f74c097c31..2661588b6842 100644 --- a/packages/CodeQuality/tests/Rector/Ternary/UnnecessaryTernaryExpressionRector/UnnecessaryTernaryExpressionRectorTest.php +++ b/packages/CodeQuality/tests/Rector/Ternary/UnnecessaryTernaryExpressionRector/UnnecessaryTernaryExpressionRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Assign/SplitDoubleAssignRector/SplitDoubleAssignRectorTest.php b/packages/CodingStyle/tests/Rector/Assign/SplitDoubleAssignRector/SplitDoubleAssignRectorTest.php index d5adae321dfb..be551443e683 100644 --- a/packages/CodingStyle/tests/Rector/Assign/SplitDoubleAssignRector/SplitDoubleAssignRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Assign/SplitDoubleAssignRector/SplitDoubleAssignRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Assign/UseIncrementAssignRector/UseIncrementAssignRectorTest.php b/packages/CodingStyle/tests/Rector/Assign/UseIncrementAssignRector/UseIncrementAssignRectorTest.php index 13c8aa307315..1b432e2bee20 100644 --- a/packages/CodingStyle/tests/Rector/Assign/UseIncrementAssignRector/UseIncrementAssignRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Assign/UseIncrementAssignRector/UseIncrementAssignRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Catch_/CatchExceptionNameMatchingTypeRector/CatchExceptionNameMatchingTypeRectorTest.php b/packages/CodingStyle/tests/Rector/Catch_/CatchExceptionNameMatchingTypeRector/CatchExceptionNameMatchingTypeRectorTest.php index 5c070561e5a0..e283894a09d0 100644 --- a/packages/CodingStyle/tests/Rector/Catch_/CatchExceptionNameMatchingTypeRector/CatchExceptionNameMatchingTypeRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Catch_/CatchExceptionNameMatchingTypeRector/CatchExceptionNameMatchingTypeRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/nested_call.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/SplitGroupedConstantsAndPropertiesRectorTest.php b/packages/CodingStyle/tests/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/SplitGroupedConstantsAndPropertiesRectorTest.php index 315b7ccce15c..3c7cd988539e 100644 --- a/packages/CodingStyle/tests/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/SplitGroupedConstantsAndPropertiesRectorTest.php +++ b/packages/CodingStyle/tests/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/SplitGroupedConstantsAndPropertiesRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/ClassConst/VarConstantCommentRector/VarConstantCommentRectorTest.php b/packages/CodingStyle/tests/Rector/ClassConst/VarConstantCommentRector/VarConstantCommentRectorTest.php index 94e30f80702c..bd3df67d9988 100644 --- a/packages/CodingStyle/tests/Rector/ClassConst/VarConstantCommentRector/VarConstantCommentRectorTest.php +++ b/packages/CodingStyle/tests/Rector/ClassConst/VarConstantCommentRector/VarConstantCommentRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/correct_invalid.php.inc']; - yield [__DIR__ . '/Fixture/arrays.php.inc']; - yield [__DIR__ . '/Fixture/misc_type.php.inc']; - yield [__DIR__ . '/Fixture/no_slash.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/MakeInheritedMethodVisibilitySameAsParentRectorTest.php b/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/MakeInheritedMethodVisibilitySameAsParentRectorTest.php index a46bbafedf5e..f02b6b61bfd5 100644 --- a/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/MakeInheritedMethodVisibilitySameAsParentRectorTest.php +++ b/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/MakeInheritedMethodVisibilitySameAsParentRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/private.php.inc']; - yield [__DIR__ . '/Fixture/skip_existing.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/SkipParentConstructOverrideInPHP72Test.php b/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/SkipParentConstructOverrideInPHP72Test.php index e3de33c1a3eb..4ae1d97493ab 100644 --- a/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/SkipParentConstructOverrideInPHP72Test.php +++ b/packages/CodingStyle/tests/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/SkipParentConstructOverrideInPHP72Test.php @@ -23,8 +23,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/skip_self_ctor.php.inc']; - yield [__DIR__ . '/Fixture/skip_static_ctor.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/NewlineBeforeNewAssignSetRectorTest.php b/packages/CodingStyle/tests/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/NewlineBeforeNewAssignSetRectorTest.php index d6d99444b6ec..57def280215e 100644 --- a/packages/CodingStyle/tests/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/NewlineBeforeNewAssignSetRectorTest.php +++ b/packages/CodingStyle/tests/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/NewlineBeforeNewAssignSetRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_false.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_nop.php.inc']; - yield [__DIR__ . '/Fixture/skip_just_one.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/ReturnArrayClassMethodToYieldRectorTest.php b/packages/CodingStyle/tests/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/ReturnArrayClassMethodToYieldRectorTest.php index 521b324cf4ab..d1087d24744d 100644 --- a/packages/CodingStyle/tests/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/ReturnArrayClassMethodToYieldRectorTest.php +++ b/packages/CodingStyle/tests/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/ReturnArrayClassMethodToYieldRectorTest.php @@ -22,13 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/data_provider.php.inc']; - yield [__DIR__ . '/Fixture/should_not_remove_comments.php.inc']; - yield [__DIR__ . '/Fixture/should_not_remove_doc_blocks.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/CodingStyle/tests/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector/YieldClassMethodToArrayClassMethodRectorTest.php b/packages/CodingStyle/tests/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector/YieldClassMethodToArrayClassMethodRectorTest.php index 3332b8c929c7..a4c40b0073c7 100644 --- a/packages/CodingStyle/tests/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector/YieldClassMethodToArrayClassMethodRectorTest.php +++ b/packages/CodingStyle/tests/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector/YieldClassMethodToArrayClassMethodRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/type_declaration.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/CodingStyle/tests/Rector/Class_/AddArrayDefaultToArrayPropertyRector/AddArrayDefaultToArrayPropertyRectorTest.php b/packages/CodingStyle/tests/Rector/Class_/AddArrayDefaultToArrayPropertyRector/AddArrayDefaultToArrayPropertyRectorTest.php index 8e15948667b6..0de8816beeb3 100644 --- a/packages/CodingStyle/tests/Rector/Class_/AddArrayDefaultToArrayPropertyRector/AddArrayDefaultToArrayPropertyRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Class_/AddArrayDefaultToArrayPropertyRector/AddArrayDefaultToArrayPropertyRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture_2.php.inc']; - yield [__DIR__ . '/Fixture/count_on_null.php.inc']; - yield [__DIR__ . '/Fixture/skip_nullable_array.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Encapsed/EncapsedStringsToSprintfRector/EncapsedStringsToSprintfRectorTest.php b/packages/CodingStyle/tests/Rector/Encapsed/EncapsedStringsToSprintfRector/EncapsedStringsToSprintfRectorTest.php index cfd2c72c0c74..fdc8cf77690c 100644 --- a/packages/CodingStyle/tests/Rector/Encapsed/EncapsedStringsToSprintfRector/EncapsedStringsToSprintfRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Encapsed/EncapsedStringsToSprintfRector/EncapsedStringsToSprintfRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/numberz.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/FuncCall/CallUserFuncCallToVariadicRector/CallUserFuncCallToVariadicRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/CallUserFuncCallToVariadicRector/CallUserFuncCallToVariadicRectorTest.php index de7973b0c371..da381024cf7b 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/CallUserFuncCallToVariadicRector/CallUserFuncCallToVariadicRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/CallUserFuncCallToVariadicRector/CallUserFuncCallToVariadicRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/FuncCall/ConsistentImplodeRector/ConsistentImplodeRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/ConsistentImplodeRector/ConsistentImplodeRectorTest.php index de16e00bc9cb..d5033be76e4c 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/ConsistentImplodeRector/ConsistentImplodeRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/ConsistentImplodeRector/ConsistentImplodeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_switched.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/ConsistentPregDelimiterRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/ConsistentPregDelimiterRectorTest.php index 9776d3412cd5..31e35479001c 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/ConsistentPregDelimiterRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/ConsistentPregDelimiterRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/escape_nette_static_call.php.inc']; - yield [__DIR__ . '/Fixture/skip_concat.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/FuncCall/FunctionCallToConstantRector/FunctionCallToConstantRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/FunctionCallToConstantRector/FunctionCallToConstantRectorTest.php index 425e44455c82..cd497be58bdd 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/FunctionCallToConstantRector/FunctionCallToConstantRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/FunctionCallToConstantRector/FunctionCallToConstantRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorsWithConfiguration(): array diff --git a/packages/CodingStyle/tests/Rector/FuncCall/SimpleArrayCallableToStringRector/SimpleArrayCallableToStringRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/SimpleArrayCallableToStringRector/SimpleArrayCallableToStringRectorTest.php index ff35839b8e4f..c590063db816 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/SimpleArrayCallableToStringRector/SimpleArrayCallableToStringRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/SimpleArrayCallableToStringRector/SimpleArrayCallableToStringRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/FuncCall/StrictArraySearchRector/StrictArraySearchRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/StrictArraySearchRector/StrictArraySearchRectorTest.php index 7ea9522a378e..c9b8d8647aaf 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/StrictArraySearchRector/StrictArraySearchRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/StrictArraySearchRector/StrictArraySearchRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/FuncCall/VersionCompareFuncCallToConstantRector/VersionCompareFuncCallToConstantRectorTest.php b/packages/CodingStyle/tests/Rector/FuncCall/VersionCompareFuncCallToConstantRector/VersionCompareFuncCallToConstantRectorTest.php index a536f9a94ede..87e90ee3d54f 100644 --- a/packages/CodingStyle/tests/Rector/FuncCall/VersionCompareFuncCallToConstantRector/VersionCompareFuncCallToConstantRectorTest.php +++ b/packages/CodingStyle/tests/Rector/FuncCall/VersionCompareFuncCallToConstantRector/VersionCompareFuncCallToConstantRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/version-compare.php.inc']; - yield [__DIR__ . '/Fixture/skip-version-compare.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Include_/FollowRequireByDirRector/FollowRequireByDirRectorTest.php b/packages/CodingStyle/tests/Rector/Include_/FollowRequireByDirRector/FollowRequireByDirRectorTest.php index 22a706524289..400735d91823 100644 --- a/packages/CodingStyle/tests/Rector/Include_/FollowRequireByDirRector/FollowRequireByDirRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Include_/FollowRequireByDirRector/FollowRequireByDirRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/extra_dot.php.inc']; - yield [__DIR__ . '/Fixture/phar.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php index 063fdccaa444..81125cda2b59 100644 --- a/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php +++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/to_self.php.inc']; - yield [__DIR__ . '/Fixture/to_this.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/NonNamespaced/already_imported.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureNonNamespaced/already_imported.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/NonNamespaced/already_imported.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureNonNamespaced/already_imported.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/NonNamespaced/function_import.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureNonNamespaced/function_import.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/NonNamespaced/function_import.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureNonNamespaced/function_import.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/NonNamespaced/simple.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureNonNamespaced/simple.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/NonNamespaced/simple.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureNonNamespaced/simple.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/conflicting_endings.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixturePartial/conflicting_endings.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/conflicting_endings.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixturePartial/conflicting_endings.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/doc_combined.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixturePartial/doc_combined.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/doc_combined.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixturePartial/doc_combined.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/import_return_doc.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixturePartial/import_return_doc.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/import_return_doc.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixturePartial/import_return_doc.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/import_root_namespace_classes_disabled.php.inc b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureRoot/import_root_namespace_classes_disabled.php.inc similarity index 100% rename from packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/import_root_namespace_classes_disabled.php.inc rename to packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureRoot/import_root_namespace_classes_disabled.php.inc diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportFullyQualifiedNamesRectorTest.php b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportFullyQualifiedNamesRectorTest.php index bd77b9bc1a14..1ce6a85cd179 100644 --- a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportFullyQualifiedNamesRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportFullyQualifiedNamesRectorTest.php @@ -11,72 +11,22 @@ final class ImportFullyQualifiedNamesRectorTest extends AbstractRectorTestCase { /** - * @dataProvider provideNamespacedClasses() - * @dataProvider provideFunctions() - * @dataProvider providerPartials() + * @dataProvider provideDataForTest() */ public function test(string $file): void { $this->doTestFile($file); } - public function providerPartials(): Iterator + public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/prevent_duplication.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } public function skippedProviderPartials(): Iterator { -// @todo fix later - yield [__DIR__ . '/Fixture/doc_combined.php.inc']; - yield [__DIR__ . '/Fixture/conflicting_endings.php.inc']; - yield [__DIR__ . '/Fixture/import_return_doc.php.inc']; - } - - public function provideNamespacedClasses(): Iterator - { - // keep - yield [__DIR__ . '/Fixture/bootstrap_names.php.inc']; - - yield [__DIR__ . '/Fixture/keep.php.inc']; - yield [__DIR__ . '/Fixture/keep_aliased.php.inc']; - yield [__DIR__ . '/Fixture/keep_same_end.php.inc']; - yield [__DIR__ . '/Fixture/keep_same_end_with_existing_import.php.inc']; - yield [__DIR__ . '/Fixture/keep_trait_use.php.inc']; - yield [__DIR__ . '/Fixture/short.php.inc']; - - // same short class with namespace - yield [__DIR__ . '/Fixture/skip_same_namespaced_used_class.php.inc']; - yield [__DIR__ . '/Fixture/include_used_local_class.php.inc']; - - // the class in the same namespace exists, but it is not used in this file, so we can skip it - yield [__DIR__ . '/Fixture/same_namespaced_class.php.inc']; - - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/double_import.php.inc']; - yield [__DIR__ . '/Fixture/double_import_with_existing.php.inc']; - yield [__DIR__ . '/Fixture/already_with_use.php.inc']; - yield [__DIR__ . '/Fixture/already_class_name.php.inc']; - yield [__DIR__ . '/Fixture/no_class.php.inc']; - - // php doc - yield [__DIR__ . '/Fixture/import_param_doc.php.inc']; - yield [__DIR__ . '/Fixture/already_class_name_in_param_doc.php.inc']; - - // buggy - yield [__DIR__ . '/Fixture/many_imports.php.inc']; - yield [__DIR__ . '/Fixture/keep_static_method.php.inc']; - yield [__DIR__ . '/Fixture/keep_various_request.php.inc']; - yield [__DIR__ . '/Fixture/instance_of.php.inc']; - yield [__DIR__ . '/Fixture/should_keep_all_doc_blocks_annotations_parameters.php.inc']; - - yield [__DIR__ . '/Fixture/import_root_namespace_classes_enabled.php.inc']; - } - - public function provideFunctions(): Iterator - { - yield [__DIR__ . '/Fixture/import_function.php.inc']; - yield [__DIR__ . '/Fixture/import_function_no_class.php.inc']; + // @todo fix later + return $this->yieldFilesFromDirectory(__DIR__ . '/FixturePartial'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php index 70356e0305dc..e60fc034013d 100644 --- a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php +++ b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php @@ -19,9 +19,12 @@ public function test(string $file): void public function provideDataForTest(): iterable { - yield [__DIR__ . '/Fixture/import_root_namespace_classes_disabled.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureRoot'); } + /** + * @return mixed[] + */ protected function getRectorsWithConfiguration(): array { return [ diff --git a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/NonNamespacedTest.php b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/NonNamespacedTest.php index aa811cbc339f..0083c8f2b735 100644 --- a/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/NonNamespacedTest.php +++ b/packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/NonNamespacedTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/NonNamespaced/simple.php.inc']; - yield [__DIR__ . '/Fixture/NonNamespaced/already_imported.php.inc']; - yield [__DIR__ . '/Fixture/NonNamespaced/function_import.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureNonNamespaced'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php b/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php index f64871121877..c8d192af60ef 100644 --- a/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php +++ b/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/concat_json.php.inc']; - yield [__DIR__ . '/Fixture/multiline_concat_json.php.inc']; - yield [__DIR__ . '/Fixture/tripleline_multiline_concat_json.php.inc']; - yield [__DIR__ . '/Fixture/assign_with_concat.php.inc']; - yield [__DIR__ . '/Fixture/with_implode.php.inc']; - yield [__DIR__ . '/Fixture/without_assign.php.inc']; - yield [__DIR__ . '/Fixture/array_concat.php.inc']; - yield [__DIR__ . '/Fixture/simple_row_with_spaces.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/String_/SplitStringClassConstantToClassConstFetchRector/SplitStringClassConstantToClassConstFetchRectorTest.php b/packages/CodingStyle/tests/Rector/String_/SplitStringClassConstantToClassConstFetchRector/SplitStringClassConstantToClassConstFetchRectorTest.php index 1083e9d86581..3206abf91eb6 100644 --- a/packages/CodingStyle/tests/Rector/String_/SplitStringClassConstantToClassConstFetchRector/SplitStringClassConstantToClassConstFetchRectorTest.php +++ b/packages/CodingStyle/tests/Rector/String_/SplitStringClassConstantToClassConstFetchRector/SplitStringClassConstantToClassConstFetchRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/String_/SymplifyQuoteEscapeRector/SymplifyQuoteEscapeRectorTest.php b/packages/CodingStyle/tests/Rector/String_/SymplifyQuoteEscapeRector/SymplifyQuoteEscapeRectorTest.php index 245ed7f6bdc6..6ef531553011 100644 --- a/packages/CodingStyle/tests/Rector/String_/SymplifyQuoteEscapeRector/SymplifyQuoteEscapeRectorTest.php +++ b/packages/CodingStyle/tests/Rector/String_/SymplifyQuoteEscapeRector/SymplifyQuoteEscapeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Switch_/BinarySwitchToIfElseRector/BinarySwitchToIfElseRectorTest.php b/packages/CodingStyle/tests/Rector/Switch_/BinarySwitchToIfElseRector/BinarySwitchToIfElseRectorTest.php index a2ad88547c6a..e3a5c6fbe80d 100644 --- a/packages/CodingStyle/tests/Rector/Switch_/BinarySwitchToIfElseRector/BinarySwitchToIfElseRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Switch_/BinarySwitchToIfElseRector/BinarySwitchToIfElseRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/in_class.php.inc']; - yield [__DIR__ . '/Fixture/if_or.php.inc']; - yield [__DIR__ . '/Fixture/extra_break.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/CodingStyle/tests/Rector/Use_/RemoveUnusedAliasRector/RemoveUnusedAliasRectorTest.php b/packages/CodingStyle/tests/Rector/Use_/RemoveUnusedAliasRector/RemoveUnusedAliasRectorTest.php index 8139e2866b2b..86179aa313ec 100644 --- a/packages/CodingStyle/tests/Rector/Use_/RemoveUnusedAliasRector/RemoveUnusedAliasRectorTest.php +++ b/packages/CodingStyle/tests/Rector/Use_/RemoveUnusedAliasRector/RemoveUnusedAliasRectorTest.php @@ -20,19 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/used.php.inc']; - yield [__DIR__ . '/Fixture/keep_used_spl_file_info.php.inc']; - yield [__DIR__ . '/Fixture/keep_used_doc_param.php.inc']; - yield [__DIR__ . '/Fixture/class_name.php.inc']; - yield [__DIR__ . '/Fixture/no_namespace.php.inc']; - yield [__DIR__ . '/Fixture/no_namespace_class_name.php.inc']; - yield [__DIR__ . '/Fixture/trait_name.php.inc']; - yield [__DIR__ . '/Fixture/unneeded_trait_name.php.inc']; - yield [__DIR__ . '/Fixture/interace_extending.php.inc']; - yield [__DIR__ . '/Fixture/doc_block.php.inc']; - yield [__DIR__ . '/Fixture/skip_different_namespaces_same_name.php.inc']; - yield [__DIR__ . '/Fixture/skip_vich_annotation.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Array_/RemoveDuplicatedArrayKeyRector/RemoveDuplicatedArrayKeyRectorTest.php b/packages/DeadCode/tests/Rector/Array_/RemoveDuplicatedArrayKeyRector/RemoveDuplicatedArrayKeyRectorTest.php index 95ba4d1b1461..558c3545543f 100644 --- a/packages/DeadCode/tests/Rector/Array_/RemoveDuplicatedArrayKeyRector/RemoveDuplicatedArrayKeyRectorTest.php +++ b/packages/DeadCode/tests/Rector/Array_/RemoveDuplicatedArrayKeyRector/RemoveDuplicatedArrayKeyRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/last_man_standing.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Assign/RemoveDoubleAssignRector/RemoveDoubleAssignRectorTest.php b/packages/DeadCode/tests/Rector/Assign/RemoveDoubleAssignRector/RemoveDoubleAssignRectorTest.php index 0d575c5c29a9..9b552d085d35 100644 --- a/packages/DeadCode/tests/Rector/Assign/RemoveDoubleAssignRector/RemoveDoubleAssignRectorTest.php +++ b/packages/DeadCode/tests/Rector/Assign/RemoveDoubleAssignRector/RemoveDoubleAssignRectorTest.php @@ -20,19 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/self_referencing.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/calls.php.inc']; - yield [__DIR__ . '/Fixture/keep_dim_assign.php.inc']; - yield [__DIR__ . '/Fixture/property_assign.php.inc']; - yield [__DIR__ . '/Fixture/keep_array_reset.php.inc']; - yield [__DIR__ . '/Fixture/keep_property_assign_in_different_ifs.php.inc']; - yield [__DIR__ . '/Fixture/inside_if_else.php.inc']; - yield [__DIR__ . '/Fixture/inside_the_same_if.php.inc']; - yield [__DIR__ . '/Fixture/skip_double_catch.php.inc']; - yield [__DIR__ . '/Fixture/skip_double_case.php.inc']; - yield [__DIR__ . '/Fixture/skip_double_assign.php.inc']; - yield [__DIR__ . '/Fixture/different_value.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/BooleanAnd/RemoveAndTrueRector/RemoveAndTrueRectorTest.php b/packages/DeadCode/tests/Rector/BooleanAnd/RemoveAndTrueRector/RemoveAndTrueRectorTest.php index 17b98441555f..a891de443ab8 100644 --- a/packages/DeadCode/tests/Rector/BooleanAnd/RemoveAndTrueRector/RemoveAndTrueRectorTest.php +++ b/packages/DeadCode/tests/Rector/BooleanAnd/RemoveAndTrueRector/RemoveAndTrueRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_something.php.inc']; - yield [__DIR__ . '/Fixture/keep_property_changed_in_another_method.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassConst/RemoveUnusedPrivateConstantRector/RemoveUnusedPrivateConstantRectorTest.php b/packages/DeadCode/tests/Rector/ClassConst/RemoveUnusedPrivateConstantRector/RemoveUnusedPrivateConstantRectorTest.php index c8b71e3af493..e6bb1542cd8d 100644 --- a/packages/DeadCode/tests/Rector/ClassConst/RemoveUnusedPrivateConstantRector/RemoveUnusedPrivateConstantRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassConst/RemoveUnusedPrivateConstantRector/RemoveUnusedPrivateConstantRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_constant.php.inc']; - yield [__DIR__ . '/Fixture/keep_static_constant.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassMethod/RemoveDeadConstructorRector/RemoveDeadConstructorRectorTest.php b/packages/DeadCode/tests/Rector/ClassMethod/RemoveDeadConstructorRector/RemoveDeadConstructorRectorTest.php index 8c45cfeb0987..e1c8307f8f3d 100644 --- a/packages/DeadCode/tests/Rector/ClassMethod/RemoveDeadConstructorRector/RemoveDeadConstructorRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassMethod/RemoveDeadConstructorRector/RemoveDeadConstructorRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; - yield [__DIR__ . '/Fixture/skip_private.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassMethod/RemoveDelegatingParentCallRector/RemoveDelegatingParentCallRectorTest.php b/packages/DeadCode/tests/Rector/ClassMethod/RemoveDelegatingParentCallRector/RemoveDelegatingParentCallRectorTest.php index 32e5f2162dab..74861a8428a4 100644 --- a/packages/DeadCode/tests/Rector/ClassMethod/RemoveDelegatingParentCallRector/RemoveDelegatingParentCallRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassMethod/RemoveDelegatingParentCallRector/RemoveDelegatingParentCallRectorTest.php @@ -20,14 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_access_override.php.inc']; - yield [__DIR__ . '/Fixture/skip_extra_arguments.php.inc']; - yield [__DIR__ . '/Fixture/skip_extra_content.php.inc']; - yield [__DIR__ . '/Fixture/skip_in_trait.php.inc']; - yield [__DIR__ . '/Fixture/skip_different_method_name.php.inc']; - yield [__DIR__ . '/Fixture/skip_changed_arguments.php.inc']; - yield [__DIR__ . '/Fixture/skip_required.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassMethod/RemoveEmptyClassMethodRector/RemoveEmptyClassMethodRectorTest.php b/packages/DeadCode/tests/Rector/ClassMethod/RemoveEmptyClassMethodRector/RemoveEmptyClassMethodRectorTest.php index 1670ad9c0dbe..c99d2b11d671 100644 --- a/packages/DeadCode/tests/Rector/ClassMethod/RemoveEmptyClassMethodRector/RemoveEmptyClassMethodRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassMethod/RemoveEmptyClassMethodRector/RemoveEmptyClassMethodRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/simple.php.inc']; - yield [__DIR__ . '/Fixture/with_parent.php.inc']; - yield [__DIR__ . '/Fixture/with_interface.php.inc']; - yield [__DIR__ . '/Fixture/keep_abstract_method.php.inc']; - yield [__DIR__ . '/Fixture/keep_protected_child_method.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassMethod/RemoveOverriddenValuesRector/RemoveOverriddenValuesRectorTest.php b/packages/DeadCode/tests/Rector/ClassMethod/RemoveOverriddenValuesRector/RemoveOverriddenValuesRectorTest.php index f2419097a457..85f30ac7ba7d 100644 --- a/packages/DeadCode/tests/Rector/ClassMethod/RemoveOverriddenValuesRector/RemoveOverriddenValuesRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassMethod/RemoveOverriddenValuesRector/RemoveOverriddenValuesRectorTest.php @@ -20,19 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/function.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/multiple_assigns.php.inc']; - yield [__DIR__ . '/Fixture/reference_use.php.inc']; - yield [__DIR__ . '/Fixture/method_call.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; - yield [__DIR__ . '/Fixture/keep_pre_assign.php.inc']; - yield [__DIR__ . '/Fixture/keep_conditional_override.php.inc']; - yield [__DIR__ . '/Fixture/keep_re_use.php.inc']; - yield [__DIR__ . '/Fixture/keep_re_use_2.php.inc']; - yield [__DIR__ . '/Fixture/keep_same_level_but_different_condition_scope.php.inc']; - yield [__DIR__ . '/Fixture/issue_1093.php.inc']; - yield [__DIR__ . '/Fixture/issue_1286.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedParameterRector/RemoveUnusedParameterRectorTest.php b/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedParameterRector/RemoveUnusedParameterRectorTest.php index 87d3fa0f3c62..bc3c3f20e257 100644 --- a/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedParameterRector/RemoveUnusedParameterRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedParameterRector/RemoveUnusedParameterRectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/change_when_not_used_in_children.php.inc']; - yield [__DIR__ . '/Fixture/dont_change_parent.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/order.php.inc']; - yield [__DIR__ . '/Fixture/parent_required.php.inc']; - yield [__DIR__ . '/Fixture/in_between_parameter.php.inc']; - yield [__DIR__ . '/Fixture/compact.php.inc']; - yield [__DIR__ . '/Fixture/keep_magic_methods_param.php.inc']; - yield [__DIR__ . '/Fixture/keep_anonymous_classes.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/RemoveUnusedPrivateMethodRectorTest.php b/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/RemoveUnusedPrivateMethodRectorTest.php index df5058834b07..09827289744e 100644 --- a/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/RemoveUnusedPrivateMethodRectorTest.php +++ b/packages/DeadCode/tests/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/RemoveUnusedPrivateMethodRectorTest.php @@ -20,20 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/static_method.php.inc']; - yield [__DIR__ . '/Fixture/private_constructor.php.inc']; - yield [__DIR__ . '/Fixture/keep_static_edge.php.inc']; - yield [__DIR__ . '/Fixture/keep_anonymous.php.inc']; - yield [__DIR__ . '/Fixture/skip_local_called.php.inc']; - yield [__DIR__ . '/Fixture/keep_in_trait.php.inc']; - yield [__DIR__ . '/Fixture/keep_used_method.php.inc']; - yield [__DIR__ . '/Fixture/keep_used_method_static.php.inc']; - yield [__DIR__ . '/Fixture/skip_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_array_callables_this.php.inc']; - yield [__DIR__ . '/Fixture/skip_array_callables_self.php.inc']; - yield [__DIR__ . '/Fixture/skip_array_callables_static.php.inc']; - yield [__DIR__ . '/Fixture/skip_array_callables_fqn.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php index 8a8b8f0d2d1c..9a8e87b0c7ba 100644 --- a/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php +++ b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php @@ -20,18 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/in_constructor.php.inc']; - - yield [__DIR__ . '/Fixture/remove_dim_fetch.php.inc']; - yield [__DIR__ . '/Fixture/remove_multiple_dim_fetch.php.inc']; - - yield [__DIR__ . '/Fixture/keep_many_to_one.php.inc']; - yield [__DIR__ . '/Fixture/keep_static_property.php.inc']; - yield [__DIR__ . '/Fixture/keep_public_property.php.inc']; - yield [__DIR__ . '/Fixture/keep_serializable_object.php.inc']; - yield [__DIR__ . '/Fixture/deal_with_property_fetches.php.inc']; - yield [__DIR__ . '/Fixture/node_removal_on_non_expression.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Class_/RemoveUnusedDoctrineEntityMethodAndPropertyRector/RemoveUnusedDoctrineEntityMethodAndPropertyRectorTest.php b/packages/DeadCode/tests/Rector/Class_/RemoveUnusedDoctrineEntityMethodAndPropertyRector/RemoveUnusedDoctrineEntityMethodAndPropertyRectorTest.php index cd4b78b8db6f..01f2e2963716 100644 --- a/packages/DeadCode/tests/Rector/Class_/RemoveUnusedDoctrineEntityMethodAndPropertyRector/RemoveUnusedDoctrineEntityMethodAndPropertyRectorTest.php +++ b/packages/DeadCode/tests/Rector/Class_/RemoveUnusedDoctrineEntityMethodAndPropertyRector/RemoveUnusedDoctrineEntityMethodAndPropertyRectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/remove_inversed_by.php.inc']; - yield [__DIR__ . '/Fixture/remove_inversed_by_non_fqn.php.inc']; - yield [__DIR__ . '/Fixture/skip_double_entity_call.php.inc']; - yield [__DIR__ . '/Fixture/skip_id_and_system.php.inc']; - yield [__DIR__ . '/Fixture/skip_trait_called_method.php.inc']; - yield [__DIR__ . '/Fixture/skip_trait_doc_typed.php.inc']; - yield [__DIR__ . '/Fixture/skip_trait_complex.php.inc']; - yield [__DIR__ . '/Fixture/skip_abstract_parent.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Concat/RemoveConcatAutocastRector/RemoveConcatAutocastRectorTest.php b/packages/DeadCode/tests/Rector/Concat/RemoveConcatAutocastRector/RemoveConcatAutocastRectorTest.php index 48ab7a84f968..069dfe125196 100644 --- a/packages/DeadCode/tests/Rector/Concat/RemoveConcatAutocastRector/RemoveConcatAutocastRectorTest.php +++ b/packages/DeadCode/tests/Rector/Concat/RemoveConcatAutocastRector/RemoveConcatAutocastRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Expression/SimplifyMirrorAssignRector/SimplifyMirrorAssignRectorTest.php b/packages/DeadCode/tests/Rector/Expression/SimplifyMirrorAssignRector/SimplifyMirrorAssignRectorTest.php index 887947a9a3c9..7e4d433751e6 100644 --- a/packages/DeadCode/tests/Rector/Expression/SimplifyMirrorAssignRector/SimplifyMirrorAssignRectorTest.php +++ b/packages/DeadCode/tests/Rector/Expression/SimplifyMirrorAssignRector/SimplifyMirrorAssignRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/For_/RemoveDeadIfForeachForRector/RemoveDeadIfForeachForRectorTest.php b/packages/DeadCode/tests/Rector/For_/RemoveDeadIfForeachForRector/RemoveDeadIfForeachForRectorTest.php index 73213617ae62..308e88387ddb 100644 --- a/packages/DeadCode/tests/Rector/For_/RemoveDeadIfForeachForRector/RemoveDeadIfForeachForRectorTest.php +++ b/packages/DeadCode/tests/Rector/For_/RemoveDeadIfForeachForRector/RemoveDeadIfForeachForRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/side_effect_checks.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Foreach_/RemoveUnusedForeachKeyRector/RemoveUnusedForeachKeyRectorTest.php b/packages/DeadCode/tests/Rector/Foreach_/RemoveUnusedForeachKeyRector/RemoveUnusedForeachKeyRectorTest.php index 2585181a4a1a..a8645168f9c8 100644 --- a/packages/DeadCode/tests/Rector/Foreach_/RemoveUnusedForeachKeyRector/RemoveUnusedForeachKeyRectorTest.php +++ b/packages/DeadCode/tests/Rector/Foreach_/RemoveUnusedForeachKeyRector/RemoveUnusedForeachKeyRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/FunctionLike/RemoveCodeAfterReturnRector/RemoveCodeAfterReturnRectorTest.php b/packages/DeadCode/tests/Rector/FunctionLike/RemoveCodeAfterReturnRector/RemoveCodeAfterReturnRectorTest.php index 64d7ec1dafa9..e421ae56a218 100644 --- a/packages/DeadCode/tests/Rector/FunctionLike/RemoveCodeAfterReturnRector/RemoveCodeAfterReturnRectorTest.php +++ b/packages/DeadCode/tests/Rector/FunctionLike/RemoveCodeAfterReturnRector/RemoveCodeAfterReturnRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_nested.php.inc']; - yield [__DIR__ . '/Fixture/keep_comment.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/FunctionLike/RemoveDeadReturnRector/RemoveDeadReturnRectorTest.php b/packages/DeadCode/tests/Rector/FunctionLike/RemoveDeadReturnRector/RemoveDeadReturnRectorTest.php index 75a01eeabaff..dc20a3fe0ae1 100644 --- a/packages/DeadCode/tests/Rector/FunctionLike/RemoveDeadReturnRector/RemoveDeadReturnRectorTest.php +++ b/packages/DeadCode/tests/Rector/FunctionLike/RemoveDeadReturnRector/RemoveDeadReturnRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; - yield [__DIR__ . '/Fixture/keep_comment_under.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/If_/RemoveAlwaysTrueIfConditionRector/RemoveAlwaysTrueIfConditionRectorTest.php b/packages/DeadCode/tests/Rector/If_/RemoveAlwaysTrueIfConditionRector/RemoveAlwaysTrueIfConditionRectorTest.php index 9f985a43abc8..b02ad37ae617 100644 --- a/packages/DeadCode/tests/Rector/If_/RemoveAlwaysTrueIfConditionRector/RemoveAlwaysTrueIfConditionRectorTest.php +++ b/packages/DeadCode/tests/Rector/If_/RemoveAlwaysTrueIfConditionRector/RemoveAlwaysTrueIfConditionRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/If_/SimplifyIfElseWithSameContentRector/SimplifyIfElseWithSameContentRectorTest.php b/packages/DeadCode/tests/Rector/If_/SimplifyIfElseWithSameContentRector/SimplifyIfElseWithSameContentRectorTest.php index 9a140d80e1b4..0fbabc997847 100644 --- a/packages/DeadCode/tests/Rector/If_/SimplifyIfElseWithSameContentRector/SimplifyIfElseWithSameContentRectorTest.php +++ b/packages/DeadCode/tests/Rector/If_/SimplifyIfElseWithSameContentRector/SimplifyIfElseWithSameContentRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/with_else_ifs.php.inc']; - yield [__DIR__ . '/Fixture/skip_different_content.php.inc']; - yield [__DIR__ . '/Fixture/skip_missing_else.php.inc']; - yield [__DIR__ . '/Fixture/skip_else_with_no_return.php.inc']; - yield [__DIR__ . '/Fixture/skip_more_than_return.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Instanceof_/RemoveDuplicatedInstanceOfRector/RemoveDuplicatedInstanceOfRectorTest.php b/packages/DeadCode/tests/Rector/Instanceof_/RemoveDuplicatedInstanceOfRector/RemoveDuplicatedInstanceOfRectorTest.php index 94e2aae654f2..aed2d5bbe60c 100644 --- a/packages/DeadCode/tests/Rector/Instanceof_/RemoveDuplicatedInstanceOfRector/RemoveDuplicatedInstanceOfRectorTest.php +++ b/packages/DeadCode/tests/Rector/Instanceof_/RemoveDuplicatedInstanceOfRector/RemoveDuplicatedInstanceOfRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/jump_around_one.php.inc']; - yield [__DIR__ . '/Fixture/nested.php.inc']; - yield [__DIR__ . '/Fixture/skip_multiple_variables.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/MethodCall/RemoveDefaultArgumentValueRector/RemoveDefaultArgumentValueRectorTest.php b/packages/DeadCode/tests/Rector/MethodCall/RemoveDefaultArgumentValueRector/RemoveDefaultArgumentValueRectorTest.php index 476458c0f822..e36a61274954 100644 --- a/packages/DeadCode/tests/Rector/MethodCall/RemoveDefaultArgumentValueRector/RemoveDefaultArgumentValueRectorTest.php +++ b/packages/DeadCode/tests/Rector/MethodCall/RemoveDefaultArgumentValueRector/RemoveDefaultArgumentValueRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_previous_order.php.inc']; - yield [__DIR__ . '/Fixture/function.php.inc']; - yield [__DIR__ . '/Fixture/user_vendor_function.php.inc']; - yield [__DIR__ . '/Fixture/skip_system_function.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Plus/RemoveDeadZeroAndOneOperationRector/RemoveDeadZeroAndOneOperationRectorTest.php b/packages/DeadCode/tests/Rector/Plus/RemoveDeadZeroAndOneOperationRector/RemoveDeadZeroAndOneOperationRectorTest.php index 6c229f6d0c43..e2b9aec1404d 100644 --- a/packages/DeadCode/tests/Rector/Plus/RemoveDeadZeroAndOneOperationRector/RemoveDeadZeroAndOneOperationRectorTest.php +++ b/packages/DeadCode/tests/Rector/Plus/RemoveDeadZeroAndOneOperationRector/RemoveDeadZeroAndOneOperationRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/multiple.php.inc']; - yield [__DIR__ . '/Fixture/assigns.php.inc']; - yield [__DIR__ . '/Fixture/skip_type_change.php.inc']; - yield [__DIR__ . '/Fixture/skip_floats.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Plus/RemoveZeroAndOneBinaryRector/RemoveZeroAndOneBinaryRectorTest.php b/packages/DeadCode/tests/Rector/Plus/RemoveZeroAndOneBinaryRector/RemoveZeroAndOneBinaryRectorTest.php index 6e38b712b8f6..ffcb3fbbcf85 100644 --- a/packages/DeadCode/tests/Rector/Plus/RemoveZeroAndOneBinaryRector/RemoveZeroAndOneBinaryRectorTest.php +++ b/packages/DeadCode/tests/Rector/Plus/RemoveZeroAndOneBinaryRector/RemoveZeroAndOneBinaryRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/assigns.php.inc']; - yield [__DIR__ . '/Fixture/no_unintended.php.inc']; - yield [__DIR__ . '/Fixture/skip_type_change.php.inc']; - yield [__DIR__ . '/Fixture/skip_floats.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Property/RemoveNullPropertyInitializationRector/RemoveNullPropertyInitializationRectorTest.php b/packages/DeadCode/tests/Rector/Property/RemoveNullPropertyInitializationRector/RemoveNullPropertyInitializationRectorTest.php index 3c546cd100a0..0f37a05878f2 100644 --- a/packages/DeadCode/tests/Rector/Property/RemoveNullPropertyInitializationRector/RemoveNullPropertyInitializationRectorTest.php +++ b/packages/DeadCode/tests/Rector/Property/RemoveNullPropertyInitializationRector/RemoveNullPropertyInitializationRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Property/RemoveUnusedPrivatePropertyRector/RemoveUnusedPrivatePropertyRectorTest.php b/packages/DeadCode/tests/Rector/Property/RemoveUnusedPrivatePropertyRector/RemoveUnusedPrivatePropertyRectorTest.php index f0ab3ce2e27b..c59e857800c1 100644 --- a/packages/DeadCode/tests/Rector/Property/RemoveUnusedPrivatePropertyRector/RemoveUnusedPrivatePropertyRectorTest.php +++ b/packages/DeadCode/tests/Rector/Property/RemoveUnusedPrivatePropertyRector/RemoveUnusedPrivatePropertyRectorTest.php @@ -20,17 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/property_assign.php.inc']; - yield [__DIR__ . '/Fixture/with_trait.php.inc']; - yield [__DIR__ . '/Fixture/skip_magically_accessed.php.inc']; - yield [__DIR__ . '/Fixture/skip_magically_accessed_fetch.php.inc']; - yield [__DIR__ . '/Fixture/skip_doctrine_entity_property.php.inc']; - yield [__DIR__ . '/Fixture/skip_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/no_usage_in_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/no_usage_outside_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_anonymous_function.php.inc']; - yield [__DIR__ . '/Fixture/skip_nested_closure.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/StaticCall/RemoveParentCallWithoutParentRector/RemoveParentCallWithoutParentRectorTest.php b/packages/DeadCode/tests/Rector/StaticCall/RemoveParentCallWithoutParentRector/RemoveParentCallWithoutParentRectorTest.php index 37693a3e6ac3..aff9a4101573 100644 --- a/packages/DeadCode/tests/Rector/StaticCall/RemoveParentCallWithoutParentRector/RemoveParentCallWithoutParentRectorTest.php +++ b/packages/DeadCode/tests/Rector/StaticCall/RemoveParentCallWithoutParentRector/RemoveParentCallWithoutParentRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/parent_but_no_method.php.inc']; - yield [__DIR__ . '/Fixture/skip_trait.php.inc']; - yield [__DIR__ . '/Fixture/edge_case.php.inc']; - yield [__DIR__ . '/Fixture/anonymous_class_without_parent.php.inc']; - yield [__DIR__ . '/Fixture/anonymous_class_with_parent.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Stmt/RemoveUnreachableStatementRector/RemoveUnreachableStatementRectorTest.php b/packages/DeadCode/tests/Rector/Stmt/RemoveUnreachableStatementRector/RemoveUnreachableStatementRectorTest.php index 160ce12438c4..4b2a7a7d93e5 100644 --- a/packages/DeadCode/tests/Rector/Stmt/RemoveUnreachableStatementRector/RemoveUnreachableStatementRectorTest.php +++ b/packages/DeadCode/tests/Rector/Stmt/RemoveUnreachableStatementRector/RemoveUnreachableStatementRectorTest.php @@ -20,14 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/after_return.php.inc']; - yield [__DIR__ . '/Fixture/after_throws.php.inc']; - yield [__DIR__ . '/Fixture/keep_false_positive_always_true_if.php.inc']; - yield [__DIR__ . '/Fixture/skip_condition_before.php.inc']; - yield [__DIR__ . '/Fixture/skip_marked_skipped_test_file.php.inc']; - yield [__DIR__ . '/Fixture/keep_comment.php.inc']; - yield [__DIR__ . '/Fixture/if_else.php.inc']; - yield [__DIR__ . '/Fixture/keep_false_positive_while.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DeadCode/tests/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/RemoveDuplicatedCaseInSwitchRectorTest.php b/packages/DeadCode/tests/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/RemoveDuplicatedCaseInSwitchRectorTest.php index f173d814da7c..4782d6125ccb 100644 --- a/packages/DeadCode/tests/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/RemoveDuplicatedCaseInSwitchRectorTest.php +++ b/packages/DeadCode/tests/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/RemoveDuplicatedCaseInSwitchRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/ChangeGetIdTypeToUuidRectorTest.php b/packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/ChangeGetIdTypeToUuidRectorTest.php index 539eb7da44ff..025dd62280ed 100644 --- a/packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/ChangeGetIdTypeToUuidRectorTest.php +++ b/packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/ChangeGetIdTypeToUuidRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/get_id.inc.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/Fixture/get_id.inc.php b/packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/Fixture/get_id.php.inc similarity index 100% rename from packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/Fixture/get_id.inc.php rename to packages/Doctrine/tests/Rector/ClassMethod/ChangeGetIdTypeToUuidRector/Fixture/get_id.php.inc diff --git a/packages/Doctrine/tests/Rector/ClassMethod/ChangeReturnTypeOfClassMethodWithGetIdRector/ChangeReturnTypeOfClassMethodWithGetIdRectorTest.php b/packages/Doctrine/tests/Rector/ClassMethod/ChangeReturnTypeOfClassMethodWithGetIdRector/ChangeReturnTypeOfClassMethodWithGetIdRectorTest.php index 6c82b3555f70..c9a90b478b0c 100644 --- a/packages/Doctrine/tests/Rector/ClassMethod/ChangeReturnTypeOfClassMethodWithGetIdRector/ChangeReturnTypeOfClassMethodWithGetIdRectorTest.php +++ b/packages/Doctrine/tests/Rector/ClassMethod/ChangeReturnTypeOfClassMethodWithGetIdRector/ChangeReturnTypeOfClassMethodWithGetIdRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/ChangeSetIdTypeToUuidRectorTest.php b/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/ChangeSetIdTypeToUuidRectorTest.php index 69ee893ac5e8..b7223af35870 100644 --- a/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/ChangeSetIdTypeToUuidRectorTest.php +++ b/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/ChangeSetIdTypeToUuidRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/set_id.inc.php']; - yield [__DIR__ . '/Fixture/skip_setted_id.inc.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/set_id.inc.php b/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/set_id.php.inc similarity index 100% rename from packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/set_id.inc.php rename to packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/set_id.php.inc diff --git a/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/skip_setted_id.inc.php b/packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/skip_setted_id.php.inc similarity index 100% rename from packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/skip_setted_id.inc.php rename to packages/Doctrine/tests/Rector/ClassMethod/ChangeSetIdTypeToUuidRector/Fixture/skip_setted_id.php.inc diff --git a/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/AddUuidMirrorForRelationPropertyRectorTest.php b/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/AddUuidMirrorForRelationPropertyRectorTest.php index 611c4f0871c8..a236f26ceac4 100644 --- a/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/AddUuidMirrorForRelationPropertyRectorTest.php +++ b/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/AddUuidMirrorForRelationPropertyRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/to_one.php.inc']; - yield [__DIR__ . '/Fixture/to_many.php.inc']; - yield [__DIR__ . '/Fixture/many_to_many_with_extra_name.php.inc']; - // skip - yield [__DIR__ . '/Fixture/skip_already_added.php.inc']; - yield [__DIR__ . '/Fixture/skip_to_many_without_target_entity_uuid.php.inc']; - yield [__DIR__ . '/Fixture/skip_one_to_one_mapped_by.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/AddUuidToEntityWhereMissingRectorTest.php b/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/AddUuidToEntityWhereMissingRectorTest.php index d6bf6992f4a2..b5f8cee268d7 100644 --- a/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/AddUuidToEntityWhereMissingRectorTest.php +++ b/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/AddUuidToEntityWhereMissingRectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/already_has_constructor.php.inc']; - yield [__DIR__ . '/Fixture/process_string_id.php.inc']; - yield [__DIR__ . '/Fixture/with_parent_constructor.php.inc']; - yield [__DIR__ . '/Fixture/add_single_table_inheritance.php.inc']; - yield [__DIR__ . '/Fixture/add_single_table_inheritance_with_identifier.php.inc']; - // skip - yield [__DIR__ . '/Fixture/skip_id_with_uuid_type.php.inc']; - yield [__DIR__ . '/Fixture/skip_id_with_uuid_binary_type.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Class_/AlwaysInitializeUuidInEntityRector/AlwaysInitializeUuidInEntityRectorTest.php b/packages/Doctrine/tests/Rector/Class_/AlwaysInitializeUuidInEntityRector/AlwaysInitializeUuidInEntityRectorTest.php index d421b9242aeb..94212a9f12b5 100644 --- a/packages/Doctrine/tests/Rector/Class_/AlwaysInitializeUuidInEntityRector/AlwaysInitializeUuidInEntityRectorTest.php +++ b/packages/Doctrine/tests/Rector/Class_/AlwaysInitializeUuidInEntityRector/AlwaysInitializeUuidInEntityRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/add_uuid_init.php.inc']; - yield [__DIR__ . '/Fixture/add_uuid_init_to_construct.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_added.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Class_/ManagerRegistryGetManagerToEntityManagerRector/ManagerRegistryGetManagerToEntityManagerRectorTest.php b/packages/Doctrine/tests/Rector/Class_/ManagerRegistryGetManagerToEntityManagerRector/ManagerRegistryGetManagerToEntityManagerRectorTest.php index 92cd9df54bee..75ed8dd62e95 100644 --- a/packages/Doctrine/tests/Rector/Class_/ManagerRegistryGetManagerToEntityManagerRector/ManagerRegistryGetManagerToEntityManagerRectorTest.php +++ b/packages/Doctrine/tests/Rector/Class_/ManagerRegistryGetManagerToEntityManagerRector/ManagerRegistryGetManagerToEntityManagerRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_different_methods.php.inc']; - yield [__DIR__ . '/Fixture/do_not_remove_registry_on_non_get_repo_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector/RemoveRepositoryFromEntityAnnotationRectorTest.php b/packages/Doctrine/tests/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector/RemoveRepositoryFromEntityAnnotationRectorTest.php index b560bc94e4c6..11acd80a5154 100644 --- a/packages/Doctrine/tests/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector/RemoveRepositoryFromEntityAnnotationRectorTest.php +++ b/packages/Doctrine/tests/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector/RemoveRepositoryFromEntityAnnotationRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_done.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Identical/ChangeIdenticalUuidToEqualsMethodCallRector/ChangeIdenticalUuidToEqualsMethodCallRectorTest.php b/packages/Doctrine/tests/Rector/Identical/ChangeIdenticalUuidToEqualsMethodCallRector/ChangeIdenticalUuidToEqualsMethodCallRectorTest.php index ef3a8eb79b4b..dc249f931dc4 100644 --- a/packages/Doctrine/tests/Rector/Identical/ChangeIdenticalUuidToEqualsMethodCallRector/ChangeIdenticalUuidToEqualsMethodCallRectorTest.php +++ b/packages/Doctrine/tests/Rector/Identical/ChangeIdenticalUuidToEqualsMethodCallRector/ChangeIdenticalUuidToEqualsMethodCallRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/MethodCall/ChangeGetUuidMethodCallToGetIdRector/ChangeGetUuidMethodCallToGetIdRectorTest.php b/packages/Doctrine/tests/Rector/MethodCall/ChangeGetUuidMethodCallToGetIdRector/ChangeGetUuidMethodCallToGetIdRectorTest.php index 56c1680557bf..965768d173ff 100644 --- a/packages/Doctrine/tests/Rector/MethodCall/ChangeGetUuidMethodCallToGetIdRector/ChangeGetUuidMethodCallToGetIdRectorTest.php +++ b/packages/Doctrine/tests/Rector/MethodCall/ChangeGetUuidMethodCallToGetIdRector/ChangeGetUuidMethodCallToGetIdRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/MethodCall/ChangeSetIdToUuidValueRector/ChangeSetIdToUuidValueRectorTest.php b/packages/Doctrine/tests/Rector/MethodCall/ChangeSetIdToUuidValueRector/ChangeSetIdToUuidValueRectorTest.php index cc57d2a5ec6b..2a16462ed736 100644 --- a/packages/Doctrine/tests/Rector/MethodCall/ChangeSetIdToUuidValueRector/ChangeSetIdToUuidValueRectorTest.php +++ b/packages/Doctrine/tests/Rector/MethodCall/ChangeSetIdToUuidValueRector/ChangeSetIdToUuidValueRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/no_set_uuid.php.inc']; - yield [__DIR__ . '/Fixture/other_direction.php.inc']; - yield [__DIR__ . '/Fixture/with_constant.php.inc']; - yield [__DIR__ . '/Fixture/with_int_constant_only.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/MethodCall/EntityAliasToClassConstantReferenceRector/EntityAliasToClassConstantReferenceRectorTest.php b/packages/Doctrine/tests/Rector/MethodCall/EntityAliasToClassConstantReferenceRector/EntityAliasToClassConstantReferenceRectorTest.php index 4e7d7ce0cda2..f0e6294df12c 100644 --- a/packages/Doctrine/tests/Rector/MethodCall/EntityAliasToClassConstantReferenceRector/EntityAliasToClassConstantReferenceRectorTest.php +++ b/packages/Doctrine/tests/Rector/MethodCall/EntityAliasToClassConstantReferenceRector/EntityAliasToClassConstantReferenceRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Doctrine/tests/Rector/Property/AddUuidAnnotationsToIdPropertyRector/AddUuidAnnotationsToIdPropertyRectorTest.php b/packages/Doctrine/tests/Rector/Property/AddUuidAnnotationsToIdPropertyRector/AddUuidAnnotationsToIdPropertyRectorTest.php index ce4e880a5efd..f88a392c7b54 100644 --- a/packages/Doctrine/tests/Rector/Property/AddUuidAnnotationsToIdPropertyRector/AddUuidAnnotationsToIdPropertyRectorTest.php +++ b/packages/Doctrine/tests/Rector/Property/AddUuidAnnotationsToIdPropertyRector/AddUuidAnnotationsToIdPropertyRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/column.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidColumnPropertyRector/RemoveTemporaryUuidColumnPropertyRectorTest.php b/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidColumnPropertyRector/RemoveTemporaryUuidColumnPropertyRectorTest.php index 6dbeef0c16bc..f6cc9911fc78 100644 --- a/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidColumnPropertyRector/RemoveTemporaryUuidColumnPropertyRectorTest.php +++ b/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidColumnPropertyRector/RemoveTemporaryUuidColumnPropertyRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidRelationPropertyRector/RemoveTemporaryUuidRelationPropertyRectorTest.php b/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidRelationPropertyRector/RemoveTemporaryUuidRelationPropertyRectorTest.php index e13289b5c27a..40a7f6ae1971 100644 --- a/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidRelationPropertyRector/RemoveTemporaryUuidRelationPropertyRectorTest.php +++ b/packages/Doctrine/tests/Rector/Property/RemoveTemporaryUuidRelationPropertyRector/RemoveTemporaryUuidRelationPropertyRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/DoctrineCodeQuality/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/InitializeDefaultEntityCollectionRectorTest.php b/packages/DoctrineCodeQuality/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/InitializeDefaultEntityCollectionRectorTest.php index c224449bcc06..3881891af457 100644 --- a/packages/DoctrineCodeQuality/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/InitializeDefaultEntityCollectionRectorTest.php +++ b/packages/DoctrineCodeQuality/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/InitializeDefaultEntityCollectionRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/existing_constructor.php.inc']; - yield [__DIR__ . '/Fixture/skip_added.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ElasticSearchDSL/tests/Rector/MethodCall/MigrateFilterToQueryRector/MigrateFilterToQueryRectorTest.php b/packages/ElasticSearchDSL/tests/Rector/MethodCall/MigrateFilterToQueryRector/MigrateFilterToQueryRectorTest.php index 7ab354468cbf..3196d8f51720 100644 --- a/packages/ElasticSearchDSL/tests/Rector/MethodCall/MigrateFilterToQueryRector/MigrateFilterToQueryRectorTest.php +++ b/packages/ElasticSearchDSL/tests/Rector/MethodCall/MigrateFilterToQueryRector/MigrateFilterToQueryRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Guzzle/tests/Rector/MethodCall/MessageAsArrayRector/MessageAsArrayRectorTest.php b/packages/Guzzle/tests/Rector/MethodCall/MessageAsArrayRector/MessageAsArrayRectorTest.php index 3144d8990a79..3307702de48e 100644 --- a/packages/Guzzle/tests/Rector/MethodCall/MessageAsArrayRector/MessageAsArrayRectorTest.php +++ b/packages/Guzzle/tests/Rector/MethodCall/MessageAsArrayRector/MessageAsArrayRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Laravel/tests/Rector/FuncCall/HelperFunctionToConstructorInjectionRector/HelperFunctionToConstructorInjectionRectorTest.php b/packages/Laravel/tests/Rector/FuncCall/HelperFunctionToConstructorInjectionRector/HelperFunctionToConstructorInjectionRectorTest.php index 464a2795a211..55fe6bfb9c5e 100644 --- a/packages/Laravel/tests/Rector/FuncCall/HelperFunctionToConstructorInjectionRector/HelperFunctionToConstructorInjectionRectorTest.php +++ b/packages/Laravel/tests/Rector/FuncCall/HelperFunctionToConstructorInjectionRector/HelperFunctionToConstructorInjectionRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/view.php.inc']; - yield [__DIR__ . '/Fixture/broadcast.php.inc']; - yield [__DIR__ . '/Fixture/session.php.inc']; - yield [__DIR__ . '/Fixture/route.php.inc']; - yield [__DIR__ . '/Fixture/config.php.inc']; - yield [__DIR__ . '/Fixture/back.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Laravel/tests/Rector/StaticCall/FacadeStaticCallToConstructorInjectionRector/FacadeStaticCallToConstructorInjectionRectorTest.php b/packages/Laravel/tests/Rector/StaticCall/FacadeStaticCallToConstructorInjectionRector/FacadeStaticCallToConstructorInjectionRectorTest.php index 92dab151e09b..d0ea9a1fe312 100644 --- a/packages/Laravel/tests/Rector/StaticCall/FacadeStaticCallToConstructorInjectionRector/FacadeStaticCallToConstructorInjectionRectorTest.php +++ b/packages/Laravel/tests/Rector/StaticCall/FacadeStaticCallToConstructorInjectionRector/FacadeStaticCallToConstructorInjectionRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Laravel/tests/Rector/StaticCall/MinutesToSecondsInCacheRector/MinutesToSecondsInCacheRectorTest.php b/packages/Laravel/tests/Rector/StaticCall/MinutesToSecondsInCacheRector/MinutesToSecondsInCacheRectorTest.php index 71992e585842..a8eb7ca6aea1 100644 --- a/packages/Laravel/tests/Rector/StaticCall/MinutesToSecondsInCacheRector/MinutesToSecondsInCacheRectorTest.php +++ b/packages/Laravel/tests/Rector/StaticCall/MinutesToSecondsInCacheRector/MinutesToSecondsInCacheRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Laravel/tests/Rector/StaticCall/Redirect301ToPermanentRedirectRector/Redirect301ToPermanentRedirectRectorTest.php b/packages/Laravel/tests/Rector/StaticCall/Redirect301ToPermanentRedirectRector/Redirect301ToPermanentRedirectRectorTest.php index 436787618454..50ba9312b460 100644 --- a/packages/Laravel/tests/Rector/StaticCall/Redirect301ToPermanentRedirectRector/Redirect301ToPermanentRedirectRectorTest.php +++ b/packages/Laravel/tests/Rector/StaticCall/Redirect301ToPermanentRedirectRector/Redirect301ToPermanentRedirectRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Laravel/tests/Rector/StaticCall/RequestStaticValidateToInjectRector/RequestStaticValidateToInjectRectorTest.php b/packages/Laravel/tests/Rector/StaticCall/RequestStaticValidateToInjectRector/RequestStaticValidateToInjectRectorTest.php index 0ff787ad77b4..35fb14c1ef35 100644 --- a/packages/Laravel/tests/Rector/StaticCall/RequestStaticValidateToInjectRector/RequestStaticValidateToInjectRectorTest.php +++ b/packages/Laravel/tests/Rector/StaticCall/RequestStaticValidateToInjectRector/RequestStaticValidateToInjectRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture-alias.php.inc']; - yield [__DIR__ . '/Fixture/function.php.inc']; - yield [__DIR__ . '/Fixture/function2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Legacy/tests/Rector/ClassMethod/ChangeSingletonToServiceRector/ChangeSingletonToServiceRectorTest.php b/packages/Legacy/tests/Rector/ClassMethod/ChangeSingletonToServiceRector/ChangeSingletonToServiceRectorTest.php index 73394e8a078b..796dfcc4d949 100644 --- a/packages/Legacy/tests/Rector/ClassMethod/ChangeSingletonToServiceRector/ChangeSingletonToServiceRectorTest.php +++ b/packages/Legacy/tests/Rector/ClassMethod/ChangeSingletonToServiceRector/ChangeSingletonToServiceRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/static_variable.php.inc']; - yield [__DIR__ . '/Fixture/protected_construct.php.inc']; - yield [__DIR__ . '/Fixture/non_empty_protected_construct.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/MysqlToMysqli/tests/Rector/Assign/MysqlAssignToMysqliRector/MysqlAssignToMysqliRectorTest.php b/packages/MysqlToMysqli/tests/Rector/Assign/MysqlAssignToMysqliRector/MysqlAssignToMysqliRectorTest.php index 49d81d113cd4..43936d699a5f 100644 --- a/packages/MysqlToMysqli/tests/Rector/Assign/MysqlAssignToMysqliRector/MysqlAssignToMysqliRectorTest.php +++ b/packages/MysqlToMysqli/tests/Rector/Assign/MysqlAssignToMysqliRector/MysqlAssignToMysqliRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlFuncCallToMysqliRector/MysqlFuncCallToMysqliRectorTest.php b/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlFuncCallToMysqliRector/MysqlFuncCallToMysqliRectorTest.php index db1defbef93c..94efb73f47a4 100644 --- a/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlFuncCallToMysqliRector/MysqlFuncCallToMysqliRectorTest.php +++ b/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlFuncCallToMysqliRector/MysqlFuncCallToMysqliRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/MysqlPConnectToMysqliConnectRectorTest.php b/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/MysqlPConnectToMysqliConnectRectorTest.php index 08515a73b9db..ca0fb006ad2d 100644 --- a/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/MysqlPConnectToMysqliConnectRectorTest.php +++ b/packages/MysqlToMysqli/tests/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/MysqlPConnectToMysqliConnectRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/MysqlToMysqli/tests/SetTest.php b/packages/MysqlToMysqli/tests/SetTest.php index bae37e29eda6..8bc289696d18 100644 --- a/packages/MysqlToMysqli/tests/SetTest.php +++ b/packages/MysqlToMysqli/tests/SetTest.php @@ -19,7 +19,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/SetFixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function provideConfig(): string diff --git a/packages/Nette/tests/Rector/FuncCall/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRector/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRectorTest.php b/packages/Nette/tests/Rector/FuncCall/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRector/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRectorTest.php index c9c4ce53ad15..a59fdd192c5e 100644 --- a/packages/Nette/tests/Rector/FuncCall/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRector/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRectorTest.php +++ b/packages/Nette/tests/Rector/FuncCall/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRector/JsonDecodeEncodeToNetteUtilsJsonDecodeEncodeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/json_decode.php.inc']; - yield [__DIR__ . '/Fixture/json_encode.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Nette/tests/Rector/FuncCall/PregFunctionToNetteUtilsStringsRector/PregFunctionToNetteUtilsStringsRectorTest.php b/packages/Nette/tests/Rector/FuncCall/PregFunctionToNetteUtilsStringsRector/PregFunctionToNetteUtilsStringsRectorTest.php index ba1fbe0b98e2..5ef8ca693e8f 100644 --- a/packages/Nette/tests/Rector/FuncCall/PregFunctionToNetteUtilsStringsRector/PregFunctionToNetteUtilsStringsRectorTest.php +++ b/packages/Nette/tests/Rector/FuncCall/PregFunctionToNetteUtilsStringsRector/PregFunctionToNetteUtilsStringsRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/preg_match.php.inc']; - yield [__DIR__ . '/Fixture/preg_match_all.php.inc']; - yield [__DIR__ . '/Fixture/preg_split.php.inc']; - yield [__DIR__ . '/Fixture/preg_replace.php.inc']; - yield [__DIR__ . '/Fixture/preg_replace_callback.php.inc']; - yield [__DIR__ . '/Fixture/preg_match_identical_one.php.inc']; - yield [__DIR__ . '/Fixture/preg_match_identical_one_with_matches.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Nette/tests/Rector/FuncCall/SubstrStrlenFunctionToNetteUtilsStringsRector/SubstrStrlenFunctionToNetteUtilsStringsRectorTest.php b/packages/Nette/tests/Rector/FuncCall/SubstrStrlenFunctionToNetteUtilsStringsRector/SubstrStrlenFunctionToNetteUtilsStringsRectorTest.php index 3edba8a51ca5..957686785071 100644 --- a/packages/Nette/tests/Rector/FuncCall/SubstrStrlenFunctionToNetteUtilsStringsRector/SubstrStrlenFunctionToNetteUtilsStringsRectorTest.php +++ b/packages/Nette/tests/Rector/FuncCall/SubstrStrlenFunctionToNetteUtilsStringsRector/SubstrStrlenFunctionToNetteUtilsStringsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/substr.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Nette/tests/Rector/Identical/EndsWithFunctionToNetteUtilsStringsRector/EndsWithFunctionToNetteUtilsStringsRectorTest.php b/packages/Nette/tests/Rector/Identical/EndsWithFunctionToNetteUtilsStringsRector/EndsWithFunctionToNetteUtilsStringsRectorTest.php index 28bef8edabd3..cee124179fbf 100644 --- a/packages/Nette/tests/Rector/Identical/EndsWithFunctionToNetteUtilsStringsRector/EndsWithFunctionToNetteUtilsStringsRectorTest.php +++ b/packages/Nette/tests/Rector/Identical/EndsWithFunctionToNetteUtilsStringsRector/EndsWithFunctionToNetteUtilsStringsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Nette/tests/Rector/Identical/StartsWithFunctionToNetteUtilsStringsRector/StartsWithFunctionToNetteUtilsStringsRectorTest.php b/packages/Nette/tests/Rector/Identical/StartsWithFunctionToNetteUtilsStringsRector/StartsWithFunctionToNetteUtilsStringsRectorTest.php index ce9e0ba754c1..fd4f1113d371 100644 --- a/packages/Nette/tests/Rector/Identical/StartsWithFunctionToNetteUtilsStringsRector/StartsWithFunctionToNetteUtilsStringsRectorTest.php +++ b/packages/Nette/tests/Rector/Identical/StartsWithFunctionToNetteUtilsStringsRector/StartsWithFunctionToNetteUtilsStringsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Nette/tests/Rector/NotIdentical/StrposToStringsContainsRector/StrposToStringsContainsRectorTest.php b/packages/Nette/tests/Rector/NotIdentical/StrposToStringsContainsRector/StrposToStringsContainsRectorTest.php index 1bc9f92b074c..2a57f50e2d76 100644 --- a/packages/Nette/tests/Rector/NotIdentical/StrposToStringsContainsRector/StrposToStringsContainsRectorTest.php +++ b/packages/Nette/tests/Rector/NotIdentical/StrposToStringsContainsRector/StrposToStringsContainsRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteTesterToPHPUnit/tests/Rector/Class_/NetteTesterClassToPHPUnitClassRector/NetteTesterPHPUnitRectorTest.php b/packages/NetteTesterToPHPUnit/tests/Rector/Class_/NetteTesterClassToPHPUnitClassRector/NetteTesterPHPUnitRectorTest.php index 9e4c205f9afe..6848a276b2e5 100644 --- a/packages/NetteTesterToPHPUnit/tests/Rector/Class_/NetteTesterClassToPHPUnitClassRector/NetteTesterPHPUnitRectorTest.php +++ b/packages/NetteTesterToPHPUnit/tests/Rector/Class_/NetteTesterClassToPHPUnitClassRector/NetteTesterPHPUnitRectorTest.php @@ -25,12 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/test_class.php.inc']; - yield [__DIR__ . '/Fixture/assert_true.php.inc']; - yield [__DIR__ . '/Fixture/assert_type.php.inc']; - yield [__DIR__ . '/Fixture/various_asserts.php.inc']; - yield [__DIR__ . '/Fixture/kdyby_tests_events.php.inc']; - yield [__DIR__ . '/Fixture/data_provider.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/NetteToSymfony/tests/Rector/ClassMethod/RenameEventNamesInEventSubscriberRector/RenameEventNamesInEventSubscriberRectorTest.php b/packages/NetteToSymfony/tests/Rector/ClassMethod/RenameEventNamesInEventSubscriberRector/RenameEventNamesInEventSubscriberRectorTest.php index d87be71e4467..1959b934cbf1 100644 --- a/packages/NetteToSymfony/tests/Rector/ClassMethod/RenameEventNamesInEventSubscriberRector/RenameEventNamesInEventSubscriberRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/ClassMethod/RenameEventNamesInEventSubscriberRector/RenameEventNamesInEventSubscriberRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/presenter_startup.php.inc']; - yield [__DIR__ . '/Fixture/event_class.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/RouterListToControllerAnnotationsRectorTest.php b/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/RouterListToControllerAnnotationsRectorTest.php index f822b54ac9ea..37b8c6e97df9 100644 --- a/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/RouterListToControllerAnnotationsRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/RouterListToControllerAnnotationsRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/new_route_to_annotation.php.inc']; - yield [__DIR__ . '/Fixture/static_route_to_annotation.php.inc']; - yield [__DIR__ . '/Fixture/constant_reference_route_to_annotation.php.inc']; - yield [__DIR__ . '/Fixture/method_named_routes.php.inc']; - yield [__DIR__ . '/Fixture/general_method_named_routes.php.inc']; - yield [__DIR__ . '/Fixture/with_parameter.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteToSymfony/tests/Rector/Class_/NetteControlToSymfonyControllerRector/NetteControlToSymfonyControllerRectorTest.php b/packages/NetteToSymfony/tests/Rector/Class_/NetteControlToSymfonyControllerRector/NetteControlToSymfonyControllerRectorTest.php index 15fc2474df7b..0b066e99f09f 100644 --- a/packages/NetteToSymfony/tests/Rector/Class_/NetteControlToSymfonyControllerRector/NetteControlToSymfonyControllerRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/Class_/NetteControlToSymfonyControllerRector/NetteControlToSymfonyControllerRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/NetteFormToSymfonyFormRectorTest.php b/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/NetteFormToSymfonyFormRectorTest.php index 836bc24223da..fab46cefb352 100644 --- a/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/NetteFormToSymfonyFormRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/NetteFormToSymfonyFormRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/FromHttpRequestGetHeaderToHeadersGetRectorTest.php b/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/FromHttpRequestGetHeaderToHeadersGetRectorTest.php index 284abc769c92..f172f06228ab 100644 --- a/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/FromHttpRequestGetHeaderToHeadersGetRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/FromHttpRequestGetHeaderToHeadersGetRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/missing_argument.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteToSymfony/tests/Rector/MethodCall/FromRequestGetParameterToAttributesGetRector/FromRequestGetParameterToAttributesGetRectorTest.php b/packages/NetteToSymfony/tests/Rector/MethodCall/FromRequestGetParameterToAttributesGetRector/FromRequestGetParameterToAttributesGetRectorTest.php index 786ecea78e58..c26b221e5f8f 100644 --- a/packages/NetteToSymfony/tests/Rector/MethodCall/FromRequestGetParameterToAttributesGetRector/FromRequestGetParameterToAttributesGetRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/MethodCall/FromRequestGetParameterToAttributesGetRector/FromRequestGetParameterToAttributesGetRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NetteToSymfony/tests/Rector/MethodCall/WrapTransParameterNameRector/WrapTransParameterNameRectorTest.php b/packages/NetteToSymfony/tests/Rector/MethodCall/WrapTransParameterNameRector/WrapTransParameterNameRectorTest.php index b403bf3ec000..2c5ce0ca2f30 100644 --- a/packages/NetteToSymfony/tests/Rector/MethodCall/WrapTransParameterNameRector/WrapTransParameterNameRectorTest.php +++ b/packages/NetteToSymfony/tests/Rector/MethodCall/WrapTransParameterNameRector/WrapTransParameterNameRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/Fixture/anonymousClass.php.inc b/packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/Fixture/anonymous_class.php.inc similarity index 100% rename from packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/Fixture/anonymousClass.php.inc rename to packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/Fixture/anonymous_class.php.inc diff --git a/packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/FunctionMethodAndClassNodeVisitorTest.php b/packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/FunctionMethodAndClassNodeVisitorTest.php index 92b4572f5f27..61b3f7c69cfd 100644 --- a/packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/FunctionMethodAndClassNodeVisitorTest.php +++ b/packages/NodeTypeResolver/tests/NodeVisitor/FunctionMethodAndClassNodeVisitor/FunctionMethodAndClassNodeVisitorTest.php @@ -14,12 +14,6 @@ final class FunctionMethodAndClassNodeVisitorTest extends AbstractNodeVisitorTestCase { - public function provideDataForTest(): Iterator - { - yield [__DIR__ . '/Fixture/simple.php.inc']; - yield [__DIR__ . '/Fixture/anonymousClass.php.inc']; - } - /** * @dataProvider provideDataForTest(); */ @@ -28,6 +22,11 @@ public function testVisitor(string $file): void $this->doTestFile($file); } + public function provideDataForTest(): Iterator + { + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture', '*.php.inc'); + } + /** * @param Node[] $nodes */ diff --git a/packages/PHPStan/tests/Rector/Assign/PHPStormVarAnnotationRector/PHPStormVarAnnotationRectorTest.php b/packages/PHPStan/tests/Rector/Assign/PHPStormVarAnnotationRector/PHPStormVarAnnotationRectorTest.php index 580e3938e82f..0b6d81f31d60 100644 --- a/packages/PHPStan/tests/Rector/Assign/PHPStormVarAnnotationRector/PHPStormVarAnnotationRectorTest.php +++ b/packages/PHPStan/tests/Rector/Assign/PHPStormVarAnnotationRector/PHPStormVarAnnotationRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPStan/tests/Rector/Cast/RecastingRemovalRector/RecastingRemovalRectorTest.php b/packages/PHPStan/tests/Rector/Cast/RecastingRemovalRector/RecastingRemovalRectorTest.php index b6fa7c0ee393..34ca63aa082e 100644 --- a/packages/PHPStan/tests/Rector/Cast/RecastingRemovalRector/RecastingRemovalRectorTest.php +++ b/packages/PHPStan/tests/Rector/Cast/RecastingRemovalRector/RecastingRemovalRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPStan/tests/Rector/Node/RemoveNonExistingVarAnnotationRector/RemoveNonExistingVarAnnotationRectorTest.php b/packages/PHPStan/tests/Rector/Node/RemoveNonExistingVarAnnotationRector/RemoveNonExistingVarAnnotationRectorTest.php index f2db691eba3f..dacc45fe481f 100644 --- a/packages/PHPStan/tests/Rector/Node/RemoveNonExistingVarAnnotationRector/RemoveNonExistingVarAnnotationRectorTest.php +++ b/packages/PHPStan/tests/Rector/Node/RemoveNonExistingVarAnnotationRector/RemoveNonExistingVarAnnotationRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/subcontent.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/if_case.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/AddDoesNotPerformAssertionToNonAssertingTestRectorTest.php b/packages/PHPUnit/tests/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/AddDoesNotPerformAssertionToNonAssertingTestRectorTest.php index 834e4d40d037..ab7eb239b48e 100644 --- a/packages/PHPUnit/tests/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/AddDoesNotPerformAssertionToNonAssertingTestRectorTest.php +++ b/packages/PHPUnit/tests/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/AddDoesNotPerformAssertionToNonAssertingTestRectorTest.php @@ -20,16 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/test_in_annotation.php.inc']; - yield [__DIR__ . '/Fixture/keep_assert.php.inc']; - yield [__DIR__ . '/Fixture/keep_expected_exception.php.inc']; - yield [__DIR__ . '/Fixture/keep_assert_in_call.php.inc']; - yield [__DIR__ . '/Fixture/keep_assert_in_static_call.php.inc']; - yield [__DIR__ . '/Fixture/keep_non_public.php.inc']; - yield [__DIR__ . '/Fixture/keep_non_test.php.inc']; - yield [__DIR__ . '/Fixture/keep_with_parent_method_assert.php.inc']; - yield [__DIR__ . '/Fixture/keep_with_parent_method_static_assert.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/ClassMethod/EnsureDataProviderInDocBlockRector/EnsureDataProviderInDocBlockRectorTest.php b/packages/PHPUnit/tests/Rector/ClassMethod/EnsureDataProviderInDocBlockRector/EnsureDataProviderInDocBlockRectorTest.php index 90e58e1b3f26..0cbf0c29111e 100644 --- a/packages/PHPUnit/tests/Rector/ClassMethod/EnsureDataProviderInDocBlockRector/EnsureDataProviderInDocBlockRectorTest.php +++ b/packages/PHPUnit/tests/Rector/ClassMethod/EnsureDataProviderInDocBlockRector/EnsureDataProviderInDocBlockRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/multiple_comment.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/ClassMethod/FixDataProviderAnnotationTypoRector/FixDataProviderAnnotationTypoRectorTest.php b/packages/PHPUnit/tests/Rector/ClassMethod/FixDataProviderAnnotationTypoRector/FixDataProviderAnnotationTypoRectorTest.php index a091b3a086ad..adcaa9ce4401 100644 --- a/packages/PHPUnit/tests/Rector/ClassMethod/FixDataProviderAnnotationTypoRector/FixDataProviderAnnotationTypoRectorTest.php +++ b/packages/PHPUnit/tests/Rector/ClassMethod/FixDataProviderAnnotationTypoRector/FixDataProviderAnnotationTypoRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/Class_/AddSeeTestAnnotationRector/AddSeeTestAnnotationRectorTest.php b/packages/PHPUnit/tests/Rector/Class_/AddSeeTestAnnotationRector/AddSeeTestAnnotationRectorTest.php index 8551efff056d..5fcfad5a8873 100644 --- a/packages/PHPUnit/tests/Rector/Class_/AddSeeTestAnnotationRector/AddSeeTestAnnotationRectorTest.php +++ b/packages/PHPUnit/tests/Rector/Class_/AddSeeTestAnnotationRector/AddSeeTestAnnotationRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/different_namespace.php.inc']; - yield [__DIR__ . '/Fixture/surrounded_doc.php.inc']; - yield [__DIR__ . '/Fixture/add_to_doc_block.php.inc']; - yield [__DIR__ . '/Fixture/skip_existing.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/Class_/ArrayArgumentInTestToDataProviderRector/ArrayArgumentInTestToDataProviderRectorTest.php b/packages/PHPUnit/tests/Rector/Class_/ArrayArgumentInTestToDataProviderRector/ArrayArgumentInTestToDataProviderRectorTest.php index 2888b8496105..5bbc4017c601 100644 --- a/packages/PHPUnit/tests/Rector/Class_/ArrayArgumentInTestToDataProviderRector/ArrayArgumentInTestToDataProviderRectorTest.php +++ b/packages/PHPUnit/tests/Rector/Class_/ArrayArgumentInTestToDataProviderRector/ArrayArgumentInTestToDataProviderRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/various_types.php.inc']; - yield [__DIR__ . '/Fixture/two_arguments.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/PHPUnit/tests/Rector/Class_/RemoveDataProviderTestPrefixRector/RemoveDataProviderTestPrefixRectorTest.php b/packages/PHPUnit/tests/Rector/Class_/RemoveDataProviderTestPrefixRector/RemoveDataProviderTestPrefixRectorTest.php index dacc08a90193..f9181e7ae54f 100644 --- a/packages/PHPUnit/tests/Rector/Class_/RemoveDataProviderTestPrefixRector/RemoveDataProviderTestPrefixRectorTest.php +++ b/packages/PHPUnit/tests/Rector/Class_/RemoveDataProviderTestPrefixRector/RemoveDataProviderTestPrefixRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/with_test_annotation.php.inc']; - yield [__DIR__ . '/Fixture/multiple_data_providers.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/Class_/TestListenerToHooksRector/TestListenerToHooksRectorTest.php b/packages/PHPUnit/tests/Rector/Class_/TestListenerToHooksRector/TestListenerToHooksRectorTest.php index 9f2712b78460..d73454bd19b5 100644 --- a/packages/PHPUnit/tests/Rector/Class_/TestListenerToHooksRector/TestListenerToHooksRectorTest.php +++ b/packages/PHPUnit/tests/Rector/Class_/TestListenerToHooksRector/TestListenerToHooksRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/clear_it_all.php.inc']; - yield [__DIR__ . '/Fixture/before_list_hook.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/DelegateExceptionArgumentsRector/DelegateExceptionArgumentsRectorTest.php b/packages/PHPUnit/tests/Rector/DelegateExceptionArgumentsRector/DelegateExceptionArgumentsRectorTest.php index 77c0f0262132..137c78ab0afa 100644 --- a/packages/PHPUnit/tests/Rector/DelegateExceptionArgumentsRector/DelegateExceptionArgumentsRectorTest.php +++ b/packages/PHPUnit/tests/Rector/DelegateExceptionArgumentsRector/DelegateExceptionArgumentsRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/message.php.inc']; - yield [__DIR__ . '/Fixture/regexp.php.inc']; - yield [__DIR__ . '/Fixture/self_nested.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/ExceptionAnnotationRector/ExceptionAnnotationRectorTest.php b/packages/PHPUnit/tests/Rector/ExceptionAnnotationRector/ExceptionAnnotationRectorTest.php index 488d79e23cf7..b7f8c7eb7903 100644 --- a/packages/PHPUnit/tests/Rector/ExceptionAnnotationRector/ExceptionAnnotationRectorTest.php +++ b/packages/PHPUnit/tests/Rector/ExceptionAnnotationRector/ExceptionAnnotationRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/Foreach_/SimplifyForeachInstanceOfRector/SimplifyForeachInstanceOfRectorTest.php b/packages/PHPUnit/tests/Rector/Foreach_/SimplifyForeachInstanceOfRector/SimplifyForeachInstanceOfRectorTest.php index 56f9d19b18dc..e57bf7d6e688 100644 --- a/packages/PHPUnit/tests/Rector/Foreach_/SimplifyForeachInstanceOfRector/SimplifyForeachInstanceOfRectorTest.php +++ b/packages/PHPUnit/tests/Rector/Foreach_/SimplifyForeachInstanceOfRector/SimplifyForeachInstanceOfRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/GetMockRector/GetMockRectorTest.php b/packages/PHPUnit/tests/Rector/GetMockRector/GetMockRectorTest.php index 2c1895250f92..dd19a40f6b2d 100644 --- a/packages/PHPUnit/tests/Rector/GetMockRector/GetMockRectorTest.php +++ b/packages/PHPUnit/tests/Rector/GetMockRector/GetMockRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/AssertEqualsParameterToSpecificMethodsTypeRector/AssertEqualsParameterToSpecificMethodsTypeRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/AssertEqualsParameterToSpecificMethodsTypeRector/AssertEqualsParameterToSpecificMethodsTypeRectorTest.php index 4a2d92b79779..1eb3a75eeb65 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/AssertEqualsParameterToSpecificMethodsTypeRector/AssertEqualsParameterToSpecificMethodsTypeRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/AssertEqualsParameterToSpecificMethodsTypeRector/AssertEqualsParameterToSpecificMethodsTypeRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/remove_max_depth.php.inc']; - yield [__DIR__ . '/Fixture/refactor_canonize.php.inc']; - yield [__DIR__ . '/Fixture/refactor_delta.php.inc']; - yield [__DIR__ . '/Fixture/refactor_ignore_case.php.inc']; - yield [__DIR__ . '/Fixture/combination.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/RemoveExpectAnyFromMockRector/RemoveExpectAnyFromMockRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/RemoveExpectAnyFromMockRector/RemoveExpectAnyFromMockRectorTest.php index 4c79ce1adc3f..85218f8d2f68 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/RemoveExpectAnyFromMockRector/RemoveExpectAnyFromMockRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/RemoveExpectAnyFromMockRector/RemoveExpectAnyFromMockRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/ReplaceAssertArraySubsetRector/ReplaceAssertArraySubsetRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/ReplaceAssertArraySubsetRector/ReplaceAssertArraySubsetRectorTest.php index e435999c0302..8a98e8b631cf 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/ReplaceAssertArraySubsetRector/ReplaceAssertArraySubsetRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/ReplaceAssertArraySubsetRector/ReplaceAssertArraySubsetRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/issue_2069.php.inc']; - yield [__DIR__ . '/Fixture/issue_2237.php.inc']; - yield [__DIR__ . '/Fixture/multilevel_array.php.inc']; - yield [__DIR__ . '/Fixture/variable.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertContainsRector/SpecificAssertContainsRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertContainsRector/SpecificAssertContainsRectorTest.php index 9c31f9c2a7d2..23e00337a8d9 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertContainsRector/SpecificAssertContainsRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertContainsRector/SpecificAssertContainsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertInternalTypeRector/SpecificAssertInternalTypeRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertInternalTypeRector/SpecificAssertInternalTypeRectorTest.php index cfc06a4a45d5..e8d088238f5c 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertInternalTypeRector/SpecificAssertInternalTypeRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/SpecificAssertInternalTypeRector/SpecificAssertInternalTypeRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/UseSpecificWillMethodRector/UseSpecificWillMethodRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/UseSpecificWillMethodRector/UseSpecificWillMethodRectorTest.php index e4bb6ced91a6..3b1a6ce16f6e 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/UseSpecificWillMethodRector/UseSpecificWillMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/UseSpecificWillMethodRector/UseSpecificWillMethodRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/will.php.inc']; - yield [__DIR__ . '/Fixture/with.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/WithConsecutiveArgToArrayRectorTest.php b/packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/WithConsecutiveArgToArrayRectorTest.php index b80811600746..0234451d5117 100644 --- a/packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/WithConsecutiveArgToArrayRectorTest.php +++ b/packages/PHPUnit/tests/Rector/MethodCall/WithConsecutiveArgToArrayRector/WithConsecutiveArgToArrayRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_array.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertCompareToSpecificMethodRector/AssertCompareToSpecificMethodRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertCompareToSpecificMethodRector/AssertCompareToSpecificMethodRectorTest.php index d607cde89a3b..0573f98f4ba4 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertCompareToSpecificMethodRector/AssertCompareToSpecificMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertCompareToSpecificMethodRector/AssertCompareToSpecificMethodRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertComparisonToSpecificMethodRector/AssertComparisonToSpecificMethodRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertComparisonToSpecificMethodRector/AssertComparisonToSpecificMethodRectorTest.php index 4d411db39796..b3bae76b3a2c 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertComparisonToSpecificMethodRector/AssertComparisonToSpecificMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertComparisonToSpecificMethodRector/AssertComparisonToSpecificMethodRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertFalseStrposToContainsRector/AssertFalseStrposToContainsRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertFalseStrposToContainsRector/AssertFalseStrposToContainsRectorTest.php index e7ed8db7ef72..b2a5d13b30bb 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertFalseStrposToContainsRector/AssertFalseStrposToContainsRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertFalseStrposToContainsRector/AssertFalseStrposToContainsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertInstanceOfComparisonRector/AssertInstanceOfComparisonRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertInstanceOfComparisonRector/AssertInstanceOfComparisonRectorTest.php index 52af68ab5171..0742a17eb2c6 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertInstanceOfComparisonRector/AssertInstanceOfComparisonRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertInstanceOfComparisonRector/AssertInstanceOfComparisonRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertIssetToSpecificMethodRector/AssertIssetToSpecificMethodRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertIssetToSpecificMethodRector/AssertIssetToSpecificMethodRectorTest.php index b6b613ab4861..581688901a4d 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertIssetToSpecificMethodRector/AssertIssetToSpecificMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertIssetToSpecificMethodRector/AssertIssetToSpecificMethodRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertNotOperatorRector/AssertNotOperatorRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertNotOperatorRector/AssertNotOperatorRectorTest.php index dc8dac39b564..d4547f12b514 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertNotOperatorRector/AssertNotOperatorRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertNotOperatorRector/AssertNotOperatorRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertPropertyExistsRector/AssertPropertyExistsRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertPropertyExistsRector/AssertPropertyExistsRectorTest.php index c8e932ccdba6..be639b5dc791 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertPropertyExistsRector/AssertPropertyExistsRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertPropertyExistsRector/AssertPropertyExistsRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertRegExpRector/AssertRegExpRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertRegExpRector/AssertRegExpRectorTest.php index e84a227247be..5933cf0178cd 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertRegExpRector/AssertRegExpRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertRegExpRector/AssertRegExpRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertSameBoolNullToSpecificMethodRector/AssertSameBoolNullToSpecificMethodRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertSameBoolNullToSpecificMethodRector/AssertSameBoolNullToSpecificMethodRectorTest.php index 3711d99fb7c5..1aa23bbc1214 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertSameBoolNullToSpecificMethodRector/AssertSameBoolNullToSpecificMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertSameBoolNullToSpecificMethodRector/AssertSameBoolNullToSpecificMethodRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseInternalTypeToSpecificMethodRector/AssertTrueFalseInternalTypeToSpecificMethodRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseInternalTypeToSpecificMethodRector/AssertTrueFalseInternalTypeToSpecificMethodRectorTest.php index 98ce52c7127f..f56747d652c5 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseInternalTypeToSpecificMethodRector/AssertTrueFalseInternalTypeToSpecificMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseInternalTypeToSpecificMethodRector/AssertTrueFalseInternalTypeToSpecificMethodRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseToSpecificMethodRector/AssertTrueFalseToSpecificMethodRectorTest.php b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseToSpecificMethodRector/AssertTrueFalseToSpecificMethodRectorTest.php index 5cab655aee1f..180adffdab71 100644 --- a/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseToSpecificMethodRector/AssertTrueFalseToSpecificMethodRectorTest.php +++ b/packages/PHPUnit/tests/Rector/SpecificMethod/AssertTrueFalseToSpecificMethodRector/AssertTrueFalseToSpecificMethodRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/is_readable.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnit/tests/Rector/TryCatchToExpectExceptionRector/TryCatchToExpectExceptionRectorTest.php b/packages/PHPUnit/tests/Rector/TryCatchToExpectExceptionRector/TryCatchToExpectExceptionRectorTest.php index e2d96d638930..2736e9f899ad 100644 --- a/packages/PHPUnit/tests/Rector/TryCatchToExpectExceptionRector/TryCatchToExpectExceptionRectorTest.php +++ b/packages/PHPUnit/tests/Rector/TryCatchToExpectExceptionRector/TryCatchToExpectExceptionRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PHPUnitSymfony/tests/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/AddMessageToEqualsResponseCodeRectorTest.php b/packages/PHPUnitSymfony/tests/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/AddMessageToEqualsResponseCodeRectorTest.php index 5f9c4160fd53..5d147cfbe6dc 100644 --- a/packages/PHPUnitSymfony/tests/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/AddMessageToEqualsResponseCodeRectorTest.php +++ b/packages/PHPUnitSymfony/tests/Rector/StaticCall/AddMessageToEqualsResponseCodeRector/AddMessageToEqualsResponseCodeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/method_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php b/packages/Php52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php index 8b49405da5a4..01c9ac42f5fb 100644 --- a/packages/Php52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php +++ b/packages/Php52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php b/packages/Php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php index c87019dc8702..a4f625b0eff1 100644 --- a/packages/Php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php +++ b/packages/Php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_nested.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php b/packages/Php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php index a2ff2c4ef535..3f58e499a0b7 100644 --- a/packages/Php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php +++ b/packages/Php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php b/packages/Php53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php index a3c8b812550e..059aed995f9b 100644 --- a/packages/Php53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php +++ b/packages/Php53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/yolo.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php b/packages/Php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php index fc3805c80ca8..20227ee30f7e 100644 --- a/packages/Php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php +++ b/packages/Php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php b/packages/Php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php index b3a9ed8218b9..70b2b65ec2d3 100644 --- a/packages/Php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php +++ b/packages/Php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc b/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc deleted file mode 100644 index 9655a4ff80f6..000000000000 --- a/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php b/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php index a7a02031963d..6c2bea48d977 100644 --- a/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php +++ b/packages/Php55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/call_function.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php b/packages/Php55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php index 22c85b3a0668..58a20ecc36c4 100644 --- a/packages/Php55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php +++ b/packages/Php55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_error.php.inc']; - yield [__DIR__ . '/Fixture/skip_sensitive.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php b/packages/Php56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php index 45f00170dbb1..f90d72dcd41c 100644 --- a/packages/Php56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php +++ b/packages/Php56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php @@ -24,7 +24,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php b/packages/Php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php index f5a2941d762d..b45c9137011d 100644 --- a/packages/Php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php +++ b/packages/Php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php @@ -20,17 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/anonymous_function.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/in_foreach.php.inc']; - yield [__DIR__ . '/Fixture/vimeo_one.php.inc']; - yield [__DIR__ . '/Fixture/vimeo_two.php.inc']; - yield [__DIR__ . '/Fixture/vimeo_else.php.inc']; - yield [__DIR__ . '/Fixture/keep_vimeo_unset.php.inc']; - yield [__DIR__ . '/Fixture/take_static_into_account.php.inc']; - yield [__DIR__ . '/Fixture/skip_list.php.inc']; - yield [__DIR__ . '/Fixture/skip_foreach_assign.php.inc']; - yield [__DIR__ . '/Fixture/skip_reference_assign.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php b/packages/Php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php index dda880093608..58cdc15634c5 100644 --- a/packages/Php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php +++ b/packages/Php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/foreach_not.php.inc']; - yield [__DIR__ . '/Fixture/return.php.inc']; - yield [__DIR__ . '/Fixture/Keep.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php b/packages/Php70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php index d01a43f8f9d4..29010300e50e 100644 --- a/packages/Php70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php +++ b/packages/Php70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php @@ -23,7 +23,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php b/packages/Php70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php index b6573db1d48a..b91ef09f9c07 100644 --- a/packages/Php70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php +++ b/packages/Php70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php b/packages/Php70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php index b6e18f381583..a625848a8aee 100644 --- a/packages/Php70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php +++ b/packages/Php70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php @@ -24,9 +24,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php b/packages/Php70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php index 200818e94752..81a1d6b65131 100644 --- a/packages/Php70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php +++ b/packages/Php70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php @@ -23,7 +23,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php b/packages/Php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php index 4f5e7b8b09e4..70150b2d4a49 100644 --- a/packages/Php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php +++ b/packages/Php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php b/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php index 3c97857ab8d0..f8273087274f 100644 --- a/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php +++ b/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc b/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc index 941c7a49f3ca..0f856808d11e 100644 --- a/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc +++ b/packages/Php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc @@ -4,7 +4,7 @@ namespace Rector\Php70\Tests\Rector\FunctionLike\ExceptionHandlerTypehintRector\ function exceptionHandlerTypehintNullable() { - function handler(?Exception $exception) + function handler(?\Exception $exception) { } diff --git a/packages/Php70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php b/packages/Php70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php index 3d548d512539..4414a6da66ac 100644 --- a/packages/Php70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php +++ b/packages/Php70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php @@ -24,12 +24,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/in_namespace.php.inc']; - yield [__DIR__ . '/Fixture/delegating.php.inc']; - yield [__DIR__ . '/Fixture/delegating_2.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/non_expression.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php b/packages/Php70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php index db13a2852ddc..94d896ad5e3c 100644 --- a/packages/Php70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php +++ b/packages/Php70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; - yield [__DIR__ . '/Fixture/complex.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php b/packages/Php70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php index a03a96513f29..221e612bde97 100644 --- a/packages/Php70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php +++ b/packages/Php70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php b/packages/Php70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php index 64952e3c3f82..f211887a2eb6 100644 --- a/packages/Php70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php +++ b/packages/Php70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php b/packages/Php70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php index a74d37e24755..13c2eb200b02 100644 --- a/packages/Php70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php +++ b/packages/Php70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; - yield [__DIR__ . '/Fixture/skip_empty.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php b/packages/Php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php index c28b5bd973fc..04c068918db7 100644 --- a/packages/Php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php +++ b/packages/Php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/another_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php b/packages/Php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php index 3098dca4c234..b29893071457 100644 --- a/packages/Php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php +++ b/packages/Php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/with_constructor.php.inc']; - yield [__DIR__ . '/Fixture/keep.php.inc']; - yield [__DIR__ . '/Fixture/keep_parent_static.php.inc']; - yield [__DIR__ . '/Fixture/keep_annotated.php.inc']; - yield [__DIR__ . '/Fixture/add_static_to_method.php.inc']; - yield [__DIR__ . '/Fixture/with_only_static_methods.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php b/packages/Php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php index e33c8ef11065..2e92d8411f1d 100644 --- a/packages/Php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php +++ b/packages/Php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/hidden_in_middle.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php b/packages/Php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php index 46208c249585..bef49ca11929 100644 --- a/packages/Php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php +++ b/packages/Php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php @@ -25,10 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php b/packages/Php70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php index b347e7d85fe6..0aeefa9e9ec2 100644 --- a/packages/Php70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php +++ b/packages/Php70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php b/packages/Php71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php index 3a06fdf05a74..50f1dc27ed27 100644 --- a/packages/Php71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php +++ b/packages/Php71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/fixture6.php.inc']; - yield [__DIR__ . '/Fixture/fixture7.php.inc']; - yield [__DIR__ . '/Fixture/fixture8.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php b/packages/Php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php index f29a4c485fb7..2fbc0a96d621 100644 --- a/packages/Php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php +++ b/packages/Php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/known_static_string.php.inc']; - yield [__DIR__ . '/Fixture/ignore_concatenation_dot.php.inc']; - yield [__DIR__ . '/Fixture/edge_case.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php b/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php index 27417c05b76a..c2b4a40bc031 100644 --- a/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php +++ b/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php b/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php index e2aaa43b581b..5246a9bf8cc8 100644 --- a/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php +++ b/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/polyfill_function.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php b/packages/Php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php index 03ce9b0ea908..9e2aa8d505f1 100644 --- a/packages/Php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php +++ b/packages/Php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/SomeClass.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php b/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php index 88b49127fdf2..315e28b893f8 100644 --- a/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php +++ b/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php @@ -20,19 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/preg_match_array.php.inc']; - yield [__DIR__ . '/Fixture/local_property.php.inc']; - yield [__DIR__ . '/Fixture/array_countable_class.php.inc']; - yield [__DIR__ . '/Fixture/countable_annotated_params.php.inc']; - yield [__DIR__ . '/Fixture/false_true_class.php.inc']; - yield [__DIR__ . '/Fixture/on_null.php.inc']; - yield [__DIR__ . '/Fixture/external_property.php.inc']; - yield [__DIR__ . '/Fixture/double_same_variable.php.inc']; - yield [__DIR__ . '/Fixture/property_with_doc.php.inc']; - yield [__DIR__ . '/Fixture/nullable_array.php.inc']; - yield [__DIR__ . '/Fixture/skip_countable_local_property.php.inc']; - yield [__DIR__ . '/Fixture/skip_array_merge.php.inc']; - yield [__DIR__ . '/Fixture/skip_simple_xml_element.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php b/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php index 24ff69a36196..dde82c48ca3b 100644 --- a/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php +++ b/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/is_countable.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureForPhp73'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/is_countable.php.inc b/packages/Php71/tests/Rector/FuncCall/CountOnNullRector/FixtureForPhp73/is_countable.php.inc similarity index 100% rename from packages/Php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/is_countable.php.inc rename to packages/Php71/tests/Rector/FuncCall/CountOnNullRector/FixtureForPhp73/is_countable.php.inc diff --git a/packages/Php71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php b/packages/Php71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php index 0c6c3f4accd5..115b9f82b207 100644 --- a/packages/Php71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php +++ b/packages/Php71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php @@ -20,20 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/better_func_get_all.php.inc']; - yield [__DIR__ . '/Fixture/remove_another_class_method_call_extra_argument.php.inc']; - yield [__DIR__ . '/Fixture/methods.php.inc']; - yield [__DIR__ . '/Fixture/static_calls.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/function_with_one_required_and_one_optional_parameter.php.inc']; - yield [__DIR__ . '/Fixture/func_get_all.php.inc']; - yield [__DIR__ . '/Fixture/external_scope.php.inc']; - yield [__DIR__ . '/Fixture/static_call_parent.php.inc']; - // skip - yield [__DIR__ . '/Fixture/skip_commented_param_func_get_args.php.inc']; - yield [__DIR__ . '/Fixture/skip_call_user_func_array.php.inc']; - yield [__DIR__ . '/Fixture/skip_invoke.php.inc']; - yield [__DIR__ . '/Fixture/skip_values_passed_from_parent.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php b/packages/Php71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php index 833fdc1bf99d..5a7546bff711 100644 --- a/packages/Php71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php +++ b/packages/Php71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php b/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php.inc similarity index 100% rename from packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php rename to packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php.inc diff --git a/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php b/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php.inc similarity index 100% rename from packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php rename to packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php.inc diff --git a/packages/Php71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php b/packages/Php71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php index d160029c7bf7..bac352c894dc 100644 --- a/packages/Php71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php +++ b/packages/Php71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/ReservedObject.php']; - yield [__DIR__ . '/Fixture/skip_type_declaration_object.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Php71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php b/packages/Php71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php index 649af784ee2c..c5e6d80a0f59 100644 --- a/packages/Php71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php +++ b/packages/Php71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php b/packages/Php72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php index 6a2c88f62a74..e2d1ca87810b 100644 --- a/packages/Php72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php +++ b/packages/Php72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/define.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/Each/EachRectorTest.php b/packages/Php72/tests/Rector/Each/EachRectorTest.php index a402584a7db7..ff2add933d03 100644 --- a/packages/Php72/tests/Rector/Each/EachRectorTest.php +++ b/packages/Php72/tests/Rector/Each/EachRectorTest.php @@ -26,9 +26,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php b/packages/Php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php index bc1417d31af9..3f12d1741e8e 100644 --- a/packages/Php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php +++ b/packages/Php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/concat.php.inc']; - yield [__DIR__ . '/Fixture/reference.php.inc']; - yield [__DIR__ . '/Fixture/stackoverflow.php.inc']; - yield [__DIR__ . '/Fixture/drupal.php.inc']; - yield [__DIR__ . '/Fixture/php_net.php.inc']; - yield [__DIR__ . '/Fixture/wordpress.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php b/packages/Php72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php index 5335c3896307..f2f40d57ac20 100644 --- a/packages/Php72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php +++ b/packages/Php72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/tricky_cases.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php b/packages/Php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php index 2e405b01ed28..9e3dd8229927 100644 --- a/packages/Php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php +++ b/packages/Php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php b/packages/Php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php index 9814407b50a1..08bcd96fec19 100644 --- a/packages/Php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php +++ b/packages/Php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_set.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php b/packages/Php72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php index 2d1529c2a988..8f7db4eba0e9 100644 --- a/packages/Php72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php +++ b/packages/Php72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php b/packages/Php72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php index 9bbb103f8bc0..c7725a5eaf8d 100644 --- a/packages/Php72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php +++ b/packages/Php72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php b/packages/Php72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php index b7a81354cd51..723a2ed73cf5 100644 --- a/packages/Php72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php +++ b/packages/Php72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/unset_expr.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture71.php.inc b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture71.php.inc deleted file mode 100644 index a08fafff04a9..000000000000 --- a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture71.php.inc +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc index 8df717c4a455..4140920a2aa9 100644 --- a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc +++ b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc @@ -2,9 +2,12 @@ namespace Rector\Php73\Tests\Rector\BinaryOp\IsCountableRector\Fixture; -function isCountable() +class CountableOnPhp73 { - is_array($foo) || $foo instanceof \Countable; + public function go($foo) + { + is_array($foo) || $foo instanceof \Countable; + } } ?> @@ -13,9 +16,12 @@ function isCountable() namespace Rector\Php73\Tests\Rector\BinaryOp\IsCountableRector\Fixture; -function isCountable() +class CountableOnPhp73 { - is_countable($foo); + public function go($foo) + { + is_countable($foo); + } } ?> diff --git a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/polyfill_function.php.inc b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/FixtureWithPolyfill/polyfill_function.php.inc similarity index 100% rename from packages/Php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/polyfill_function.php.inc rename to packages/Php73/tests/Rector/BinaryOp/IsCountableRector/FixtureWithPolyfill/polyfill_function.php.inc diff --git a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php index e48baa46b361..6178b4a5e285 100644 --- a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php +++ b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php @@ -9,15 +9,12 @@ final class IsCountableRectorTest extends AbstractRectorTestCase { - public function test(): void + /** + * @requires PHP >= 7.3 + */ + public function testPhp73AndHigher(): void { - // That method can be provided by `symfony/polyfill-php73` package, - // or not exists as it's run on PHP < 7.3 - if (! function_exists('is_countable')) { - $this->doTestFile(__DIR__ . '/Fixture/fixture71.php.inc'); - } else { - $this->doTestFile(__DIR__ . '/Fixture/fixture73.php.inc'); - } + $this->doTestFile(__DIR__ . '/Fixture/fixture73.php.inc'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php index 8b77e1a812bd..b70c277c1adf 100644 --- a/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php +++ b/packages/Php73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/polyfill_function.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureWithPolyfill'); } protected function getPhpVersion(): string diff --git a/packages/Php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php b/packages/Php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php index 9ee2e2a771de..82bc87cd7d2d 100644 --- a/packages/Php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php +++ b/packages/Php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php b/packages/Php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php index 9aa6031408ce..a63242cdaa13 100644 --- a/packages/Php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php +++ b/packages/Php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/array_key_first.php.inc']; - yield [__DIR__ . '/Fixture/array_key_last.php.inc']; - yield [__DIR__ . '/Fixture/both.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php b/packages/Php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php index 8e1e233785c6..df3d00f7cdac 100644 --- a/packages/Php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php +++ b/packages/Php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php b/packages/Php73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php index ce5f079874d1..72889c3105fb 100644 --- a/packages/Php73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php +++ b/packages/Php73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/method_call.php.inc']; - yield [__DIR__ . '/Fixture/const.php.inc']; - yield [__DIR__ . '/Fixture/external_const.php.inc']; - yield [__DIR__ . '/Fixture/variable.php.inc']; - yield [__DIR__ . '/Fixture/multiple_variables.php.inc']; - yield [__DIR__ . '/Fixture/false_positive.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php b/packages/Php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php index 4ada49f15d07..0c4137bd9e0c 100644 --- a/packages/Php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php +++ b/packages/Php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/empty_compact.php.inc']; - yield [__DIR__ . '/Fixture/skip_maybe_defined.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php b/packages/Php73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php index 73a26f5b4ac6..2b87b8de4059 100644 --- a/packages/Php73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php +++ b/packages/Php73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php b/packages/Php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php index 9e7cc4080e56..fc102df4bdae 100644 --- a/packages/Php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php +++ b/packages/Php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/trait.php.inc']; - yield [__DIR__ . '/Fixture/skip_twice.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_string.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php b/packages/Php73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php index e0a95023bcaf..109b18a8d742 100644 --- a/packages/Php73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php +++ b/packages/Php73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php b/packages/Php74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php index 75dd077d8502..5c2407d18149 100644 --- a/packages/Php74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php +++ b/packages/Php74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php b/packages/Php74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php index 8cbc14010856..4124e16c9dc9 100644 --- a/packages/Php74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php +++ b/packages/Php74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/referenced_but_not_used.php.inc']; - yield [__DIR__ . '/Fixture/skip_no_return.php.inc']; - yield [__DIR__ . '/Fixture/skip_referenced_value.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php b/packages/Php74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php index 3af0edcced78..cb936c43e855 100644 --- a/packages/Php74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php +++ b/packages/Php74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php b/packages/Php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php index 167527bd5ef2..11417b1c2fdb 100644 --- a/packages/Php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php +++ b/packages/Php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php b/packages/Php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php index 39d842cb65f8..135d795ba8ab 100644 --- a/packages/Php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php +++ b/packages/Php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/iterator_to_array.php.inc']; - yield [__DIR__ . '/Fixture/integer_keys.php.inc']; - yield [__DIR__ . '/Fixture/skip_simple_array_merge.php.inc']; - yield [__DIR__ . '/Fixture/skip_string_keys.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php b/packages/Php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php index c0a3043fc868..6d5df5cc89e7 100644 --- a/packages/Php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php +++ b/packages/Php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php b/packages/Php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php index d23c5e26b5b7..143c58cb37bb 100644 --- a/packages/Php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php +++ b/packages/Php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php b/packages/Php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php index 6a50121666ee..1aac06ecadfa 100644 --- a/packages/Php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php +++ b/packages/Php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php b/packages/Php74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php index e3468b5d6c55..0f4621b45770 100644 --- a/packages/Php74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php +++ b/packages/Php74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php @@ -25,7 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php b/packages/Php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php index 3c2e3f642095..08d5be2e804e 100644 --- a/packages/Php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php +++ b/packages/Php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_non_dec_simple_float_numbers.php.inc']; - yield [__DIR__ . '/Fixture/skip_hexadecimal.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php b/packages/Php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php index 733c259e7c1b..cf4362894ce8 100644 --- a/packages/Php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php +++ b/packages/Php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php b/packages/Php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php index c6801e5a95ad..f2d100539179 100644 --- a/packages/Php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php +++ b/packages/Php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_returned_value.php.inc']; - yield [__DIR__ . '/Fixture/parameter_type.php.inc']; - yield [__DIR__ . '/Fixture/known_has_type.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php b/packages/Php74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php index b9b5d2d047e2..97f26ebd420d 100644 --- a/packages/Php74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php +++ b/packages/Php74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php @@ -20,17 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/property.php.inc']; - yield [__DIR__ . '/Fixture/skip_invalid_property.php.inc']; - yield [__DIR__ . '/Fixture/bool_property.php.inc']; - yield [__DIR__ . '/Fixture/class_property.php.inc']; - yield [__DIR__ . '/Fixture/nullable_property.php.inc']; - yield [__DIR__ . '/Fixture/static_property.php.inc']; - yield [__DIR__ . '/Fixture/default_values_for_nullable_iterables.php.inc']; - yield [__DIR__ . '/Fixture/default_values.php.inc']; - yield [__DIR__ . '/Fixture/match_types.php.inc']; - yield [__DIR__ . '/Fixture/match_types_parent.php.inc']; - yield [__DIR__ . '/Fixture/static_analysis_based.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php b/packages/Php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php index 1249c55e5137..bdcbb428f9fe 100644 --- a/packages/Php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php +++ b/packages/Php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/PhpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/PhpSpecToPHPUnitRectorTest.php b/packages/PhpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/PhpSpecToPHPUnitRectorTest.php index 24f37dd0593c..55659ea900da 100644 --- a/packages/PhpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/PhpSpecToPHPUnitRectorTest.php +++ b/packages/PhpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/PhpSpecToPHPUnitRectorTest.php @@ -19,19 +19,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/full_blown.php.inc']; - yield [__DIR__ . '/Fixture/let_create_edge.php.inc']; - yield [__DIR__ . '/Fixture/mocking.php.inc']; - yield [__DIR__ . '/Fixture/custom_matcher.php.inc']; - yield [__DIR__ . '/Fixture/exception.php.inc']; - yield [__DIR__ . '/Fixture/mock_method_call_arguments.php.inc']; - yield [__DIR__ . '/Fixture/no_self_type_test.php.inc']; - yield [__DIR__ . '/Fixture/keep_method.php.inc']; - yield [__DIR__ . '/Fixture/get_wrapped_object.php.inc']; - yield [__DIR__ . '/Fixture/mock_properties.php.inc']; - yield [__DIR__ . '/Fixture/mock_properties_non_local.php.inc']; - yield [__DIR__ . '/Fixture/setup_private_ctor.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function provideConfig(): string diff --git a/packages/RemovingStatic/tests/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector/PHPUnitStaticToKernelTestCaseGetRectorTest.php b/packages/RemovingStatic/tests/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector/PHPUnitStaticToKernelTestCaseGetRectorTest.php index 094642b2bd59..8c4eb0ccf759 100644 --- a/packages/RemovingStatic/tests/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector/PHPUnitStaticToKernelTestCaseGetRectorTest.php +++ b/packages/RemovingStatic/tests/Rector/Class_/PHPUnitStaticToKernelTestCaseGetRector/PHPUnitStaticToKernelTestCaseGetRectorTest.php @@ -21,9 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/setup_already_exists.php.inc']; - yield [__DIR__ . '/Fixture/setup_already_exists_with_parent_setup.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/Fixture/multiple_args.php.inc b/packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/FixtureWithMultipleArguments/multiple_args.php.inc similarity index 100% rename from packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/Fixture/multiple_args.php.inc rename to packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/FixtureWithMultipleArguments/multiple_args.php.inc diff --git a/packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/PassFactoryToEntityRectorTest.php b/packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/PassFactoryToEntityRectorTest.php index a0e99ee181dd..65ff9af2ded1 100644 --- a/packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/PassFactoryToEntityRectorTest.php +++ b/packages/RemovingStatic/tests/Rector/Class_/PassFactoryToEntityRector/PassFactoryToEntityRectorTest.php @@ -46,12 +46,12 @@ public function testMultipleArguments(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } public function provideDataForTestMultipleArguments(): Iterator { - yield [__DIR__ . '/Fixture/multiple_args.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureWithMultipleArguments'); } /** diff --git a/packages/RemovingStatic/tests/Rector/Class_/StaticTypeToSetterInjectionRector/StaticTypeToSetterInjectionRectorTest.php b/packages/RemovingStatic/tests/Rector/Class_/StaticTypeToSetterInjectionRector/StaticTypeToSetterInjectionRectorTest.php index eef14026e59c..74e78ff12d07 100644 --- a/packages/RemovingStatic/tests/Rector/Class_/StaticTypeToSetterInjectionRector/StaticTypeToSetterInjectionRectorTest.php +++ b/packages/RemovingStatic/tests/Rector/Class_/StaticTypeToSetterInjectionRector/StaticTypeToSetterInjectionRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture_with_implements.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/Annotation/RenameAnnotationRector/RenameAnnotationRectorTest.php b/packages/Renaming/tests/Rector/Annotation/RenameAnnotationRector/RenameAnnotationRectorTest.php index 278a14138726..c5f495716d49 100644 --- a/packages/Renaming/tests/Rector/Annotation/RenameAnnotationRector/RenameAnnotationRectorTest.php +++ b/packages/Renaming/tests/Rector/Annotation/RenameAnnotationRector/RenameAnnotationRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/AutoImportNamesParameterTest.php b/packages/Renaming/tests/Rector/Class_/RenameClassRector/AutoImportNamesParameterTest.php index b7c2e0f749e6..d9019feb3185 100644 --- a/packages/Renaming/tests/Rector/Class_/RenameClassRector/AutoImportNamesParameterTest.php +++ b/packages/Renaming/tests/Rector/Class_/RenameClassRector/AutoImportNamesParameterTest.php @@ -23,10 +23,7 @@ public function test(string $filePath): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/AutoImportNamesParameter/class_to_new_with_post_import.php.inc']; - yield [__DIR__ . '/Fixture/AutoImportNamesParameter/partial_expression.php.inc']; - yield [__DIR__ . '/Fixture/AutoImportNamesParameter/skip_closure_me.php.inc']; - yield [__DIR__ . '/Fixture/AutoImportNamesParameter/skip_parent_class_same_name.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImportNames'); } protected function getAutoImportNames(): ?bool diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/class_to_new_with_post_import.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/class_to_new_with_post_import.php.inc similarity index 100% rename from packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/class_to_new_with_post_import.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/class_to_new_with_post_import.php.inc diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/partial_expression.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/partial_expression.php.inc similarity index 100% rename from packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/partial_expression.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/partial_expression.php.inc diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/skip_closure_me.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/skip_closure_me.php.inc similarity index 100% rename from packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/skip_closure_me.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/skip_closure_me.php.inc diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/skip_parent_class_same_name.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/skip_parent_class_same_name.php.inc similarity index 100% rename from packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/AutoImportNamesParameter/skip_parent_class_same_name.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/skip_parent_class_same_name.php.inc diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/skip_duplicated_class.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureDuplication/skip_duplicated_class.php.inc similarity index 100% rename from packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/skip_duplicated_class.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureDuplication/skip_duplicated_class.php.inc diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/RenameClassRectorTest.php b/packages/Renaming/tests/Rector/Class_/RenameClassRector/RenameClassRectorTest.php index bf11d60b75f3..a7736bfd1ea1 100644 --- a/packages/Renaming/tests/Rector/Class_/RenameClassRector/RenameClassRectorTest.php +++ b/packages/Renaming/tests/Rector/Class_/RenameClassRector/RenameClassRectorTest.php @@ -21,8 +21,6 @@ final class RenameClassRectorTest extends AbstractRectorTestCase { /** * @dataProvider provideDataForTest() - * @dataProvider provideDataForTestWithClassAnnotation() - * @dataProvider provideDataForTestWithNamespaceRename() */ public function test(string $filePath): void { @@ -31,29 +29,7 @@ public function test(string $filePath): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/class_to_new.php.inc']; - yield [__DIR__ . '/Fixture/class_to_interface.php.inc']; - yield [__DIR__ . '/Fixture/interface_to_class.php.inc']; - yield [__DIR__ . '/Fixture/name_insensitive.php.inc']; - yield [__DIR__ . '/Fixture/underscore_doc.php.inc']; - yield [__DIR__ . '/Fixture/keep_return_tag.php.inc']; - yield [__DIR__ . '/Fixture/rename_trait.php.inc']; - yield [__DIR__ . '/Fixture/fqnize_namespaced.php.inc']; - } - - public function provideDataForTestWithClassAnnotation(): Iterator - { - yield [__DIR__ . '/Fixture/class_annotations.php.inc']; - yield [__DIR__ . '/Fixture/class_annotations_serializer_type.php.inc']; - } - - public function provideDataForTestWithNamespaceRename(): Iterator - { - yield [__DIR__ . '/Fixture/rename_class_without_namespace.php.inc']; - yield [__DIR__ . '/Fixture/rename_class.php.inc']; - yield [__DIR__ . '/Fixture/rename_interface.php.inc']; - yield [__DIR__ . '/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc']; - yield [__DIR__ . '/Fixture/rename_class_to_class_without_namespace.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** @@ -62,7 +38,7 @@ public function provideDataForTestWithNamespaceRename(): Iterator public function testClassNameDuplication(): void { $this->expectException(InvalidPhpCodeException::class); - $this->doTestFile(__DIR__ . '/Fixture/skip_duplicated_class.php.inc'); + $this->doTestFile(__DIR__ . '/FixtureDuplication/skip_duplicated_class.php.inc'); } /** diff --git a/packages/Renaming/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php b/packages/Renaming/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php index fc69b9dea62a..81a5b8028aa5 100644 --- a/packages/Renaming/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php +++ b/packages/Renaming/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/spaghetti.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php b/packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php index f8ca500fea6d..08b9b38f1ef8 100644 --- a/packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php +++ b/packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php @@ -22,7 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/Function_/RenameFunctionRector/RenameFunctionRectorTest.php b/packages/Renaming/tests/Rector/Function_/RenameFunctionRector/RenameFunctionRectorTest.php index da0ec17ccfc2..3a5319d6807e 100644 --- a/packages/Renaming/tests/Rector/Function_/RenameFunctionRector/RenameFunctionRectorTest.php +++ b/packages/Renaming/tests/Rector/Function_/RenameFunctionRector/RenameFunctionRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/double_function.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/MethodCall/RenameMethodCallRector/RenameMethodCallRectorTest.php b/packages/Renaming/tests/Rector/MethodCall/RenameMethodCallRector/RenameMethodCallRectorTest.php index 16793849211c..e3ae54220fb3 100644 --- a/packages/Renaming/tests/Rector/MethodCall/RenameMethodCallRector/RenameMethodCallRectorTest.php +++ b/packages/Renaming/tests/Rector/MethodCall/RenameMethodCallRector/RenameMethodCallRectorTest.php @@ -22,10 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/RenameMethodRectorTest.php b/packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/RenameMethodRectorTest.php index 941d522a4ad8..6337fb3019aa 100644 --- a/packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/RenameMethodRectorTest.php +++ b/packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/RenameMethodRectorTest.php @@ -23,15 +23,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/fixture6.php.inc']; - yield [__DIR__ . '/Fixture/under_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/SomeClass.php']; - yield [__DIR__ . '/Fixture/nette_to_symfony_presenter.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/MethodCall/RenameStaticMethodRector/RenameStaticMethodRectorTest.php b/packages/Renaming/tests/Rector/MethodCall/RenameStaticMethodRector/RenameStaticMethodRectorTest.php index 766b3dc47871..a1767830d674 100644 --- a/packages/Renaming/tests/Rector/MethodCall/RenameStaticMethodRector/RenameStaticMethodRectorTest.php +++ b/packages/Renaming/tests/Rector/MethodCall/RenameStaticMethodRector/RenameStaticMethodRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Renaming/tests/Rector/Namespace_/RenameNamespaceRector/RenameNamespaceRectorTest.php b/packages/Renaming/tests/Rector/Namespace_/RenameNamespaceRector/RenameNamespaceRectorTest.php index 87ddf75a820e..e1320c010a8c 100644 --- a/packages/Renaming/tests/Rector/Namespace_/RenameNamespaceRector/RenameNamespaceRectorTest.php +++ b/packages/Renaming/tests/Rector/Namespace_/RenameNamespaceRector/RenameNamespaceRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Restoration/tests/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/MissingClassConstantReferenceToStringRectorTest.php b/packages/Restoration/tests/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/MissingClassConstantReferenceToStringRectorTest.php index 6310d4ca1487..61e34fefd918 100644 --- a/packages/Restoration/tests/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/MissingClassConstantReferenceToStringRectorTest.php +++ b/packages/Restoration/tests/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/MissingClassConstantReferenceToStringRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Restoration/tests/Rector/Namespace_/CompleteImportForPartialAnnotationRector/CompleteImportForPartialAnnotationRectorTest.php b/packages/Restoration/tests/Rector/Namespace_/CompleteImportForPartialAnnotationRector/CompleteImportForPartialAnnotationRectorTest.php index 4f187ec17e29..a5ed3c323054 100644 --- a/packages/Restoration/tests/Rector/Namespace_/CompleteImportForPartialAnnotationRector/CompleteImportForPartialAnnotationRectorTest.php +++ b/packages/Restoration/tests/Rector/Namespace_/CompleteImportForPartialAnnotationRector/CompleteImportForPartialAnnotationRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/keep_non_annotations.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/SOLID/tests/Rector/ClassConst/PrivatizeLocalClassConstantRector/PrivatizeLocalClassConstantRectorTest.php b/packages/SOLID/tests/Rector/ClassConst/PrivatizeLocalClassConstantRector/PrivatizeLocalClassConstantRectorTest.php index 5e51e6b9818e..763da5fc88d7 100644 --- a/packages/SOLID/tests/Rector/ClassConst/PrivatizeLocalClassConstantRector/PrivatizeLocalClassConstantRectorTest.php +++ b/packages/SOLID/tests/Rector/ClassConst/PrivatizeLocalClassConstantRector/PrivatizeLocalClassConstantRectorTest.php @@ -28,22 +28,12 @@ public function testProtected(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_multi_overcomplex.php.inc']; - yield [__DIR__ . '/Fixture/keep_public.php.inc']; - yield [__DIR__ . '/Fixture/keep_public_parsing_order.php.inc']; - yield [__DIR__ . '/Fixture/protected.php.inc']; - yield [__DIR__ . '/Fixture/in_interface.php.inc']; - yield [__DIR__ . '/Fixture/in_interface_used_child_and_external.php.inc']; - yield [__DIR__ . '/Fixture/in_interface_used_child_and_extended.php.inc']; - yield [__DIR__ . '/Fixture/skip_used_in_another_class.php.inc']; - yield [__DIR__ . '/Fixture/override_public_constant.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } public function provideDataForTestProtected(): Iterator { - yield [__DIR__ . '/Fixture/protected_parent_parent.php.inc']; - yield [__DIR__ . '/Fixture/override_protected_constant.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/SOLID/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/UseInterfaceOverImplementationInConstructorRectorTest.php b/packages/SOLID/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/UseInterfaceOverImplementationInConstructorRectorTest.php index 8a316b28cdbd..12dca07e23ca 100644 --- a/packages/SOLID/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/UseInterfaceOverImplementationInConstructorRectorTest.php +++ b/packages/SOLID/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/UseInterfaceOverImplementationInConstructorRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/prefer_first_parent_interface.php.inc']; - yield [__DIR__ . '/Fixture/skip_multiple_interfaces.php.inc']; - yield [__DIR__ . '/Fixture/skip_simple_type.php.inc']; - yield [__DIR__ . '/Fixture/skip_interface.php.inc']; - yield [__DIR__ . '/Fixture/skip_sole_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_class_that_implements_interface_with_multiple_children.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/SOLID/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/FinalizeClassesWithoutChildrenRectorTest.php b/packages/SOLID/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/FinalizeClassesWithoutChildrenRectorTest.php index f65995370708..01400654e52d 100644 --- a/packages/SOLID/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/FinalizeClassesWithoutChildrenRectorTest.php +++ b/packages/SOLID/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/FinalizeClassesWithoutChildrenRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; - yield [__DIR__ . '/Fixture/entity.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/SOLID/tests/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/MakeUnusedClassesWithChildrenAbstractRectorTest.php b/packages/SOLID/tests/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/MakeUnusedClassesWithChildrenAbstractRectorTest.php index 057e93ba3d27..dbc7352caa5f 100644 --- a/packages/SOLID/tests/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/MakeUnusedClassesWithChildrenAbstractRectorTest.php +++ b/packages/SOLID/tests/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/MakeUnusedClassesWithChildrenAbstractRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_new.php.inc']; - yield [__DIR__ . '/Fixture/skip_static_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture2.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture2.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture2.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture2.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture3.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture3.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture3.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture3.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture4.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture4.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture4.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/fixture4.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/resolve_another_method_call.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/resolve_another_method_call.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/resolve_another_method_call.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/resolve_another_method_call.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/skip_just_template.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/skip_just_template.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/skip_just_template.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion3/skip_just_template.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture2.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture2.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture2.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture2.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture3.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture3.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture3.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture3.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture4.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture4.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture4.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture4.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture5.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture5.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture5.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/fixture5.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/skip_without_template.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/skip_without_template.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/skip_without_template.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/skip_without_template.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/with_route_options.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/with_route_options.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/with_route_options.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/with_route_options.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/with_route_too.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/with_route_too.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/with_route_too.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/with_route_too.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/without_base_class.php.inc b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/without_base_class.php.inc similarity index 100% rename from packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/without_base_class.php.inc rename to packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/without_base_class.php.inc diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion3RectorTest.php b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion3RectorTest.php index 2def0110261f..ab3710b9214a 100644 --- a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion3RectorTest.php +++ b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion3RectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/Version3/fixture.php.inc']; - yield [__DIR__ . '/Fixture/Version3/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/Version3/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/Version3/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/Version3/skip_just_template.php.inc']; - yield [__DIR__ . '/Fixture/Version3/resolve_another_method_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureVersion3'); } /** diff --git a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion5RectorTest.php b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion5RectorTest.php index 4aa193610ce9..4420603a056d 100644 --- a/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion5RectorTest.php +++ b/packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion5RectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/Version5/fixture.php.inc']; - yield [__DIR__ . '/Fixture/Version5/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/Version5/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/Version5/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/Version5/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/Version5/with_route_too.php.inc']; - yield [__DIR__ . '/Fixture/Version5/with_route_options.php.inc']; - yield [__DIR__ . '/Fixture/Version5/without_base_class.php.inc']; - yield [__DIR__ . '/Fixture/Version5/skip_without_template.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureVersion5'); } /** diff --git a/packages/Shopware/tests/Rector/ClassConstFetch/ShopwareVersionConstsRector/ShopwareVersionConstsRectorTest.php b/packages/Shopware/tests/Rector/ClassConstFetch/ShopwareVersionConstsRector/ShopwareVersionConstsRectorTest.php index 9f2a7353c416..94f00d35f82b 100644 --- a/packages/Shopware/tests/Rector/ClassConstFetch/ShopwareVersionConstsRector/ShopwareVersionConstsRectorTest.php +++ b/packages/Shopware/tests/Rector/ClassConstFetch/ShopwareVersionConstsRector/ShopwareVersionConstsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Shopware/tests/Rector/MethodCall/ReplaceEnlightResponseWithSymfonyResponseRector/ReplaceEnlightResponseWithSymfonyResponseRectorTest.php b/packages/Shopware/tests/Rector/MethodCall/ReplaceEnlightResponseWithSymfonyResponseRector/ReplaceEnlightResponseWithSymfonyResponseRectorTest.php index 79ad7ab4c500..4f1b51104bbb 100644 --- a/packages/Shopware/tests/Rector/MethodCall/ReplaceEnlightResponseWithSymfonyResponseRector/ReplaceEnlightResponseWithSymfonyResponseRectorTest.php +++ b/packages/Shopware/tests/Rector/MethodCall/ReplaceEnlightResponseWithSymfonyResponseRector/ReplaceEnlightResponseWithSymfonyResponseRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Shopware/tests/Rector/MethodCall/ShopRegistrationServiceRector/ShopRegistrationServiceRectorTest.php b/packages/Shopware/tests/Rector/MethodCall/ShopRegistrationServiceRector/ShopRegistrationServiceRectorTest.php index 23bfc1af8b47..4f612da30236 100644 --- a/packages/Shopware/tests/Rector/MethodCall/ShopRegistrationServiceRector/ShopRegistrationServiceRectorTest.php +++ b/packages/Shopware/tests/Rector/MethodCall/ShopRegistrationServiceRector/ShopRegistrationServiceRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Silverstripe/tests/Rector/ConstantToStaticCallRector/ConstantToStaticCallRectorTest.php b/packages/Silverstripe/tests/Rector/ConstantToStaticCallRector/ConstantToStaticCallRectorTest.php index 905ea6bd46f4..b436e29b79b2 100644 --- a/packages/Silverstripe/tests/Rector/ConstantToStaticCallRector/ConstantToStaticCallRectorTest.php +++ b/packages/Silverstripe/tests/Rector/ConstantToStaticCallRector/ConstantToStaticCallRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Silverstripe/tests/Rector/DefineConstantToStaticCallRector/DefineConstantToStaticCallRectorTest.php b/packages/Silverstripe/tests/Rector/DefineConstantToStaticCallRector/DefineConstantToStaticCallRectorTest.php index 74137a315d08..b0b9d868c880 100644 --- a/packages/Silverstripe/tests/Rector/DefineConstantToStaticCallRector/DefineConstantToStaticCallRectorTest.php +++ b/packages/Silverstripe/tests/Rector/DefineConstantToStaticCallRector/DefineConstantToStaticCallRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/StrictCodeQuality/tests/Rector/Stmt/VarInlineAnnotationToAssertRector/VarInlineAnnotationToAssertRectorTest.php b/packages/StrictCodeQuality/tests/Rector/Stmt/VarInlineAnnotationToAssertRector/VarInlineAnnotationToAssertRectorTest.php index 60515fd0cd1a..2e249396914b 100644 --- a/packages/StrictCodeQuality/tests/Rector/Stmt/VarInlineAnnotationToAssertRector/VarInlineAnnotationToAssertRectorTest.php +++ b/packages/StrictCodeQuality/tests/Rector/Stmt/VarInlineAnnotationToAssertRector/VarInlineAnnotationToAssertRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/scalar.php.inc']; - yield [__DIR__ . '/Fixture/assign_fresh_var.php.inc']; - yield [__DIR__ . '/Fixture/skip_missing_variable.php.inc']; - yield [__DIR__ . '/Fixture/skip_property.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Sylius/tests/Rector/Review/ReplaceCreateMethodWithoutReviewerRectorTest.php b/packages/Sylius/tests/Rector/Review/ReplaceCreateMethodWithoutReviewerRectorTest.php index 7a0ae52c7d2c..4cf4e4f053d5 100644 --- a/packages/Sylius/tests/Rector/Review/ReplaceCreateMethodWithoutReviewerRectorTest.php +++ b/packages/Sylius/tests/Rector/Review/ReplaceCreateMethodWithoutReviewerRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/BinaryOp/ResponseStatusCodeRector/ResponseStatusCodeRectorTest.php b/packages/Symfony/tests/Rector/BinaryOp/ResponseStatusCodeRector/ResponseStatusCodeRectorTest.php index 6a14c5f2713c..d2fc64e710d9 100644 --- a/packages/Symfony/tests/Rector/BinaryOp/ResponseStatusCodeRector/ResponseStatusCodeRectorTest.php +++ b/packages/Symfony/tests/Rector/BinaryOp/ResponseStatusCodeRector/ResponseStatusCodeRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector/MergeMethodAnnotationToRouteAnnotationRectorTest.php b/packages/Symfony/tests/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector/MergeMethodAnnotationToRouteAnnotationRectorTest.php index aff8e5892f45..8059afcf62fd 100644 --- a/packages/Symfony/tests/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector/MergeMethodAnnotationToRouteAnnotationRectorTest.php +++ b/packages/Symfony/tests/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector/MergeMethodAnnotationToRouteAnnotationRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Class_/MakeCommandLazyRector/MakeCommandLazyRectorTest.php b/packages/Symfony/tests/Rector/Class_/MakeCommandLazyRector/MakeCommandLazyRectorTest.php index 95688c2f07c2..5d38cbabfe7c 100644 --- a/packages/Symfony/tests/Rector/Class_/MakeCommandLazyRector/MakeCommandLazyRectorTest.php +++ b/packages/Symfony/tests/Rector/Class_/MakeCommandLazyRector/MakeCommandLazyRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/in_construct.php.inc']; - yield [__DIR__ . '/Fixture/in_construct_with_param.php.inc']; - yield [__DIR__ . '/Fixture/constant_defined_name.php.inc']; - yield [__DIR__ . '/Fixture/set_name_fluent.php.inc']; - yield [__DIR__ . '/Fixture/static_in_execute.php.inc']; - yield [__DIR__ . '/Fixture/skip_non_string_param_construct.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Console/ConsoleExceptionToErrorEventConstantRector/ConsoleExceptionToErrorEventConstantRectorTest.php b/packages/Symfony/tests/Rector/Console/ConsoleExceptionToErrorEventConstantRector/ConsoleExceptionToErrorEventConstantRectorTest.php index 823c619bc91f..b20f59d3e5f0 100644 --- a/packages/Symfony/tests/Rector/Console/ConsoleExceptionToErrorEventConstantRector/ConsoleExceptionToErrorEventConstantRectorTest.php +++ b/packages/Symfony/tests/Rector/Console/ConsoleExceptionToErrorEventConstantRector/ConsoleExceptionToErrorEventConstantRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Console/ConsoleExecuteReturnIntRector/ConsoleExecuteReturnIntRectorTest.php b/packages/Symfony/tests/Rector/Console/ConsoleExecuteReturnIntRector/ConsoleExecuteReturnIntRectorTest.php index 9015c8d95379..fc32685cd2d6 100644 --- a/packages/Symfony/tests/Rector/Console/ConsoleExecuteReturnIntRector/ConsoleExecuteReturnIntRectorTest.php +++ b/packages/Symfony/tests/Rector/Console/ConsoleExecuteReturnIntRector/ConsoleExecuteReturnIntRectorTest.php @@ -20,19 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/extends-command-not-directly.php.inc']; - yield [__DIR__ . '/Fixture/coalesce.php.inc']; - yield [__DIR__ . '/Fixture/explicit-return-null.php.inc']; - yield [__DIR__ . '/Fixture/no-return.php.inc']; - yield [__DIR__ . '/Fixture/empty-return.php.inc']; - yield [__DIR__ . '/Fixture/multiple-returns.php.inc']; - yield [__DIR__ . '/Fixture/add-return-type.php.inc']; - yield [__DIR__ . '/Fixture/return-function-call.php.inc']; - yield [__DIR__ . '/Fixture/return-static-function-call.php.inc']; - - // skip - yield [__DIR__ . '/Fixture/skip_non_console_command.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_int.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Controller/ActionSuffixRemoverRector/ActionSuffixRemoverRectorTest.php b/packages/Symfony/tests/Rector/Controller/ActionSuffixRemoverRector/ActionSuffixRemoverRectorTest.php index c9d638d9fe7b..dabfeaac21d2 100644 --- a/packages/Symfony/tests/Rector/Controller/ActionSuffixRemoverRector/ActionSuffixRemoverRectorTest.php +++ b/packages/Symfony/tests/Rector/Controller/ActionSuffixRemoverRector/ActionSuffixRemoverRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Controller/AddFlashRector/AddFlashRectorTest.php b/packages/Symfony/tests/Rector/Controller/AddFlashRector/AddFlashRectorTest.php index 7eefb2715331..826033770666 100644 --- a/packages/Symfony/tests/Rector/Controller/AddFlashRector/AddFlashRectorTest.php +++ b/packages/Symfony/tests/Rector/Controller/AddFlashRector/AddFlashRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Controller/RedirectToRouteRector/RedirectToRouteRectorTest.php b/packages/Symfony/tests/Rector/Controller/RedirectToRouteRector/RedirectToRouteRectorTest.php index e86320634ae2..43d47d46a364 100644 --- a/packages/Symfony/tests/Rector/Controller/RedirectToRouteRector/RedirectToRouteRectorTest.php +++ b/packages/Symfony/tests/Rector/Controller/RedirectToRouteRector/RedirectToRouteRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/DependencyInjection/ContainerBuilderCompileEnvArgumentRector/ContainerBuilderCompileEnvArgumentRectorTest.php b/packages/Symfony/tests/Rector/DependencyInjection/ContainerBuilderCompileEnvArgumentRector/ContainerBuilderCompileEnvArgumentRectorTest.php index 97827e2e987d..f7f935bb0a8e 100644 --- a/packages/Symfony/tests/Rector/DependencyInjection/ContainerBuilderCompileEnvArgumentRector/ContainerBuilderCompileEnvArgumentRectorTest.php +++ b/packages/Symfony/tests/Rector/DependencyInjection/ContainerBuilderCompileEnvArgumentRector/ContainerBuilderCompileEnvArgumentRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Form/FormIsValidRector/FormIsValidRectorTest.php b/packages/Symfony/tests/Rector/Form/FormIsValidRector/FormIsValidRectorTest.php index efd2cb45d118..6de6303add6a 100644 --- a/packages/Symfony/tests/Rector/Form/FormIsValidRector/FormIsValidRectorTest.php +++ b/packages/Symfony/tests/Rector/Form/FormIsValidRector/FormIsValidRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_nested_if.php.inc']; - yield [__DIR__ . '/Fixture/skip_negative_if.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Form/FormTypeGetParentRector/FormTypeGetParentRectorTest.php b/packages/Symfony/tests/Rector/Form/FormTypeGetParentRector/FormTypeGetParentRectorTest.php index 540569d1006d..79b051b75291 100644 --- a/packages/Symfony/tests/Rector/Form/FormTypeGetParentRector/FormTypeGetParentRectorTest.php +++ b/packages/Symfony/tests/Rector/Form/FormTypeGetParentRector/FormTypeGetParentRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/abstract_type.php.inc']; - yield [__DIR__ . '/Fixture/abstract_type_extension.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Form/OptionNameRector/Fixture/fixture.php.inc b/packages/Symfony/tests/Rector/Form/OptionNameRector/Fixture/fixture.php.inc deleted file mode 100644 index 7d18e4076952..000000000000 --- a/packages/Symfony/tests/Rector/Form/OptionNameRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,61 +0,0 @@ -add('name', 'text', array('label' => 'form.name')) - ->add('price1', 'text', array( - 'label' => 'form.price1', - 'precision' => 3, - )) - ->add('price2', 'text', array( - 'precision' => 3, - )) - ->add('discount', 'integer', [ - 'label' => 'form.email', - 'virtual' => true, - ]) - ->add('password', 'password') - ; - } -} - -?> ------ -add('name', 'text', array('label' => 'form.name')) - ->add('price1', 'text', array( - 'label' => 'form.price1', - 'scale' => 3, - )) - ->add('price2', 'text', array( - 'scale' => 3, - )) - ->add('discount', 'integer', [ - 'label' => 'form.email', - 'inherit_data' => true, - ]) - ->add('password', 'password') - ; - } -} - -?> diff --git a/packages/Symfony/tests/Rector/Form/OptionNameRector/OptionNameRectorTest.php b/packages/Symfony/tests/Rector/Form/OptionNameRector/OptionNameRectorTest.php index 841a823bd1c7..f9c8eabfff35 100644 --- a/packages/Symfony/tests/Rector/Form/OptionNameRector/OptionNameRectorTest.php +++ b/packages/Symfony/tests/Rector/Form/OptionNameRector/OptionNameRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Form/StringFormTypeToClassRector/StringFormTypeToClassRectorTest.php b/packages/Symfony/tests/Rector/Form/StringFormTypeToClassRector/StringFormTypeToClassRectorTest.php index f1e1a99aa33d..79de38941a96 100644 --- a/packages/Symfony/tests/Rector/Form/StringFormTypeToClassRector/StringFormTypeToClassRectorTest.php +++ b/packages/Symfony/tests/Rector/Form/StringFormTypeToClassRector/StringFormTypeToClassRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/FrameworkBundle/ContainerGetToConstructorInjectionRector/ContainerGetToConstructorInjectionRectorTest.php b/packages/Symfony/tests/Rector/FrameworkBundle/ContainerGetToConstructorInjectionRector/ContainerGetToConstructorInjectionRectorTest.php index bdb6e2c62e31..0651d84648e4 100644 --- a/packages/Symfony/tests/Rector/FrameworkBundle/ContainerGetToConstructorInjectionRector/ContainerGetToConstructorInjectionRectorTest.php +++ b/packages/Symfony/tests/Rector/FrameworkBundle/ContainerGetToConstructorInjectionRector/ContainerGetToConstructorInjectionRectorTest.php @@ -26,10 +26,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/my_command.php.inc']; - yield [__DIR__ . '/Fixture/first_class.php.inc']; - yield [__DIR__ . '/Fixture/some_controller.inc']; - yield [__DIR__ . '/Fixture/parent_class_with_in_construct_call.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Symfony/tests/Rector/FrameworkBundle/GetParameterToConstructorInjectionRector/GetParameterToConstructorInjectionRectorTest.php b/packages/Symfony/tests/Rector/FrameworkBundle/GetParameterToConstructorInjectionRector/GetParameterToConstructorInjectionRectorTest.php index ff3d95a83a01..9d4de9ebdd09 100644 --- a/packages/Symfony/tests/Rector/FrameworkBundle/GetParameterToConstructorInjectionRector/GetParameterToConstructorInjectionRectorTest.php +++ b/packages/Symfony/tests/Rector/FrameworkBundle/GetParameterToConstructorInjectionRector/GetParameterToConstructorInjectionRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/FrameworkBundle/GetToConstructorInjectionRector/GetToConstructorInjectionRectorTest.php b/packages/Symfony/tests/Rector/FrameworkBundle/GetToConstructorInjectionRector/GetToConstructorInjectionRectorTest.php index c72f5f5c454c..1c011e115800 100644 --- a/packages/Symfony/tests/Rector/FrameworkBundle/GetToConstructorInjectionRector/GetToConstructorInjectionRectorTest.php +++ b/packages/Symfony/tests/Rector/FrameworkBundle/GetToConstructorInjectionRector/GetToConstructorInjectionRectorTest.php @@ -25,10 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/packages/Symfony/tests/Rector/HttpKernel/GetRequestRector/GetRequestRectorTest.php b/packages/Symfony/tests/Rector/HttpKernel/GetRequestRector/GetRequestRectorTest.php index 9e6076bfc85d..34efc545019e 100644 --- a/packages/Symfony/tests/Rector/HttpKernel/GetRequestRector/GetRequestRectorTest.php +++ b/packages/Symfony/tests/Rector/HttpKernel/GetRequestRector/GetRequestRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/skip_event_subscriber.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/MethodCall/CascadeValidationFormBuilderRector/CascadeValidationFormBuilderRectorTest.php b/packages/Symfony/tests/Rector/MethodCall/CascadeValidationFormBuilderRector/CascadeValidationFormBuilderRectorTest.php index aef354c1ce11..c57fe134b2fe 100644 --- a/packages/Symfony/tests/Rector/MethodCall/CascadeValidationFormBuilderRector/CascadeValidationFormBuilderRectorTest.php +++ b/packages/Symfony/tests/Rector/MethodCall/CascadeValidationFormBuilderRector/CascadeValidationFormBuilderRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/MethodCall/FormTypeInstanceToClassConstRector/FormTypeInstanceToClassConstRectorTest.php b/packages/Symfony/tests/Rector/MethodCall/FormTypeInstanceToClassConstRector/FormTypeInstanceToClassConstRectorTest.php index f57efd75c109..c2a58d918b61 100644 --- a/packages/Symfony/tests/Rector/MethodCall/FormTypeInstanceToClassConstRector/FormTypeInstanceToClassConstRectorTest.php +++ b/packages/Symfony/tests/Rector/MethodCall/FormTypeInstanceToClassConstRector/FormTypeInstanceToClassConstRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/MakeDispatchFirstArgumentEventRectorTest.php b/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/MakeDispatchFirstArgumentEventRectorTest.php index 9a15d533675f..ccfba3f65acf 100644 --- a/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/MakeDispatchFirstArgumentEventRectorTest.php +++ b/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/MakeDispatchFirstArgumentEventRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/event_class_constant.php.inc']; - yield [__DIR__ . '/Fixture/get_class.php.inc']; - yield [__DIR__ . '/Fixture/keep_string_event_constant.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/MethodCall/ReadOnlyOptionToAttributeRector/ReadOnlyOptionToAttributeRectorTest.php b/packages/Symfony/tests/Rector/MethodCall/ReadOnlyOptionToAttributeRector/ReadOnlyOptionToAttributeRectorTest.php index 25f3ecca7f49..b9b91a1e3874 100644 --- a/packages/Symfony/tests/Rector/MethodCall/ReadOnlyOptionToAttributeRector/ReadOnlyOptionToAttributeRectorTest.php +++ b/packages/Symfony/tests/Rector/MethodCall/ReadOnlyOptionToAttributeRector/ReadOnlyOptionToAttributeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/MethodCall/SimplifyWebTestCaseAssertionsRector/SimplifyWebTestCaseAssertionsRectorTest.php b/packages/Symfony/tests/Rector/MethodCall/SimplifyWebTestCaseAssertionsRector/SimplifyWebTestCaseAssertionsRectorTest.php index a821922d750e..044318527c44 100644 --- a/packages/Symfony/tests/Rector/MethodCall/SimplifyWebTestCaseAssertionsRector/SimplifyWebTestCaseAssertionsRectorTest.php +++ b/packages/Symfony/tests/Rector/MethodCall/SimplifyWebTestCaseAssertionsRector/SimplifyWebTestCaseAssertionsRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/response_code_same.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/New_/RootNodeTreeBuilderRector/RootNodeTreeBuilderRectorTest.php b/packages/Symfony/tests/Rector/New_/RootNodeTreeBuilderRector/RootNodeTreeBuilderRectorTest.php index ef07183e414b..844a573d78fc 100644 --- a/packages/Symfony/tests/Rector/New_/RootNodeTreeBuilderRector/RootNodeTreeBuilderRectorTest.php +++ b/packages/Symfony/tests/Rector/New_/RootNodeTreeBuilderRector/RootNodeTreeBuilderRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/New_/StringToArrayArgumentProcessRector/StringToArrayArgumentProcessRectorTest.php b/packages/Symfony/tests/Rector/New_/StringToArrayArgumentProcessRector/StringToArrayArgumentProcessRectorTest.php index 34a8cfbcb363..d7d616b5977b 100644 --- a/packages/Symfony/tests/Rector/New_/StringToArrayArgumentProcessRector/StringToArrayArgumentProcessRectorTest.php +++ b/packages/Symfony/tests/Rector/New_/StringToArrayArgumentProcessRector/StringToArrayArgumentProcessRectorTest.php @@ -20,13 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/with_sprintf.php.inc']; - yield [__DIR__ . '/Fixture/skip_anonymous_class.php.inc']; - yield [__DIR__ . '/Fixture/skip_class_extending_traversable.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Process/ProcessBuilderGetProcessRector/ProcessBuilderGetProcessRectorTest.php b/packages/Symfony/tests/Rector/Process/ProcessBuilderGetProcessRector/ProcessBuilderGetProcessRectorTest.php index 77e2b38b6c00..228609c2b72f 100644 --- a/packages/Symfony/tests/Rector/Process/ProcessBuilderGetProcessRector/ProcessBuilderGetProcessRectorTest.php +++ b/packages/Symfony/tests/Rector/Process/ProcessBuilderGetProcessRector/ProcessBuilderGetProcessRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Process/ProcessBuilderInstanceRector/ProcessBuilderInstanceRectorTest.php b/packages/Symfony/tests/Rector/Process/ProcessBuilderInstanceRector/ProcessBuilderInstanceRectorTest.php index a9a6de7c0b0b..93f272b14ed4 100644 --- a/packages/Symfony/tests/Rector/Process/ProcessBuilderInstanceRector/ProcessBuilderInstanceRectorTest.php +++ b/packages/Symfony/tests/Rector/Process/ProcessBuilderInstanceRector/ProcessBuilderInstanceRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Validator/ConstraintUrlOptionRector/ConstraintUrlOptionRectorTest.php b/packages/Symfony/tests/Rector/Validator/ConstraintUrlOptionRector/ConstraintUrlOptionRectorTest.php index b9752624af97..93ef9de92569 100644 --- a/packages/Symfony/tests/Rector/Validator/ConstraintUrlOptionRector/ConstraintUrlOptionRectorTest.php +++ b/packages/Symfony/tests/Rector/Validator/ConstraintUrlOptionRector/ConstraintUrlOptionRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/VarDumper/VarDumperTestTraitMethodArgsRector/VarDumperTestTraitMethodArgsRectorTest.php b/packages/Symfony/tests/Rector/VarDumper/VarDumperTestTraitMethodArgsRector/VarDumperTestTraitMethodArgsRectorTest.php index 2dcf3885af13..6bcf6c0ba95d 100644 --- a/packages/Symfony/tests/Rector/VarDumper/VarDumperTestTraitMethodArgsRector/VarDumperTestTraitMethodArgsRectorTest.php +++ b/packages/Symfony/tests/Rector/VarDumper/VarDumperTestTraitMethodArgsRector/VarDumperTestTraitMethodArgsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Symfony/tests/Rector/Yaml/ParseFileRector/ParseFileRectorTest.php b/packages/Symfony/tests/Rector/Yaml/ParseFileRector/ParseFileRectorTest.php index 13529eed8790..6a8912d2bff9 100644 --- a/packages/Symfony/tests/Rector/Yaml/ParseFileRector/ParseFileRectorTest.php +++ b/packages/Symfony/tests/Rector/Yaml/ParseFileRector/ParseFileRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/SymfonyPHPUnit/tests/Rector/Class_/SelfContainerGetMethodCallFromTestToSetUpMethodRector/SelfContainerGetMethodCallFromTestToSetUpMethodRectorTest.php b/packages/SymfonyPHPUnit/tests/Rector/Class_/SelfContainerGetMethodCallFromTestToSetUpMethodRector/SelfContainerGetMethodCallFromTestToSetUpMethodRectorTest.php index 5e102623ff33..d1b8bf6c99d3 100644 --- a/packages/SymfonyPHPUnit/tests/Rector/Class_/SelfContainerGetMethodCallFromTestToSetUpMethodRector/SelfContainerGetMethodCallFromTestToSetUpMethodRectorTest.php +++ b/packages/SymfonyPHPUnit/tests/Rector/Class_/SelfContainerGetMethodCallFromTestToSetUpMethodRector/SelfContainerGetMethodCallFromTestToSetUpMethodRectorTest.php @@ -20,12 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/existing_setup.php.inc']; - yield [__DIR__ . '/Fixture/string_service_name.php.inc']; - yield [__DIR__ . '/Fixture/extends_parent_class_with_property.php.inc']; - yield [__DIR__ . '/Fixture/instant_call.php.inc']; - yield [__DIR__ . '/Fixture/skip_sessions.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/Twig/tests/Rector/SimpleFunctionAndFilterRector/SimpleFunctionAndFilterRectorTest.php b/packages/Twig/tests/Rector/SimpleFunctionAndFilterRector/SimpleFunctionAndFilterRectorTest.php index 6002b52b645f..6dd05cb19578 100644 --- a/packages/Twig/tests/Rector/SimpleFunctionAndFilterRector/SimpleFunctionAndFilterRectorTest.php +++ b/packages/Twig/tests/Rector/SimpleFunctionAndFilterRector/SimpleFunctionAndFilterRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayParamDocTypeRector/AddArrayParamDocTypeRectorTest.php b/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayParamDocTypeRector/AddArrayParamDocTypeRectorTest.php index 4cae86de82b2..1a73de4db41e 100644 --- a/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayParamDocTypeRector/AddArrayParamDocTypeRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayParamDocTypeRector/AddArrayParamDocTypeRectorTest.php @@ -20,11 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/from_property.php.inc']; - yield [__DIR__ . '/Fixture/from_getter.php.inc']; - yield [__DIR__ . '/Fixture/edge_case.php.inc']; - yield [__DIR__ . '/Fixture/keep_mixed.php.inc']; - yield [__DIR__ . '/Fixture/keep_filled.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/AddArrayReturnDocTypeRectorTest.php b/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/AddArrayReturnDocTypeRectorTest.php index 92d3608823a6..06990ceafecc 100644 --- a/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/AddArrayReturnDocTypeRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/AddArrayReturnDocTypeRectorTest.php @@ -20,25 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/setter_based.php.inc']; - yield [__DIR__ . '/Fixture/simple_array.php.inc']; - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fully_qualified_name.php.inc']; - yield [__DIR__ . '/Fixture/fully_qualified_name_nested_array.php.inc']; - yield [__DIR__ . '/Fixture/yield_strings.php.inc']; - yield [__DIR__ . '/Fixture/add_without_return_type_declaration.php.inc']; - yield [__DIR__ . '/Fixture/fix_incorrect_array.php.inc']; - yield [__DIR__ . '/Fixture/return_uuid.php.inc']; - - // skip - yield [__DIR__ . '/Fixture/skip_too_many.php.inc']; - yield [__DIR__ . '/Fixture/skip_too_many_2.php.inc']; - yield [__DIR__ . '/Fixture/skip_mixed_of_specific_override.php.inc']; - yield [__DIR__ . '/Fixture/skip_closure_callable_override.php.inc']; - yield [__DIR__ . '/Fixture/skip_shorten_class_name.php.inc']; - yield [__DIR__ . '/Fixture/skip_constructor.php.inc']; - yield [__DIR__ . '/Fixture/skip_inner_function_return.php.inc']; - yield [__DIR__ . '/Fixture/skip_array_after_array_type.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/ClassMethod/AddMethodCallBasedParamTypeRector/AddMethodCallBasedParamTypeRectorTest.php b/packages/TypeDeclaration/tests/Rector/ClassMethod/AddMethodCallBasedParamTypeRector/AddMethodCallBasedParamTypeRectorTest.php index b25b3e7429c2..a147555ba117 100644 --- a/packages/TypeDeclaration/tests/Rector/ClassMethod/AddMethodCallBasedParamTypeRector/AddMethodCallBasedParamTypeRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/ClassMethod/AddMethodCallBasedParamTypeRector/AddMethodCallBasedParamTypeRectorTest.php @@ -20,14 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/second_position.php.inc']; - yield [__DIR__ . '/Fixture/static_call.php.inc']; - yield [__DIR__ . '/Fixture/assigned_variable.php.inc']; - yield [__DIR__ . '/Fixture/instant_class_call.php.inc']; - yield [__DIR__ . '/Fixture/unioned_double_calls.php.inc']; - yield [__DIR__ . '/Fixture/override.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_completed.php.inc']; - yield [__DIR__ . '/Fixture/skip_mixed.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/Closure/AddClosureReturnTypeRector/AddClosureReturnTypeRectorTest.php b/packages/TypeDeclaration/tests/Rector/Closure/AddClosureReturnTypeRector/AddClosureReturnTypeRectorTest.php index ba17a1ef5269..0ec697b13030 100644 --- a/packages/TypeDeclaration/tests/Rector/Closure/AddClosureReturnTypeRector/AddClosureReturnTypeRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/Closure/AddClosureReturnTypeRector/AddClosureReturnTypeRectorTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/return_type_object.php.inc']; - yield [__DIR__ . '/Fixture/callable_false_positive.php.inc']; - yield [__DIR__ . '/Fixture/subtype_of_object.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/Fixture/aliased.php.inc b/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/Fixture/aliased.php.inc deleted file mode 100644 index f22e2c699b8b..000000000000 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/Fixture/aliased.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/ParamTypeDeclarationRectorTest.php b/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/ParamTypeDeclarationRectorTest.php index 12d1afa4260b..9c44f3eb0db5 100644 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/ParamTypeDeclarationRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/FunctionLike/ParamTypeDeclarationRector/ParamTypeDeclarationRectorTest.php @@ -20,70 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - // @todo fix later - yield [__DIR__ . '/Fixture/aliased.php.inc']; - - yield [__DIR__ . '/Fixture/this.php.inc']; - yield [__DIR__ . '/Fixture/complex_array.php.inc']; - yield [__DIR__ . '/Fixture/php-cs-fixer-param/skip.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/type_aliases_and_whitelisting.php.inc']; - - yield [__DIR__ . '/Fixture/reference_symbol_in_docblock.php.inc']; - yield [__DIR__ . '/Fixture/trait_interface.php.inc']; - // static types - yield [__DIR__ . '/Fixture/known_static_conflicts.php.inc']; - // various - yield [__DIR__ . '/Fixture/variadic.php.inc']; - yield [__DIR__ . '/Fixture/mixed.php.inc']; - yield [__DIR__ . '/Fixture/resource.php.inc']; - yield [__DIR__ . '/Fixture/skip_nullable_resource.php.inc']; - yield [__DIR__ . '/Fixture/false.php.inc']; - yield [__DIR__ . '/Fixture/undesired.php.inc']; - yield [__DIR__ . '/Fixture/external_scope.php.inc']; - yield [__DIR__ . '/Fixture/local_and_external_scope.php.inc']; - yield [__DIR__ . '/Fixture/local_scope_with_parent_interface.php.inc']; - yield [__DIR__ . '/Fixture/local_scope_with_parent_class.php.inc']; - yield [__DIR__ . '/Fixture/local_scope_with_parent_class2.php.inc']; - - // php cs fixer param set - - https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/4a47b6df0bf718b49269fa9920b3723d802332dc/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php - yield [__DIR__ . '/Fixture/php-cs-fixer-param/array_native_type.php.inc']; - yield [__DIR__ . '/Fixture/php-cs-fixer-param/array_of_types.php.inc']; - - yield [__DIR__ . '/Fixture/php-cs-fixer-param/callable_type.php.inc']; - - yield [__DIR__ . '/Fixture/php-cs-fixer-param/self_accessor.php.inc']; - - yield [__DIR__ . '/Fixture/php-cs-fixer-param/unsorted.php.inc']; - - yield [__DIR__ . '/Fixture/php-cs-fixer-param/interface.php.inc']; - yield [__DIR__ . '/Fixture/php-cs-fixer-param/non_root_class_with_different_types_of_params.php.inc']; - yield [__DIR__ . '/Fixture/php-cs-fixer-param/nullable.php.inc']; - yield [__DIR__ . '/Fixture/php-cs-fixer-param/number.php.inc']; - - yield [__DIR__ . '/Fixture/php-cs-fixer-param/iterable_return_on_7_1.php.inc']; - - // nikic set - https://github.com/nikic/TypeUtil/ - yield [__DIR__ . '/Fixture/nikic/anon_class.php.inc']; - yield [__DIR__ . '/Fixture/nikic/basic.php.inc']; - yield [__DIR__ . '/Fixture/nikic/null.php.inc']; - yield [__DIR__ . '/Fixture/nikic/nullable.php.inc']; - yield [__DIR__ . '/Fixture/nikic/rename.php.inc']; - - yield [__DIR__ . '/Fixture/nikic/iterable.php.inc']; - - // dunglas set - https://github.com/dunglas/phpdoc-to-typehint/ - yield [__DIR__ . '/Fixture/dunglas/array_no_types.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/BarInterface.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/BazTrait.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/by_reference.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/Child.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/functions.php.inc']; - - yield [__DIR__ . '/Fixture/dunglas/functions2.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/param_no_type.php.inc']; - yield [__DIR__ . '/Fixture/php-cs-fixer-param/root_class.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/nullable_types.php.inc']; - - yield [__DIR__ . '/Fixture/nikic/nullable_inheritance.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CorrectionTest.php b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CorrectionTest.php index eef5aa72bfdb..ffa4b6bb8133 100644 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CorrectionTest.php +++ b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CorrectionTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/Correction/constructor_property_assign_over_getter.php.inc']; - yield [__DIR__ . '/Fixture/Correction/prefix_fqn.php.inc']; - yield [__DIR__ . '/Fixture/Correction/skip_override_of_the_same_class.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CovarianceTest.php b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CovarianceTest.php index b2951280c4ca..fe165e1471a9 100644 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CovarianceTest.php +++ b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/CovarianceTest.php @@ -20,10 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/nikic/inheritance_covariance.php.inc']; - yield [__DIR__ . '/Fixture/nikic/inheritance_covariance_order.php.inc']; - yield [__DIR__ . '/Fixture/Covariance/return_interface_to_class.php.inc']; - yield [__DIR__ . '/Fixture/Covariance/return_nullable_with_parent_interface.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getPhpVersion(): string diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Fixture/PhpCsFixerReturn/invalid_void.php.inc b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Fixture/PhpCsFixerReturn/invalid_void.php.inc deleted file mode 100644 index 6768c2a46677..000000000000 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Fixture/PhpCsFixerReturn/invalid_void.php.inc +++ /dev/null @@ -1,4 +0,0 @@ -yieldFilesFromDirectory(__DIR__ . '/FixtureInheritance'); } protected function getPhpVersion(): string diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Php72RectorTest.php b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Php72RectorTest.php index 076a811008c6..16b6e2549806 100644 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Php72RectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Php72RectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/nikic/object_php72.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureForPhp72'); } protected function getPhpVersion(): string diff --git a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/ReturnTypeDeclarationRectorTest.php b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/ReturnTypeDeclarationRectorTest.php index 935ade06a47d..a99781522a51 100644 --- a/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/ReturnTypeDeclarationRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/ReturnTypeDeclarationRectorTest.php @@ -20,50 +20,7 @@ public function test(string $file): void public function provideDataForTests(): Iterator { - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/various.php.inc']; - yield [__DIR__ . '/Fixture/skip_mixed_and_string.php.inc']; - yield [__DIR__ . '/Fixture/skip_self.php.inc']; - - // static types - yield [__DIR__ . '/Fixture/void_type.php.inc']; - yield [__DIR__ . '/Fixture/no_void_abstract.php.inc']; - yield [__DIR__ . '/Fixture/code_over_doc_priority.php.inc']; - yield [__DIR__ . '/Fixture/known_static.php.inc']; - yield [__DIR__ . '/Fixture/known_static_void.php.inc']; - yield [__DIR__ . '/Fixture/known_static_method.php.inc']; - yield [__DIR__ . '/Fixture/known_static_object.php.inc']; - yield [__DIR__ . '/Fixture/known_static_object_parent.php.inc']; - yield [__DIR__ . '/Fixture/known_static_conflicts.php.inc']; - - yield [__DIR__ . '/Fixture/known_static_nullable.php.inc']; - yield [__DIR__ . '/Fixture/known_static_nullable_float.php.inc']; - yield [__DIR__ . '/Fixture/known_float.php.inc']; - yield [__DIR__ . '/Fixture/trait_interface.php.inc']; - yield [__DIR__ . '/Fixture/this.php.inc']; - yield [__DIR__ . '/Fixture/false.php.inc']; - yield [__DIR__ . '/Fixture/complex_array.php.inc']; - yield [__DIR__ . '/Fixture/generator.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/invalid_class.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/invalid_return.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/blacklisted_class_methods.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/various_2.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/arrays.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/skip.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/skip_union_object_object_type.php.inc']; - yield [__DIR__ . '/Fixture/PhpCsFixerReturn/nullables.php.inc']; - yield [__DIR__ . '/Fixture/nikic/iterable.php.inc']; - yield [__DIR__ . '/Fixture/nikic/null.php.inc']; - yield [__DIR__ . '/Fixture/nikic/nullable.php.inc']; - yield [__DIR__ . '/Fixture/nikic/object.php.inc']; - yield [__DIR__ . '/Fixture/nikic/unsupported_types.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/BarInterface.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/BazTrait.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/Child.php.inc']; - yield [__DIR__ . '/Fixture/dunglas/nullable_types.php.inc']; - // anonymous class - yield [__DIR__ . '/Fixture/a_new_class.php.inc']; - - yield [__DIR__ . '/Fixture/skip_iterable_array_iterator_co_type.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/TypeDeclaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/CompleteVarDocTypePropertyRectorTest.php b/packages/TypeDeclaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/CompleteVarDocTypePropertyRectorTest.php index 2701a80bd39c..deef15011212 100644 --- a/packages/TypeDeclaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/CompleteVarDocTypePropertyRectorTest.php +++ b/packages/TypeDeclaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/CompleteVarDocTypePropertyRectorTest.php @@ -20,15 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/keep_comment.php.inc']; - yield [__DIR__ . '/Fixture/property_assign.php.inc']; - yield [__DIR__ . '/Fixture/default_value.php.inc']; - yield [__DIR__ . '/Fixture/assign_conflict.php.inc']; - yield [__DIR__ . '/Fixture/callable_type.php.inc']; - yield [__DIR__ . '/Fixture/typed_array.php.inc']; - yield [__DIR__ . '/Fixture/typed_array_nested.php.inc']; - yield [__DIR__ . '/Fixture/symfony_console_command.php.inc']; - yield [__DIR__ . '/Fixture/skip_more_specific.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/ClassMethod/GetParamToClassMethodParameterAndRouteRector/GetParamToClassMethodParameterAndRouteRectorTest.php b/packages/ZendToSymfony/tests/Rector/ClassMethod/GetParamToClassMethodParameterAndRouteRector/GetParamToClassMethodParameterAndRouteRectorTest.php index 0568b0f940b2..d7aa82483006 100644 --- a/packages/ZendToSymfony/tests/Rector/ClassMethod/GetParamToClassMethodParameterAndRouteRector/GetParamToClassMethodParameterAndRouteRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/ClassMethod/GetParamToClassMethodParameterAndRouteRector/GetParamToClassMethodParameterAndRouteRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/get_param_to_request.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisRequestToRequestParameterRector/ThisRequestToRequestParameterRectorTest.php b/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisRequestToRequestParameterRector/ThisRequestToRequestParameterRectorTest.php index 5dd1b7b22910..61917d15214e 100644 --- a/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisRequestToRequestParameterRector/ThisRequestToRequestParameterRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisRequestToRequestParameterRector/ThisRequestToRequestParameterRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/this_request_to_parameter.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisViewToThisRenderResponseRector/ThisViewToThisRenderResponseRectorTest.php b/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisViewToThisRenderResponseRector/ThisViewToThisRenderResponseRectorTest.php index 1de62fae9017..428150410c98 100644 --- a/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisViewToThisRenderResponseRector/ThisViewToThisRenderResponseRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/ClassMethod/ThisViewToThisRenderResponseRector/ThisViewToThisRenderResponseRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/this_view_to_this_render.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/Class_/ChangeZendControllerClassToSymfonyControllerClassRector/ChangeZendControllerClassToSymfonyControllerClassRectorTest.php b/packages/ZendToSymfony/tests/Rector/Class_/ChangeZendControllerClassToSymfonyControllerClassRector/ChangeZendControllerClassToSymfonyControllerClassRectorTest.php index ea830eb3fbee..5d801c02d28f 100644 --- a/packages/ZendToSymfony/tests/Rector/Class_/ChangeZendControllerClassToSymfonyControllerClassRector/ChangeZendControllerClassToSymfonyControllerClassRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/Class_/ChangeZendControllerClassToSymfonyControllerClassRector/ChangeZendControllerClassToSymfonyControllerClassRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/zend_controller.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/Expression/RedirectorToRedirectToUrlRector/RedirectorToRedirectToUrlRectorTest.php b/packages/ZendToSymfony/tests/Rector/Expression/RedirectorToRedirectToUrlRector/RedirectorToRedirectToUrlRectorTest.php index ba54ac499cb1..7242f6965df5 100644 --- a/packages/ZendToSymfony/tests/Rector/Expression/RedirectorToRedirectToUrlRector/RedirectorToRedirectToUrlRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/Expression/RedirectorToRedirectToUrlRector/RedirectorToRedirectToUrlRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/redirector.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/Include_/RemoveAutoloadingIncludeRector/RemoveAutoloadingIncludeRectorTest.php b/packages/ZendToSymfony/tests/Rector/Include_/RemoveAutoloadingIncludeRector/RemoveAutoloadingIncludeRectorTest.php index 84bb8674d6c8..efc004fca4cd 100644 --- a/packages/ZendToSymfony/tests/Rector/Include_/RemoveAutoloadingIncludeRector/RemoveAutoloadingIncludeRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/Include_/RemoveAutoloadingIncludeRector/RemoveAutoloadingIncludeRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/simple_include.php.inc']; - yield [__DIR__ . '/Fixture/keep_non_autoload_includes.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/packages/ZendToSymfony/tests/Rector/MethodCall/ThisHelperToServiceMethodCallRector/ThisHelperToServiceMethodCallRectorTest.php b/packages/ZendToSymfony/tests/Rector/MethodCall/ThisHelperToServiceMethodCallRector/ThisHelperToServiceMethodCallRectorTest.php index 39bc818e06b5..13f85370b0f4 100644 --- a/packages/ZendToSymfony/tests/Rector/MethodCall/ThisHelperToServiceMethodCallRector/ThisHelperToServiceMethodCallRectorTest.php +++ b/packages/ZendToSymfony/tests/Rector/MethodCall/ThisHelperToServiceMethodCallRector/ThisHelperToServiceMethodCallRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/this_helper_to_service.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/src/Console/Output/ConsoleOutputFormatter.php b/src/Console/Output/ConsoleOutputFormatter.php index 3f399b58cf7b..0a34f49cca3f 100644 --- a/src/Console/Output/ConsoleOutputFormatter.php +++ b/src/Console/Output/ConsoleOutputFormatter.php @@ -84,7 +84,7 @@ private function reportFileDiffs(array $fileDiffs): void $this->symfonyStyle->newLine(); if ($fileDiff->getAppliedRectorClasses() !== []) { - $this->symfonyStyle->writeln('Applied rectors:'); + $this->symfonyStyle->writeln('Applied rules:'); $this->symfonyStyle->newLine(); $this->symfonyStyle->listing($fileDiff->getAppliedRectorClasses()); $this->symfonyStyle->newLine(); diff --git a/src/Testing/PHPUnit/AbstractGenericRectorTestCase.php b/src/Testing/PHPUnit/AbstractGenericRectorTestCase.php index 7d2e8f9c1b25..4a0c301ccf0b 100644 --- a/src/Testing/PHPUnit/AbstractGenericRectorTestCase.php +++ b/src/Testing/PHPUnit/AbstractGenericRectorTestCase.php @@ -4,7 +4,9 @@ namespace Rector\Testing\PHPUnit; +use Iterator; use Rector\Exception\ShouldNotHappenException; +use Rector\Testing\StaticFixtureProvider; use Symplify\PackageBuilder\Tests\AbstractKernelTestCase; abstract class AbstractGenericRectorTestCase extends AbstractKernelTestCase @@ -48,6 +50,11 @@ protected function getCurrentTestRectorClassesWithConfiguration(): array */ abstract protected function getRectorInterface(): string; + protected function yieldFilesFromDirectory(string $directory): Iterator + { + return StaticFixtureProvider::yieldFilesFromDirectory($directory, '*.php.inc'); + } + private function ensureRectorClassIsValid(string $rectorClass, string $methodName): void { if (is_a($rectorClass, $this->getRectorInterface(), true)) { diff --git a/src/Testing/PHPUnit/AbstractNodeVisitorTestCase.php b/src/Testing/PHPUnit/AbstractNodeVisitorTestCase.php index 7f5199c6e4c2..b17bfec6543b 100644 --- a/src/Testing/PHPUnit/AbstractNodeVisitorTestCase.php +++ b/src/Testing/PHPUnit/AbstractNodeVisitorTestCase.php @@ -4,12 +4,14 @@ namespace Rector\Testing\PHPUnit; +use Iterator; use Nette\Utils\FileSystem; use PhpParser\Node; use PhpParser\NodeDumper; use Rector\HttpKernel\RectorKernel; use Rector\PhpParser\BetterNodeDumper; use Rector\PhpParser\Parser\Parser; +use Rector\Testing\StaticFixtureProvider; use Symplify\PackageBuilder\FileSystem\SmartFileInfo; use Symplify\PackageBuilder\Tests\AbstractKernelTestCase; @@ -85,4 +87,9 @@ protected function doTestFile(string $file): void $this->assertSame(trim($smartFileInfo2->getContents()), $dumpedNodes, 'Caused by ' . $file); } } + + protected function yieldFilesFromDirectory(string $directory, string $suffix): Iterator + { + return StaticFixtureProvider::yieldFilesFromDirectory($directory, $suffix); + } } diff --git a/src/Testing/PHPUnit/AbstractRectorTestCase.php b/src/Testing/PHPUnit/AbstractRectorTestCase.php index f39c447928ff..928c482f7c56 100644 --- a/src/Testing/PHPUnit/AbstractRectorTestCase.php +++ b/src/Testing/PHPUnit/AbstractRectorTestCase.php @@ -4,7 +4,6 @@ namespace Rector\Testing\PHPUnit; -use Iterator; use Nette\Utils\FileSystem; use PHPStan\Analyser\NodeScopeResolver; use PHPUnit\Framework\ExpectationFailedException; @@ -20,8 +19,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\Finder\Finder; -use Symfony\Component\Finder\SplFileInfo; use Symfony\Component\Yaml\Yaml; use Symplify\PackageBuilder\FileSystem\SmartFileInfo; use Symplify\PackageBuilder\Parameter\ParameterProvider; @@ -122,15 +119,6 @@ protected function tearDown(): void } } - protected function yieldFilesFromDirectory(string $directory): Iterator - { - $fileInfos = $this->findFilesInDirectory($directory); - - foreach ($fileInfos as $fileInfo) { - yield [$fileInfo->getPathName()]; - } - } - protected function doTestFileWithoutAutoload(string $file): void { $this->autoloadTestFixture = false; @@ -288,14 +276,4 @@ private function configureAutoImportParameter(): void $this->parameterProvider->changeParameter(Option::AUTO_IMPORT_NAMES, $autoImportNames); } - - /** - * @return SplFileInfo[] - */ - private function findFilesInDirectory(string $directory): array - { - $finder = Finder::create()->in($directory)->files(); - - return iterator_to_array($finder); - } } diff --git a/src/Testing/StaticFixtureProvider.php b/src/Testing/StaticFixtureProvider.php new file mode 100644 index 000000000000..15937953765b --- /dev/null +++ b/src/Testing/StaticFixtureProvider.php @@ -0,0 +1,32 @@ +getPathName()]; + } + } + + /** + * @return SplFileInfo[] + */ + private static function findFilesInDirectory(string $directory, string $suffix): array + { + $finder = Finder::create()->in($directory)->files() + ->name($suffix); + + return iterator_to_array($finder); + } +} diff --git a/tests/Exclusion/Check/ExcludeByDocBlockExclusionCheckTest.php b/tests/Exclusion/Check/ExcludeByDocBlockExclusionCheckTest.php index b2a82c8c4bd9..e7438090f99e 100644 --- a/tests/Exclusion/Check/ExcludeByDocBlockExclusionCheckTest.php +++ b/tests/Exclusion/Check/ExcludeByDocBlockExclusionCheckTest.php @@ -21,11 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/docblock-on-self-baseline.php.inc']; - yield [__DIR__ . '/Fixture/docblock-on-self-no-rector.php.inc']; - yield [__DIR__ . '/Fixture/docblock-on-parent-baseline.php.inc']; - yield [__DIR__ . '/Fixture/docblock-on-parent-norector.php.inc']; - yield [__DIR__ . '/Fixture/other-docblocks.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Issues/Issue594/Issue594Test.php b/tests/Issues/Issue594/Issue594Test.php index 35e59f8b3542..9f42444e1956 100644 --- a/tests/Issues/Issue594/Issue594Test.php +++ b/tests/Issues/Issue594/Issue594Test.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture594.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/tests/Issues/Issue835/Issue835Test.php b/tests/Issues/Issue835/Issue835Test.php index 0c168f6254c9..59d418968a1b 100644 --- a/tests/Issues/Issue835/Issue835Test.php +++ b/tests/Issues/Issue835/Issue835Test.php @@ -19,7 +19,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture835.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function provideConfig(): string diff --git a/tests/Rector/Architecture/DependencyInjection/ActionInjectionToConstructorInjectionRector/ActionInjectionToConstructorInjectionRectorTest.php b/tests/Rector/Architecture/DependencyInjection/ActionInjectionToConstructorInjectionRector/ActionInjectionToConstructorInjectionRectorTest.php index 183e25870ea3..6dd0ecbbdb72 100644 --- a/tests/Rector/Architecture/DependencyInjection/ActionInjectionToConstructorInjectionRector/ActionInjectionToConstructorInjectionRectorTest.php +++ b/tests/Rector/Architecture/DependencyInjection/ActionInjectionToConstructorInjectionRector/ActionInjectionToConstructorInjectionRectorTest.php @@ -24,8 +24,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Architecture/DependencyInjection/AnnotatedPropertyInjectToConstructorInjectionRector/AnnotatedPropertyInjectToConstructorInjectionRectorTest.php b/tests/Rector/Architecture/DependencyInjection/AnnotatedPropertyInjectToConstructorInjectionRector/AnnotatedPropertyInjectToConstructorInjectionRectorTest.php index 8fad81719ea6..47b0b0100664 100644 --- a/tests/Rector/Architecture/DependencyInjection/AnnotatedPropertyInjectToConstructorInjectionRector/AnnotatedPropertyInjectToConstructorInjectionRectorTest.php +++ b/tests/Rector/Architecture/DependencyInjection/AnnotatedPropertyInjectToConstructorInjectionRector/AnnotatedPropertyInjectToConstructorInjectionRectorTest.php @@ -20,16 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/fixture6.php.inc']; - yield [__DIR__ . '/Fixture/fixture7.php.inc']; - yield [__DIR__ . '/Fixture/parent_constructor.php.inc']; - yield [__DIR__ . '/Fixture/parent_constructor_with_own_inject.php.inc']; - yield [__DIR__ . '/Fixture/parent_constructor_with_middle_class.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function getRectorClass(): string diff --git a/tests/Rector/Architecture/DoctrineRepositoryAsService/DoctrineRepositoryAsServiceTest.php b/tests/Rector/Architecture/DoctrineRepositoryAsService/DoctrineRepositoryAsServiceTest.php index d8530b0d0a4d..974845f43c6b 100644 --- a/tests/Rector/Architecture/DoctrineRepositoryAsService/DoctrineRepositoryAsServiceTest.php +++ b/tests/Rector/Architecture/DoctrineRepositoryAsService/DoctrineRepositoryAsServiceTest.php @@ -24,8 +24,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/PostController.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } protected function provideConfig(): string diff --git a/tests/Rector/Architecture/Factory/NewObjectToFactoryCreateRector/NewObjectToFactoryCreateRectorTest.php b/tests/Rector/Architecture/Factory/NewObjectToFactoryCreateRector/NewObjectToFactoryCreateRectorTest.php index ec3456f73b2c..b3ac2297f1ff 100644 --- a/tests/Rector/Architecture/Factory/NewObjectToFactoryCreateRector/NewObjectToFactoryCreateRectorTest.php +++ b/tests/Rector/Architecture/Factory/NewObjectToFactoryCreateRector/NewObjectToFactoryCreateRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Argument/ArgumentAdderRector/ArgumentAdderRectorTest.php b/tests/Rector/Argument/ArgumentAdderRector/ArgumentAdderRectorTest.php index b9ba718f8f98..ca044a8eace3 100644 --- a/tests/Rector/Argument/ArgumentAdderRector/ArgumentAdderRectorTest.php +++ b/tests/Rector/Argument/ArgumentAdderRector/ArgumentAdderRectorTest.php @@ -22,12 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/scoped.php.inc']; - yield [__DIR__ . '/Fixture/already_added.php.inc']; - yield [__DIR__ . '/Fixture/skip_anonymous.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Argument/ArgumentDefaultValueReplacerRector/ArgumentDefaultValueReplacerRectorTest.php b/tests/Rector/Argument/ArgumentDefaultValueReplacerRector/ArgumentDefaultValueReplacerRectorTest.php index 682e42f71477..75194ad05af0 100644 --- a/tests/Rector/Argument/ArgumentDefaultValueReplacerRector/ArgumentDefaultValueReplacerRectorTest.php +++ b/tests/Rector/Argument/ArgumentDefaultValueReplacerRector/ArgumentDefaultValueReplacerRectorTest.php @@ -20,9 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Argument/ArgumentRemoverRector/ArgumentRemoverRectorTest.php b/tests/Rector/Argument/ArgumentRemoverRector/ArgumentRemoverRectorTest.php index 0762a1b39073..773b612ad25f 100644 --- a/tests/Rector/Argument/ArgumentRemoverRector/ArgumentRemoverRectorTest.php +++ b/tests/Rector/Argument/ArgumentRemoverRector/ArgumentRemoverRectorTest.php @@ -23,9 +23,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/remove_in_middle.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Argument/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php b/tests/Rector/Argument/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php index 046e4c0a4a39..6729ba847dbb 100644 --- a/tests/Rector/Argument/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php +++ b/tests/Rector/Argument/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Assign/PropertyAssignToMethodCallRector/PropertyAssignToMethodCallRectorTest.php b/tests/Rector/Assign/PropertyAssignToMethodCallRector/PropertyAssignToMethodCallRectorTest.php index 8d077a2a18d3..1fe82d0cd268 100644 --- a/tests/Rector/Assign/PropertyAssignToMethodCallRector/PropertyAssignToMethodCallRectorTest.php +++ b/tests/Rector/Assign/PropertyAssignToMethodCallRector/PropertyAssignToMethodCallRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/ClassLike/RemoveTraitRector/RemoveTraitRectorTest.php b/tests/Rector/ClassLike/RemoveTraitRector/RemoveTraitRectorTest.php index 64fc60bf51fb..89fc8c4e6f27 100644 --- a/tests/Rector/ClassLike/RemoveTraitRector/RemoveTraitRectorTest.php +++ b/tests/Rector/ClassLike/RemoveTraitRector/RemoveTraitRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/ClassMethod/AddMethodParentCallRector/AddMethodParentCallRectorTest.php b/tests/Rector/ClassMethod/AddMethodParentCallRector/AddMethodParentCallRectorTest.php index c998fed48524..83f6b8548feb 100644 --- a/tests/Rector/ClassMethod/AddMethodParentCallRector/AddMethodParentCallRectorTest.php +++ b/tests/Rector/ClassMethod/AddMethodParentCallRector/AddMethodParentCallRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_has.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/ClassMethod/AddReturnTypeDeclarationRector/AddReturnTypeDeclarationRectorTest.php b/tests/Rector/ClassMethod/AddReturnTypeDeclarationRector/AddReturnTypeDeclarationRectorTest.php index e47c16486325..7fddfe57ed73 100644 --- a/tests/Rector/ClassMethod/AddReturnTypeDeclarationRector/AddReturnTypeDeclarationRectorTest.php +++ b/tests/Rector/ClassMethod/AddReturnTypeDeclarationRector/AddReturnTypeDeclarationRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/extended_parent.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/ClassMethod/WrapReturnRector/WrapReturnRectorTest.php b/tests/Rector/ClassMethod/WrapReturnRector/WrapReturnRectorTest.php index 3ba8f3d30b71..4817ad0d5f3d 100644 --- a/tests/Rector/ClassMethod/WrapReturnRector/WrapReturnRectorTest.php +++ b/tests/Rector/ClassMethod/WrapReturnRector/WrapReturnRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/already_array.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Class_/ParentClassToTraitsRector/ParentClassToTraitsRectorTest.php b/tests/Rector/Class_/ParentClassToTraitsRector/ParentClassToTraitsRectorTest.php index df55ef69e500..da8a1e2a9d32 100644 --- a/tests/Rector/Class_/ParentClassToTraitsRector/ParentClassToTraitsRectorTest.php +++ b/tests/Rector/Class_/ParentClassToTraitsRector/ParentClassToTraitsRectorTest.php @@ -24,11 +24,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Constant/RenameClassConstantsUseToStringsRector/RenameClassConstantsUseToStringsRectorTest.php b/tests/Rector/Constant/RenameClassConstantsUseToStringsRector/RenameClassConstantsUseToStringsRectorTest.php index 8955b1e2061f..412b0830a290 100644 --- a/tests/Rector/Constant/RenameClassConstantsUseToStringsRector/RenameClassConstantsUseToStringsRectorTest.php +++ b/tests/Rector/Constant/RenameClassConstantsUseToStringsRector/RenameClassConstantsUseToStringsRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/FuncCall/FunctionToNewRector/FunctionToNewRectorTest.php b/tests/Rector/FuncCall/FunctionToNewRector/FunctionToNewRectorTest.php index 6c5325790302..93acb027563d 100644 --- a/tests/Rector/FuncCall/FunctionToNewRector/FunctionToNewRectorTest.php +++ b/tests/Rector/FuncCall/FunctionToNewRector/FunctionToNewRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Function_/FunctionToMethodCallRector/FunctionToMethodCallRectorTest.php b/tests/Rector/Function_/FunctionToMethodCallRector/FunctionToMethodCallRectorTest.php index 0473fe24bbca..44c423e3b2d6 100644 --- a/tests/Rector/Function_/FunctionToMethodCallRector/FunctionToMethodCallRectorTest.php +++ b/tests/Rector/Function_/FunctionToMethodCallRector/FunctionToMethodCallRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Function_/FunctionToStaticCallRector/FunctionToStaticCallRectorTest.php b/tests/Rector/Function_/FunctionToStaticCallRector/FunctionToStaticCallRectorTest.php index 9361f3969ab7..22dce4faa848 100644 --- a/tests/Rector/Function_/FunctionToStaticCallRector/FunctionToStaticCallRectorTest.php +++ b/tests/Rector/Function_/FunctionToStaticCallRector/FunctionToStaticCallRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Interface_/MergeInterfacesRector/MergeInterfacesRectorTest.php b/tests/Rector/Interface_/MergeInterfacesRector/MergeInterfacesRectorTest.php index 798f00b4115a..ea979fbeccca 100644 --- a/tests/Rector/Interface_/MergeInterfacesRector/MergeInterfacesRectorTest.php +++ b/tests/Rector/Interface_/MergeInterfacesRector/MergeInterfacesRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Interface_/RemoveInterfacesRector/RemoveInterfacesRectorTest.php b/tests/Rector/Interface_/RemoveInterfacesRector/RemoveInterfacesRectorTest.php index 789222bed57e..e9aef2c4d4c7 100644 --- a/tests/Rector/Interface_/RemoveInterfacesRector/RemoveInterfacesRectorTest.php +++ b/tests/Rector/Interface_/RemoveInterfacesRector/RemoveInterfacesRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MagicDisclosure/GetAndSetToMethodCallRector/GetAndSetToMethodCallRectorTest.php b/tests/Rector/MagicDisclosure/GetAndSetToMethodCallRector/GetAndSetToMethodCallRectorTest.php index 21350b326b3c..08720a1bbbdc 100644 --- a/tests/Rector/MagicDisclosure/GetAndSetToMethodCallRector/GetAndSetToMethodCallRectorTest.php +++ b/tests/Rector/MagicDisclosure/GetAndSetToMethodCallRector/GetAndSetToMethodCallRectorTest.php @@ -22,9 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/get.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/klarka.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MagicDisclosure/ToStringToMethodCallRector/ToStringToMethodCallRectorTest.php b/tests/Rector/MagicDisclosure/ToStringToMethodCallRector/ToStringToMethodCallRectorTest.php index 0558bd7524fb..0b9b1d3d9163 100644 --- a/tests/Rector/MagicDisclosure/ToStringToMethodCallRector/ToStringToMethodCallRectorTest.php +++ b/tests/Rector/MagicDisclosure/ToStringToMethodCallRector/ToStringToMethodCallRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MagicDisclosure/UnsetAndIssetToMethodCallRector/UnsetAndIssetToMethodCallRectorTest.php b/tests/Rector/MagicDisclosure/UnsetAndIssetToMethodCallRector/UnsetAndIssetToMethodCallRectorTest.php index 5497a6c89ce4..0c369206e6b2 100644 --- a/tests/Rector/MagicDisclosure/UnsetAndIssetToMethodCallRector/UnsetAndIssetToMethodCallRectorTest.php +++ b/tests/Rector/MagicDisclosure/UnsetAndIssetToMethodCallRector/UnsetAndIssetToMethodCallRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MethodBody/FluentReplaceRector/FluentReplaceRectorTest.php b/tests/Rector/MethodBody/FluentReplaceRector/FluentReplaceRectorTest.php index 188b3a535505..0d82ba8e2122 100644 --- a/tests/Rector/MethodBody/FluentReplaceRector/FluentReplaceRectorTest.php +++ b/tests/Rector/MethodBody/FluentReplaceRector/FluentReplaceRectorTest.php @@ -21,10 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/some_command.php.inc']; - yield [__DIR__ . '/Fixture/multiple_some_command.php.inc']; - yield [__DIR__ . '/Fixture/skip_date_time_modify_command.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MethodBody/NormalToFluentRector/NormalToFluentRectorTest.php b/tests/Rector/MethodBody/NormalToFluentRector/NormalToFluentRectorTest.php index 2039d7bb5838..691e9fb2c40a 100644 --- a/tests/Rector/MethodBody/NormalToFluentRector/NormalToFluentRectorTest.php +++ b/tests/Rector/MethodBody/NormalToFluentRector/NormalToFluentRectorTest.php @@ -21,10 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MethodBody/ReturnThisRemoveRector/ReturnThisRemoveRectorTest.php b/tests/Rector/MethodBody/ReturnThisRemoveRector/ReturnThisRemoveRectorTest.php index 84acff5a80c8..44b178a28098 100644 --- a/tests/Rector/MethodBody/ReturnThisRemoveRector/ReturnThisRemoveRectorTest.php +++ b/tests/Rector/MethodBody/ReturnThisRemoveRector/ReturnThisRemoveRectorTest.php @@ -20,8 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/MethodCallToAnotherMethodCallWithArgumentsRectorTest.php b/tests/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/MethodCallToAnotherMethodCallWithArgumentsRectorTest.php index 5aa3527f4ef4..fcf6f6ee9f94 100644 --- a/tests/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/MethodCallToAnotherMethodCallWithArgumentsRectorTest.php +++ b/tests/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/MethodCallToAnotherMethodCallWithArgumentsRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MethodCall/MethodCallToReturnRector/MethodCallToReturnRectorTest.php b/tests/Rector/MethodCall/MethodCallToReturnRector/MethodCallToReturnRectorTest.php index 7875d814c3c2..9def6ccd0a83 100644 --- a/tests/Rector/MethodCall/MethodCallToReturnRector/MethodCallToReturnRectorTest.php +++ b/tests/Rector/MethodCall/MethodCallToReturnRector/MethodCallToReturnRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_already_return.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/ServiceGetterToConstructorInjectionRectorTest.php b/tests/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/ServiceGetterToConstructorInjectionRectorTest.php index eb45d284bf6b..57ed4a9fdee8 100644 --- a/tests/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/ServiceGetterToConstructorInjectionRectorTest.php +++ b/tests/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/ServiceGetterToConstructorInjectionRectorTest.php @@ -22,7 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/PseudoNamespaceToNamespaceRectorTest.php b/tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/PseudoNamespaceToNamespaceRectorTest.php index 5127d16374ec..7d7a40766acb 100644 --- a/tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/PseudoNamespaceToNamespaceRectorTest.php +++ b/tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/PseudoNamespaceToNamespaceRectorTest.php @@ -20,14 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [__DIR__ . '/Fixture/fixture6.php.inc']; - yield [__DIR__ . '/Fixture/var_doc.php.inc']; - yield [__DIR__ . '/Fixture/use_statement.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/New_/NewToStaticCallRector/NewToStaticCallRectorTest.php b/tests/Rector/New_/NewToStaticCallRector/NewToStaticCallRectorTest.php index b9fd70b6cc27..f4dc290274b7 100644 --- a/tests/Rector/New_/NewToStaticCallRector/NewToStaticCallRectorTest.php +++ b/tests/Rector/New_/NewToStaticCallRector/NewToStaticCallRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/skip_another_class.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Property/InjectAnnotationClassRector/InjectAnnotationClassRectorTest.php b/tests/Rector/Property/InjectAnnotationClassRector/InjectAnnotationClassRectorTest.php index 06239e47ca3b..f06b2ab4e5cb 100644 --- a/tests/Rector/Property/InjectAnnotationClassRector/InjectAnnotationClassRectorTest.php +++ b/tests/Rector/Property/InjectAnnotationClassRector/InjectAnnotationClassRectorTest.php @@ -25,20 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [ - // JMS - __DIR__ . '/Fixture/fixture.php.inc', - ]; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; - yield [__DIR__ . '/Fixture/fixture4.php.inc']; - yield [__DIR__ . '/Fixture/fixture5.php.inc']; - yield [ - // PHP DI - __DIR__ . '/Fixture/inject_from_var.php.inc', - ]; - yield [__DIR__ . '/Fixture/inject_from_var2.php.inc']; - yield [__DIR__ . '/Fixture/inject_from_var3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Property/PropertyToMethodRector/PropertyToMethodRectorTest.php b/tests/Rector/Property/PropertyToMethodRector/PropertyToMethodRectorTest.php index 962875c39c55..05ea6a174494 100644 --- a/tests/Rector/Property/PropertyToMethodRector/PropertyToMethodRectorTest.php +++ b/tests/Rector/Property/PropertyToMethodRector/PropertyToMethodRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Property/RenamePropertyRector/RenamePropertyRectorTest.php b/tests/Rector/Property/RenamePropertyRector/RenamePropertyRectorTest.php index a83f69d5be5b..1b77f03a805b 100644 --- a/tests/Rector/Property/RenamePropertyRector/RenamePropertyRectorTest.php +++ b/tests/Rector/Property/RenamePropertyRector/RenamePropertyRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Source/ReadyException.php b/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/FixtureSkip/ReadyException.php.inc similarity index 100% rename from tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Source/ReadyException.php rename to tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/FixtureSkip/ReadyException.php.inc diff --git a/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/MultipleClassFileToPsr4ClassesRectorTest.php b/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/MultipleClassFileToPsr4ClassesRectorTest.php index 01d612c149f6..cf40b2ee0582 100644 --- a/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/MultipleClassFileToPsr4ClassesRectorTest.php +++ b/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/MultipleClassFileToPsr4ClassesRectorTest.php @@ -105,7 +105,7 @@ public function testSkip(string $originalFile): void public function provideDataForSkip(): Iterator { - yield [__DIR__ . '/Source/ReadyException.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureSkip'); } protected function getRectorClass(): string diff --git a/tests/Rector/RectorOrder/RectorOrderTest.php b/tests/Rector/RectorOrder/RectorOrderTest.php index f82ae40f6c2e..b2edd8c07beb 100644 --- a/tests/Rector/RectorOrder/RectorOrderTest.php +++ b/tests/Rector/RectorOrder/RectorOrderTest.php @@ -25,7 +25,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/StaticCall/StaticCallToFunctionRector/StaticCallToFunctionRectorTest.php b/tests/Rector/StaticCall/StaticCallToFunctionRector/StaticCallToFunctionRectorTest.php index d504b62468b7..3ad6fcda2ebe 100644 --- a/tests/Rector/StaticCall/StaticCallToFunctionRector/StaticCallToFunctionRectorTest.php +++ b/tests/Rector/StaticCall/StaticCallToFunctionRector/StaticCallToFunctionRectorTest.php @@ -21,7 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/String_/StringToClassConstantRector/StringToClassConstantRectorTest.php b/tests/Rector/String_/StringToClassConstantRector/StringToClassConstantRectorTest.php index 1060eede3be1..1c43bbfaa19b 100644 --- a/tests/Rector/String_/StringToClassConstantRector/StringToClassConstantRectorTest.php +++ b/tests/Rector/String_/StringToClassConstantRector/StringToClassConstantRectorTest.php @@ -20,7 +20,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/MyMetadataFactory.php b/tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/MyMetadataFactory.php.inc similarity index 100% rename from tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/MyMetadataFactory.php rename to tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/MyMetadataFactory.php.inc diff --git a/tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/SomeClassImplementingParserInterface.php b/tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/SomeClassImplementingParserInterface.php.inc similarity index 100% rename from tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/SomeClassImplementingParserInterface.php rename to tests/Rector/Typehint/ParentTypehintedArgumentRector/Fixture/SomeClassImplementingParserInterface.php.inc diff --git a/tests/Rector/Typehint/ParentTypehintedArgumentRector/ParentTypehintedArgumentRectorTest.php b/tests/Rector/Typehint/ParentTypehintedArgumentRector/ParentTypehintedArgumentRectorTest.php index 565f95748848..3878be5daab4 100644 --- a/tests/Rector/Typehint/ParentTypehintedArgumentRector/ParentTypehintedArgumentRectorTest.php +++ b/tests/Rector/Typehint/ParentTypehintedArgumentRector/ParentTypehintedArgumentRectorTest.php @@ -22,8 +22,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/SomeClassImplementingParserInterface.php']; - yield [__DIR__ . '/Fixture/MyMetadataFactory.php']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Visibility/ChangeConstantVisibilityRector/ChangeConstantVisibilityRectorTest.php b/tests/Rector/Visibility/ChangeConstantVisibilityRector/ChangeConstantVisibilityRectorTest.php index fc0a137d2ad7..9e46ae9e3611 100644 --- a/tests/Rector/Visibility/ChangeConstantVisibilityRector/ChangeConstantVisibilityRectorTest.php +++ b/tests/Rector/Visibility/ChangeConstantVisibilityRector/ChangeConstantVisibilityRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Visibility/ChangeMethodVisibilityRector/ChangeMethodVisibilityRectorTest.php b/tests/Rector/Visibility/ChangeMethodVisibilityRector/ChangeMethodVisibilityRectorTest.php index c153e4c823c1..9b82faad95c1 100644 --- a/tests/Rector/Visibility/ChangeMethodVisibilityRector/ChangeMethodVisibilityRectorTest.php +++ b/tests/Rector/Visibility/ChangeMethodVisibilityRector/ChangeMethodVisibilityRectorTest.php @@ -21,8 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /** diff --git a/tests/Rector/Visibility/ChangePropertyVisibilityRector/ChangePropertyVisibilityRectorTest.php b/tests/Rector/Visibility/ChangePropertyVisibilityRector/ChangePropertyVisibilityRectorTest.php index 068116b6f169..4930af1dab05 100644 --- a/tests/Rector/Visibility/ChangePropertyVisibilityRector/ChangePropertyVisibilityRectorTest.php +++ b/tests/Rector/Visibility/ChangePropertyVisibilityRector/ChangePropertyVisibilityRectorTest.php @@ -21,9 +21,7 @@ public function test(string $file): void public function provideDataForTest(): Iterator { - yield [__DIR__ . '/Fixture/fixture.php.inc']; - yield [__DIR__ . '/Fixture/fixture2.php.inc']; - yield [__DIR__ . '/Fixture/fixture3.php.inc']; + return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); } /**