Updated Rector to commit 8aaee5ec80df459fe507746817aef442a05916ae

rectorphp/rector-src@8aaee5e [Performance] Cache should traverse for AddUseStatementGuard (#6234)
rectorphp · Aug 22, 2024 · aa33f42 · aa33f42
1 parent dc2d69a
commit aa33f42
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '4f89b7498e7bfb7dccc8872e042fcbc3a687a7f1';
+    public const PACKAGE_VERSION = '8aaee5ec80df459fe507746817aef442a05916ae';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-08-22 10:53:33';
+    public const RELEASE_DATE = '2024-08-22 10:57:41';
     /**
      * @var int
      */

diff --git a/src/PostRector/Application/PostFileProcessor.php b/src/PostRector/Application/PostFileProcessor.php
@@ -80,10 +80,12 @@ public function reset() : void
     public function traverse(array $stmts, File $file) : array
     {
         foreach ($this->getPostRectors() as $postRector) {
+            // file must be set early into PostRector class to ensure its usage
+            // always match on skipping process
+            $postRector->setFile($file);
             if ($this->shouldSkipPostRector($postRector, $file->getFilePath(), $stmts)) {
                 continue;
             }
-            $postRector->setFile($file);
             $nodeTraverser = new NodeTraverser();
             $nodeTraverser->addVisitor($postRector);
             $stmts = $nodeTraverser->traverse($stmts);

diff --git a/src/PostRector/Guard/AddUseStatementGuard.php b/src/PostRector/Guard/AddUseStatementGuard.php
@@ -14,15 +14,22 @@ class AddUseStatementGuard
      * @var \Rector\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
+    /**
+     * @var array<string, bool>
+     */
+    private $shouldTraverseOnFiles = [];
     public function __construct(BetterNodeFinder $betterNodeFinder)
     {
         $this->betterNodeFinder = $betterNodeFinder;
     }
     /**
      * @param Stmt[] $stmts
      */
-    public function shouldTraverse(array $stmts) : bool
+    public function shouldTraverse(array $stmts, string $filePath) : bool
     {
+        if (isset($this->shouldTraverseOnFiles[$filePath])) {
+            return $this->shouldTraverseOnFiles[$filePath];
+        }
         $totalNamespaces = 0;
         // just loop the first level stmts to locate namespace to improve performance
         // as namespace is always on first level
@@ -32,9 +39,9 @@ public function shouldTraverse(array $stmts) : bool
             }
             // skip if 2 namespaces are present
             if ($totalNamespaces === 2) {
-                return \false;
+                return $this->shouldTraverseOnFiles[$filePath] = \false;
             }
         }
-        return !$this->betterNodeFinder->hasInstancesOf($stmts, [InlineHTML::class]);
+        return $this->shouldTraverseOnFiles[$filePath] = !$this->betterNodeFinder->hasInstancesOf($stmts, [InlineHTML::class]);
     }
 }
diff --git a/src/PostRector/Rector/DocblockNameImportingPostRector.php b/src/PostRector/Rector/DocblockNameImportingPostRector.php
@@ -64,6 +64,6 @@ public function enterNode(Node $node)
      */
     public function shouldTraverse(array $stmts) : bool
     {
-        return $this->addUseStatementGuard->shouldTraverse($stmts);
+        return $this->addUseStatementGuard->shouldTraverse($stmts, $this->getFile()->getFilePath());
     }
 }
diff --git a/src/PostRector/Rector/NameImportingPostRector.php b/src/PostRector/Rector/NameImportingPostRector.php
@@ -79,7 +79,7 @@ public function enterNode(Node $node)
      */
     public function shouldTraverse(array $stmts) : bool
     {
-        return $this->addUseStatementGuard->shouldTraverse($stmts);
+        return $this->addUseStatementGuard->shouldTraverse($stmts, $this->getFile()->getFilePath());
     }
     /**
      * @param array<Use_|GroupUse> $currentUses