[PostRector] Move instanceof check early before SimpleParameterProvid…

…er static call check (#5907)
rectorphp · May 22, 2024 · b2c9e52 · b2c9e52
1 parent 0621d67
commit b2c9e52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/PostRector/Rector/NameImportingPostRector.php b/src/PostRector/Rector/NameImportingPostRector.php
@@ -44,6 +44,10 @@ public function __construct(
 
     public function enterNode(Node $node): ?Node
     {
+        if (! $node instanceof Stmt && ! $node instanceof Param && ! $node instanceof FullyQualified) {
+            return null;
+        }
+
         if (! SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_NAMES)) {
             return null;
         }
@@ -61,10 +65,6 @@ public function enterNode(Node $node): ?Node
             return $this->processNodeName($node, $file);
         }
 
-        if (! $node instanceof Stmt && ! $node instanceof Param) {
-            return null;
-        }
-
         $shouldImportDocBlocks = SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES);
         if (! $shouldImportDocBlocks) {
             return null;

diff --git a/src/PostRector/Rector/UnusedImportRemovingPostRector.php b/src/PostRector/Rector/UnusedImportRemovingPostRector.php
@@ -32,11 +32,11 @@ public function __construct(
 
     public function enterNode(Node $node): ?Node
     {
-        if (! SimpleParameterProvider::provideBoolParameter(Option::REMOVE_UNUSED_IMPORTS)) {
+        if (! $node instanceof Namespace_ && ! $node instanceof FileWithoutNamespace) {
             return null;
         }
 
-        if (! $node instanceof Namespace_ && ! $node instanceof FileWithoutNamespace) {
+        if (! SimpleParameterProvider::provideBoolParameter(Option::REMOVE_UNUSED_IMPORTS)) {
             return null;
         }