fix: Several improvements for fully_qualified_strict_types (respect…

… declared symbols, relative imports, leading backslash in global namespace) (#7679)
PHP-CS-Fixer · Jan 9, 2024 · d2906cd · d2906cd
1 parent 4a8c0f6
commit d2906cd
Show file tree

Hide file tree

Showing 6 changed files with 563 additions and 264 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -12,6 +12,9 @@
  * with this source code in the file LICENSE.
  */
 
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
 $header = <<<'EOF'
     This file is part of PHP CS Fixer.
 
@@ -22,14 +25,14 @@
     with this source code in the file LICENSE.
     EOF;
 
-$finder = (new PhpCsFixer\Finder())
+$finder = (new Finder())
     ->ignoreDotFiles(false)
     ->ignoreVCSIgnored(true)
     ->exclude(['dev-tools/phpstan', 'tests/Fixtures'])
     ->in(__DIR__)
 ;
 
-return (new PhpCsFixer\Config())
+return (new Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PHP74Migration' => true,

diff --git a/dev-tools/info-extractor.php b/dev-tools/info-extractor.php
@@ -11,12 +11,14 @@
  * with this source code in the file LICENSE.
  */
 
+use PhpCsFixer\Console\Application;
+
 require_once __DIR__.'/../vendor/autoload.php';
 
 $version = [
-    'number' => PhpCsFixer\Console\Application::VERSION,
-    'vnumber' => 'v'.PhpCsFixer\Console\Application::VERSION,
-    'codename' => PhpCsFixer\Console\Application::VERSION_CODENAME,
+    'number' => Application::VERSION,
+    'vnumber' => 'v'.Application::VERSION,
+    'codename' => Application::VERSION_CODENAME,
 ];
 
 echo json_encode([

diff --git a/src/Doctrine/Annotation/Tokens.php b/src/Doctrine/Annotation/Tokens.php
@@ -14,7 +14,6 @@
 
 namespace PhpCsFixer\Doctrine\Annotation;
 
-use PhpCsFixer\Doctrine\Annotation\Token as AnnotationToken;
 use PhpCsFixer\Preg;
 use PhpCsFixer\Tokenizer\Token as PhpToken;
 
@@ -103,7 +102,7 @@ public static function createFromDocComment(PhpToken $input, array $ignoredTags
                 $lastTokenEndIndex = 0;
                 foreach (\array_slice($scannedTokens, 0, $nbScannedTokensToUse) as $token) {
                     if ($token->isType(DocLexer::T_STRING)) {
-                        $token = new AnnotationToken(
+                        $token = new Token(
                             $token->getType(),
                             '"'.str_replace('"', '""', $token->getContent()).'"',
                             $token->getPosition()