[AutoImport] Skip start with <?= short open tag on auto import (#5496)

* [AutoImport] Skip start with <?= short open tag on auto import * [AutoImport] Skip start with <?= short open tag on auto import * fix phpstan
rectorphp · Jan 24, 2024 · 7584d25 · 7584d25
1 parent c2cdcd3
commit 7584d25
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/PostRector/Rector/NameImportingPostRector.php b/src/PostRector/Rector/NameImportingPostRector.php
@@ -53,8 +53,7 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        $firstStmt = current($file->getNewStmts());
-        if ($firstStmt instanceof FileWithoutNamespace && current($firstStmt->stmts) instanceof InlineHTML) {
+        if ($this->shouldSkipFileWithoutNamespace($file)) {
             return null;
         }
 
@@ -85,6 +84,25 @@ public function enterNode(Node $node): ?Node
         return $node;
     }
 
+    private function shouldSkipFileWithoutNamespace(File $file): bool
+    {
+        $firstStmt = current($file->getNewStmts());
+        if (! $firstStmt instanceof FileWithoutNamespace) {
+            return false;
+        }
+
+        $currentStmt = current($firstStmt->stmts);
+
+        if ($currentStmt instanceof InlineHTML || $currentStmt === false) {
+            return true;
+        }
+
+        $oldTokens = $file->getOldTokens();
+        $tokenStartPos = $currentStmt->getStartTokenPos();
+
+        return isset($oldTokens[$tokenStartPos][1]) && $oldTokens[$tokenStartPos][1] === '<?=';
+    }
+
     private function processNodeName(FullyQualified $fullyQualified, File $file): ?Node
     {
         if ($fullyQualified->isSpecialClassName()) {

diff --git a/tests/Issues/AutoImport/Fixture/skip_short_open_tag.php.inc b/tests/Issues/AutoImport/Fixture/skip_short_open_tag.php.inc
@@ -0,0 +1 @@
+<?= ns\Class::method() ?>