[tests] Keep original methods naming for easier upgrade (#2893)

Co-authored-by: GitHub Action <action@github.com>
rectorphp · Sep 2, 2022 · 6fa3ade · 6fa3ade
1 parent dc22a95
commit 6fa3ade
Show file tree

Hide file tree

Showing 542 changed files with 555 additions and 563 deletions.
diff --git a/...refixed-rule-test/utils/rector/tests/Rector/RenameSimpleRector/RenameSimpleRectorTest.php b/...refixed-rule-test/utils/rector/tests/Rector/RenameSimpleRector/RenameSimpleRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
         "rector/rector-phpunit": "dev-main",
         "rector/rector-symfony": "dev-main",
         "sebastian/diff": "^4.0.4",
+        "symfony/config": "^6.0",
         "symfony/console": "^6.0",
         "symfony/contracts": "^3.1",
         "symfony/dependency-injection": "^6.1",

diff --git a/...s-tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/AbstractPhpDocInfoPrinterTest.php b/...s-tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/AbstractPhpDocInfoPrinterTest.php
@@ -41,8 +41,8 @@ protected function createPhpDocInfoFromDocCommentAndNode(string $docComment, Nod
      * This is a new way to load test fixtures :)
      * @return Iterator<array<int, string>>
      */
-    protected function yieldFilePathsFromDirectory(string $directory, string $suffix = '*.php'): Iterator
+    protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php'): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory($directory, $suffix);
+        return FixtureFileFinder::yieldDirectory($directory, $suffix);
     }
 }
diff --git a/packages-tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/PhpDocInfoPrinterTest.php b/packages-tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/PhpDocInfoPrinterTest.php
@@ -30,12 +30,12 @@ public function testRemoveSpace(): void
 
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/FixtureBasic', '*.txt');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureBasic', '*.txt');
     }
 
     public function provideDataCallable(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/FixtureCallable', '*.txt');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureCallable', '*.txt');
     }
 
     /**
@@ -51,7 +51,7 @@ public function testEmpty(string $filePath): void
 
     public function provideDataEmpty(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/FixtureEmpty', '*.txt');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureEmpty', '*.txt');
     }
 
     private function doComparePrintedFileEquals(string $inputFilePath, string $expectedFilePath): void

diff --git a/packages-tests/BetterPhpDocParser/PhpDocInlineHtml/TestInlineHtmlTest.php b/packages-tests/BetterPhpDocParser/PhpDocInlineHtml/TestInlineHtmlTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...DocParser/PhpDocParser/ClassAnnotationMatcher/ResolveTagToKnownFullyQualifiedNameTest.php b/...DocParser/PhpDocParser/ClassAnnotationMatcher/ResolveTagToKnownFullyQualifiedNameTest.php
@@ -71,6 +71,6 @@ public function testResolvesClass(string $filePath): void
 
     public function provideData(): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return FixtureFileFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 }
diff --git a/...ges-tests/BetterPhpDocParser/PhpDocParser/TagValueNodeReprint/TagValueNodeReprintTest.php b/...ges-tests/BetterPhpDocParser/PhpDocParser/TagValueNodeReprint/TagValueNodeReprintTest.php
@@ -64,12 +64,12 @@ public function test(string $filePath): void
 
     public function provideData(): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return FixtureFileFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideDataNested(): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory(__DIR__ . '/FixtureNested');
+        return FixtureFileFinder::yieldDirectory(__DIR__ . '/FixtureNested');
     }
 
     /**

diff --git a/packages-tests/Comments/CommentRemover/CommentRemoverTest.php b/packages-tests/Comments/CommentRemover/CommentRemoverTest.php
@@ -55,6 +55,6 @@ public function test(string $filePath): void
 
     public function provideData(): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return FixtureFileFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 }
diff --git a/...eResolver/PerNodeTypeResolver/PropertyFetchTypeResolver/PropertyFetchTypeResolverTest.php b/...eResolver/PerNodeTypeResolver/PropertyFetchTypeResolver/PropertyFetchTypeResolverTest.php
@@ -25,7 +25,7 @@ public function test(string $filePath): void
 
     public function provideData(): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return FixtureFileFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 
     private function doTestFile(string $filePath): void

diff --git a/packages/Testing/Fixture/FixtureFileFinder.php b/packages/Testing/Fixture/FixtureFileFinder.php
@@ -13,26 +13,16 @@ final class FixtureFileFinder
     /**
      * @return Iterator<array<int, string>>
      */
-    public static function yieldFilePathsFromDirectory(string $directory, string $suffix = '*.php.inc'): Iterator
-    {
-        $fileInfos = self::findFilesInDirectory($directory, $suffix);
-
-        foreach ($fileInfos as $fileInfo) {
-            yield [$fileInfo->getRealPath()];
-        }
-    }
-
-    /**
-     * @return SplFileInfo[]
-     */
-    private static function findFilesInDirectory(string $directory, string $suffix): array
+    public static function yieldDirectory(string $directory, string $suffix = '*.php.inc'): Iterator
     {
         $finder = (new Finder())
             ->in($directory)
             ->files()
             ->name($suffix);
 
         $fileInfos = iterator_to_array($finder);
-        return array_values($fileInfos);
+        foreach ($fileInfos as $fileInfo) {
+            yield [$fileInfo->getRealPath()];
+        }
     }
 }
diff --git a/packages/Testing/PHPUnit/AbstractRectorTestCase.php b/packages/Testing/PHPUnit/AbstractRectorTestCase.php
@@ -83,19 +83,20 @@ protected function tearDown(): void
     }
 
     /**
-     * @deprecated Use \Rector\Testing\PHPUnit\AbstractRectorTestCase::yieldFilePathsFromDirectory() instead
+     * @return Iterator<<string>>
      */
     protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php.inc'): Iterator
     {
         return FixtureFileFinder::yieldDirectory($directory, $suffix);
     }
 
     /**
-     * @return Iterator<<string>>
+     * @api
+     * @deprecated BC alias for yieldFilesFromDirectory()
      */
     protected function yieldFilePathsFromDirectory(string $directory, string $suffix = '*.php.inc'): Iterator
     {
-        return FixtureFileFinder::yieldFilePathsFromDirectory($directory, $suffix);
+        return $this->yieldFilesFromDirectory($directory, $suffix);
     }
 
     protected function isWindows(): bool

diff --git a/rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/ArgumentAdderRectorTest.php b/rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/ArgumentAdderRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...r/ClassMethod/ReplaceArgumentDefaultValueRector/ReplaceArgumentDefaultValueRectorTest.php b/...r/ClassMethod/ReplaceArgumentDefaultValueRector/ReplaceArgumentDefaultValueRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...tionArgumentDefaultValueReplacerRector/FunctionArgumentDefaultValueReplacerRectorTest.php b/...tionArgumentDefaultValueReplacerRector/FunctionArgumentDefaultValueReplacerRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php b/...Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...guments/Rector/MethodCall/RemoveMethodCallParamRector/RemoveMethodCallParamRectorTest.php b/...guments/Rector/MethodCall/RemoveMethodCallParamRector/RemoveMethodCallParamRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/rules-tests/Arguments/Rector/RectorOrder/RectorOrderTest.php b/rules-tests/Arguments/Rector/RectorOrder/RectorOrderTest.php
@@ -25,7 +25,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ableThisArrayToAnonymousFunctionRector/CallableThisArrayToAnonymousFunctionRectorTest.php b/...ableThisArrayToAnonymousFunctionRector/CallableThisArrayToAnonymousFunctionRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/rules-tests/CodeQuality/Rector/Assign/CombinedAssignRector/CombinedAssignRectorTest.php b/rules-tests/CodeQuality/Rector/Assign/CombinedAssignRector/CombinedAssignRectorTest.php
@@ -27,7 +27,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...or/Assign/SplitListAssignToSeparateLineRector/SplitListAssignToSeparateLineRectorTest.php b/...or/Assign/SplitListAssignToSeparateLineRector/SplitListAssignToSeparateLineRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ity/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php b/...ity/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...Rector/BooleanNot/ReplaceMultipleBooleanNotRector/ReplaceMultipleBooleanNotRectorTest.php b/...Rector/BooleanNot/ReplaceMultipleBooleanNotRector/ReplaceMultipleBooleanNotRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ality/Rector/BooleanNot/SimplifyDeMorganBinaryRector/SimplifyDeMorganBinaryRectorTest.php b/...ality/Rector/BooleanNot/SimplifyDeMorganBinaryRector/SimplifyDeMorganBinaryRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...y/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php b/...y/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ty/Rector/ClassMethod/InlineArrayReturnAssignRector/InlineArrayReturnAssignRectorTest.php b/...ty/Rector/ClassMethod/InlineArrayReturnAssignRector/InlineArrayReturnAssignRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/.../CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector/NarrowUnionTypeDocRectorTest.php b/.../CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector/NarrowUnionTypeDocRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ethod/OptionalParametersAfterRequiredRector/OptionalParametersAfterRequiredRectorTest.php b/...ethod/OptionalParametersAfterRequiredRector/OptionalParametersAfterRequiredRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...rnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php b/...rnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ity/Rector/Class_/CompleteDynamicPropertiesRector/CompleteDynamicPropertiesRectorTest.php b/...ity/Rector/Class_/CompleteDynamicPropertiesRector/CompleteDynamicPropertiesRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...r/Class_/CompleteDynamicPropertiesRector/UnionTypeCompleteDynamicPropertiesRectorTest.php b/...r/Class_/CompleteDynamicPropertiesRector/UnionTypeCompleteDynamicPropertiesRectorTest.php
@@ -19,7 +19,7 @@ public function test(string $filePath): void
 
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/FixtureUnionTypes');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureUnionTypes');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...InlineConstructorDefaultToPropertyRector/InlineConstructorDefaultToPropertyRectorTest.php b/...InlineConstructorDefaultToPropertyRector/InlineConstructorDefaultToPropertyRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/JoinStringConcatRectorTest.php b/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/JoinStringConcatRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...uality/Rector/Do_/DoWhileBreakFalseToIfElseRector/DoWhileBreakFalseToIfElseRectorTest.php b/...uality/Rector/Do_/DoWhileBreakFalseToIfElseRector/DoWhileBreakFalseToIfElseRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...l/UseIdenticalOverEqualWithSameTypeRector/UseIdenticalOverEqualWithSameTypeRectorTest.php b/...l/UseIdenticalOverEqualWithSameTypeRector/UseIdenticalOverEqualWithSameTypeRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...deQuality/Rector/Expression/InlineIfToExplicitIfRector/InlineIfToExplicitIfRectorTest.php b/...deQuality/Rector/Expression/InlineIfToExplicitIfRector/InlineIfToExplicitIfRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ctor/Expression/TernaryFalseExpressionToIfRector/TernaryFalseExpressionToIfRectorTest.php b/...ctor/Expression/TernaryFalseExpressionToIfRector/TernaryFalseExpressionToIfRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...ctor/For_/ForRepeatedCountToOwnVariableRector/ForRepeatedCountToOwnVariableRectorTest.php b/...ctor/For_/ForRepeatedCountToOwnVariableRector/ForRepeatedCountToOwnVariableRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/rules-tests/CodeQuality/Rector/For_/ForToForeachRector/ForToForeachRectorTest.php b/rules-tests/CodeQuality/Rector/For_/ForToForeachRector/ForToForeachRectorTest.php
@@ -22,7 +22,7 @@ public function test(string $filePath): void
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string