Fix Rector apply on Source locators (#1053)

Co-authored-by: GitHub Action <action@github.com>

.github/workflows/packages_tests.yaml

@@ -49,7 +49,7 @@ jobs:
 
             # test with current commit in a pull-request
             -
-                run: composer require rector/rector-src dev-main#${{github.event.pull_request.head.sha}} --no-install
+                run: composer require rector/rector-src dev-main#${{github.event.pull_request.head.sha}} --no-update
                 if: ${{ github.event_name == 'pull_request' }}
 
             -   run: composer install --ansi

.github/workflows/tests.yaml

@@ -35,7 +35,7 @@ jobs:
 
             # with --runner=WrapperRunner, it is faster, only ideal with 4 processes (p4)
             # @see https://github.com/rectorphp/rector-src/pull/551#issuecomment-889990905
-            -   run: vendor/bin/paratest -p4 --runner=WrapperRunner ${{ matrix.path }}
+            -   run: vendor/bin/paratest -p4 --runner=WrapperRunner ${{ matrix.path }} --colors
                 if: ${{ matrix.path == 'rules-tests' }}
 
             -   run: vendor/bin/phpunit ${{ matrix.path }}

packages/Caching/FileSystem/DependencyResolver.php

@@ -8,15 +8,13 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Dependency\DependencyResolver as PHPStanDependencyResolver;
-use PHPStan\File\FileHelper;
 use Symplify\PackageBuilder\Reflection\PrivatesAccessor;
 
 final class DependencyResolver
 {
     public function __construct(
         private NodeScopeResolver $nodeScopeResolver,
         private PHPStanDependencyResolver $phpStanDependencyResolver,
-        private FileHelper $fileHelper,
         private PrivatesAccessor $privatesAccessor
     ) {
     }
@@ -31,30 +29,7 @@ public function resolveDependencies(Node $node, MutatingScope $mutatingScope): a
             'analysedFiles'
         );
 
-        $dependencyFiles = [];
-
         $nodeDependencies = $this->phpStanDependencyResolver->resolveDependencies($node, $mutatingScope);
-        foreach ($nodeDependencies as $nodeDependency) {
-            $dependencyFile = $nodeDependency->getFileName();
-            if (! $dependencyFile) {
-                continue;
-            }
-
-            $dependencyFile = $this->fileHelper->normalizePath($dependencyFile);
-            if ($mutatingScope->getFile() === $dependencyFile) {
-                continue;
-            }
-
-            // only work with files that we've analysed
-            if (! in_array($dependencyFile, $analysedFileAbsolutesPaths, true)) {
-                continue;
-            }
-
-            $dependencyFiles[] = $dependencyFile;
-        }
-
-        $dependencyFiles = array_unique($dependencyFiles, SORT_STRING);
-
-        return array_values($dependencyFiles);
+        return $nodeDependencies->getFileDependencies($mutatingScope->getFile(), $analysedFileAbsolutesPaths);
     }
 }

packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocator/IntermediateSourceLocator.php

@@ -13,17 +13,12 @@
 
 final class IntermediateSourceLocator implements SourceLocator
 {
-    /**
-     * @var SourceLocatorProviderInterface[]
-     */
-    private $sourceLocatorProviders = [];
-
     /**
      * @param SourceLocatorProviderInterface[] $sourceLocatorProviders
      */
-    public function __construct(array $sourceLocatorProviders)
-    {
-        $this->sourceLocatorProviders = $sourceLocatorProviders;
+    public function __construct(
+        private array $sourceLocatorProviders
+    ) {
     }
 
     public function locateIdentifier(Reflector $reflector, Identifier $identifier): ?Reflection

packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php

@@ -18,26 +18,18 @@ final class DynamicSourceLocatorProvider implements SourceLocatorProviderInterfa
     /**
      * @var string[]
      */
-    private $files = [];
+    private array $files = [];
 
     /**
      * @var array<string, string[]>
      */
-    private $filesByDirectory = [];
+    private array $filesByDirectory = [];
 
-    /**
-     * @var FileNodesFetcher
-     */
-    private $fileNodesFetcher;
-
-    /**
-     * @var SourceLocator|null
-     */
-    private $cachedSourceLocator;
+    private ?AggregateSourceLocator $aggregateSourceLocator = null;
 
-    public function __construct(FileNodesFetcher $fileNodesFetcher)
-    {
-        $this->fileNodesFetcher = $fileNodesFetcher;
+    public function __construct(
+        private FileNodesFetcher $fileNodesFetcher
+    ) {
     }
 
     public function setFileInfo(SmartFileInfo $fileInfo): void
@@ -58,8 +50,8 @@ public function provide(): SourceLocator
         // do not cache for PHPUnit, as in test every fixture is different
         $isPHPUnitRun = StaticPHPUnitEnvironment::isPHPUnitRun();
 
-        if ($this->cachedSourceLocator && $isPHPUnitRun === false) {
-            return $this->cachedSourceLocator;
+        if ($this->aggregateSourceLocator && ! $isPHPUnitRun) {
+            return $this->aggregateSourceLocator;
         }
 
         $sourceLocators = [];
@@ -71,9 +63,9 @@ public function provide(): SourceLocator
             $sourceLocators[] = new OptimizedDirectorySourceLocator($this->fileNodesFetcher, $files);
         }
 
-        $this->cachedSourceLocator = new AggregateSourceLocator($sourceLocators);
+        $this->aggregateSourceLocator = new AggregateSourceLocator($sourceLocators);
 
-        return $this->cachedSourceLocator;
+        return $this->aggregateSourceLocator;
     }
 
     /**

rector.php

@@ -73,10 +73,19 @@
         SplitStringClassConstantToClassConstFetchRector::class,
 
         // test paths
-        '*/Fixture/*',
-        '*/Fixture*/*',
-        '*/Source/*',
-        '*/Source*/*',
+        '*/tests/**/Fixture/*',
+        '*/rules-tests/**/Fixture/*',
+        '*/packages-tests/**/Fixture/*',
+        '*/tests/**/Fixture*/*',
+        '*/rules-tests/**/Fixture*/*',
+        '*/packages-tests/**/Fixture*/*',
+        // source
+        '*/tests/**/Source/*',
+        '*/rules-tests/**/Source/*',
+        '*/packages-tests/**/Source/*',
+        '*/tests/**/Source*/*',
+        '*/rules-tests/**/Source*/*',
+        '*/packages-tests/**/Source*/*',
         '*/Expected/*',
         '*/Expected*/*',
 

src/StaticReflection/SourceLocator/ParentAttributeSourceLocator.php

@@ -42,35 +42,34 @@ public function autowireParentAttributeSourceLocator(AstResolver $astResolver):
 
     public function locateIdentifier(Reflector $reflector, Identifier $identifier): ?Reflection
     {
-        if ($identifier->getName() === 'Symfony\Component\DependencyInjection\Attribute\Autoconfigure') {
-            if ($this->reflectionProvider->hasClass($identifier->getName())) {
-                $classReflection = $this->reflectionProvider->getClass($identifier->getName());
+        if ($identifier->getName() === 'Symfony\Component\DependencyInjection\Attribute\Autoconfigure' && $this->reflectionProvider->hasClass(
+            $identifier->getName()
+        )) {
+            $classReflection = $this->reflectionProvider->getClass($identifier->getName());
 
-                $class = $this->astResolver->resolveClassFromClassReflection(
-                    $classReflection,
-                    $identifier->getName()
-                );
-                if ($class === null) {
-                    return null;
-                }
-
-                $class->namespacedName = new FullyQualified($identifier->getName());
+            $class = $this->astResolver->resolveClassFromClassReflection($classReflection, $identifier->getName());
+            if ($class === null) {
+                return null;
+            }
 
-                $fakeLocatedSource = new LocatedSource('virtual', null);
+            $class->namespacedName = new FullyQualified($identifier->getName());
+            $fakeLocatedSource = new LocatedSource('virtual', null);
+            $classReflector = new ClassReflector($this);
 
-                $classReflector = new ClassReflector($this);
-                return ReflectionClass::createFromNode(
-                    $classReflector,
-                    $class,
-                    $fakeLocatedSource,
-                    new Namespace_(new Name('Symfony\Component\DependencyInjection\Attribute'))
-                );
-            }
+            return ReflectionClass::createFromNode(
+                $classReflector,
+                $class,
+                $fakeLocatedSource,
+                new Namespace_(new Name('Symfony\Component\DependencyInjection\Attribute'))
+            );
         }
 
         return null;
     }
 
+    /**
+     * @return Reflection[]
+     */
     public function locateIdentifiersByType(Reflector $reflector, IdentifierType $identifierType): array
     {
         return [];

src/StaticReflection/SourceLocator/RenamedClassesSourceLocator.php

@@ -27,7 +27,7 @@ public function __construct(
 
     public function locateIdentifier(Reflector $reflector, Identifier $identifier): ?Reflection
     {
-        foreach ($this->renamedClassesDataCollector->getOldToNewClasses() as $oldClass => $newClass) {
+        foreach ($this->renamedClassesDataCollector->getOldClasses() as $oldClass) {
             if ($identifier->getName() !== $oldClass) {
                 continue;
             }
@@ -39,6 +39,9 @@ public function locateIdentifier(Reflector $reflector, Identifier $identifier):
         return null;
     }
 
+    /**
+     * @return Reflection[]
+     */
     public function locateIdentifiersByType(Reflector $reflector, IdentifierType $identifierType): array
     {
         return [];