fix: FullyQualifiedStrictTypesFixer - do not add imports before PHP…

… opening tag (#7955)
PHP-CS-Fixer · Apr 16, 2024 · f40f18e · f40f18e
1 parent 35aca55
commit f40f18e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/Tokenizer/Analyzer/NamespacesAnalyzer.php b/src/Tokenizer/Analyzer/NamespacesAnalyzer.php
@@ -65,7 +65,14 @@ public function getDeclarations(Tokens $tokens): array
         }
 
         if (0 === \count($namespaces) && $tokens->isTokenKindFound(T_OPEN_TAG)) {
-            $namespaces[] = new NamespaceAnalysis('', '', 0, 0, 0, \count($tokens) - 1);
+            $namespaces[] = new NamespaceAnalysis(
+                '',
+                '',
+                $openTagIndex = $tokens[0]->isGivenKind(T_INLINE_HTML) ? 1 : 0,
+                $openTagIndex,
+                $openTagIndex,
+                \count($tokens) - 1,
+            );
         }
 
         return $namespaces;

diff --git a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
@@ -2604,6 +2604,22 @@ function foo($a) {}',
  */
 function foo($a) {}',
         ];
+
+        yield 'with shebang' => [
+            <<<'PHP'
+                #!/usr/bin/env php
+                <?php
+
+                use Bar\Baz;
+                $foo = new Baz();
+                PHP,
+            <<<'PHP'
+                #!/usr/bin/env php
+                <?php
+                $foo = new Bar\Baz();
+                PHP,
+            ['import_symbols' => true],
+        ];
     }
 
     /**

diff --git a/tests/Tokenizer/Analyzer/NamespacesAnalyzerTest.php b/tests/Tokenizer/Analyzer/NamespacesAnalyzerTest.php
@@ -88,10 +88,27 @@ public static function provideNamespacesCases(): iterable
         ]];
 
         yield [
-            'there is no namespace if there is no PHP code',
+            <<<'PHP'
+                #!/usr/bin/php
+                <?php
+                return true;
+                PHP,
             [
+                new NamespaceAnalysis(
+                    '',
+                    '',
+                    1,
+                    1,
+                    1,
+                    5
+                ),
             ],
         ];
+
+        yield [
+            'there is no namespace if there is no PHP code',
+            [],
+        ];
     }
 
     /**