skip already added

deprecated-packages · Jul 9, 2021 · e005544 · e005544
1 parent 5387851
commit e005544
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/coding-standard/src/Fixer/Annotation/DoctrineAnnotationNestedBracketsFixer.php b/packages/coding-standard/src/Fixer/Annotation/DoctrineAnnotationNestedBracketsFixer.php
@@ -5,11 +5,12 @@
 namespace Symplify\CodingStandard\Fixer\Annotation;
 
 use Doctrine\Common\Annotations\DocLexer;
-use PhpCsFixer\Doctrine\Annotation\Token;
+use PhpCsFixer\Doctrine\Annotation\Token as DoctrineAnnotationToken;
 use PhpCsFixer\Doctrine\Annotation\Tokens as DoctrineAnnotationTokens;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
 use PhpCsFixer\Tokenizer\Analyzer\NamespaceUsesAnalyzer;
+use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use Symplify\CodingStandard\Fixer\AbstractSymplifyFixer;
 use Symplify\CodingStandard\TokenAnalyzer\DoctrineAnnotationElementAnalyzer;
@@ -101,7 +102,7 @@ public function fix(\SplFileInfo $fileInfo, Tokens $tokens): void
 
         // fetch indexes one time, this is safe as we never add or remove a token during fixing
 
-        /** @var \PhpCsFixer\Tokenizer\Token[] $docCommentTokens */
+        /** @var Token[] $docCommentTokens */
         $docCommentTokens = $tokens->findGivenKind(T_DOC_COMMENT);
         foreach ($docCommentTokens as $index => $docCommentToken) {
             if (! $this->doctrineAnnotationElementAnalyzer->detect($tokens, $index)) {
@@ -111,12 +112,12 @@ public function fix(\SplFileInfo $fileInfo, Tokens $tokens): void
             $doctrineAnnotationTokens = DoctrineAnnotationTokens::createFromDocComment($docCommentToken, []);
             $this->fixAnnotations($doctrineAnnotationTokens, $useDeclarations);
 
-            $tokens[$index] = new \PhpCsFixer\Tokenizer\Token([T_DOC_COMMENT, $doctrineAnnotationTokens->getCode()]);
+            $tokens[$index] = new Token([T_DOC_COMMENT, $doctrineAnnotationTokens->getCode()]);
         }
     }
 
     /**
-     * @param DoctrineAnnotationTokens<Token> $tokens
+     * @param DoctrineAnnotationTokens<DoctrineAnnotationToken> $tokens
      */
     private function fixAnnotations(DoctrineAnnotationTokens $tokens, $useDeclarations): void
     {
@@ -145,7 +146,7 @@ private function fixAnnotations(DoctrineAnnotationTokens $tokens, $useDeclaratio
                 continue;
             }
 
-            /** @var Token $braceToken */
+            /** @var DoctrineAnnotationToken $braceToken */
             $braceToken = $tokens[$braceIndex];
             if (! $this->doctrineAnnotationElementAnalyzer->isOpeningBracketFollowedByAnnotation(
                 $braceToken,
@@ -156,10 +157,10 @@ private function fixAnnotations(DoctrineAnnotationTokens $tokens, $useDeclaratio
             }
 
             // add closing brace
-            $tokens->insertAt($closingBraceIndex, new Token(DocLexer::T_OPEN_CURLY_BRACES, '}'));
+            $tokens->insertAt($closingBraceIndex, new DoctrineAnnotationToken(DocLexer::T_OPEN_CURLY_BRACES, '}'));
 
             // add opening brace
-            $tokens->insertAt($braceIndex + 1, new Token(DocLexer::T_OPEN_CURLY_BRACES, '{'));
+            $tokens->insertAt($braceIndex + 1, new DoctrineAnnotationToken(DocLexer::T_OPEN_CURLY_BRACES, '{'));
         }
     }
 }
diff --git a/packages/coding-standard/src/TokenAnalyzer/DoctrineAnnotationElementAnalyzer.php b/packages/coding-standard/src/TokenAnalyzer/DoctrineAnnotationElementAnalyzer.php
@@ -49,7 +49,7 @@ public function detect(Tokens $tokens, int $index): bool
     /**
      * We look for "(@SomeAnnotation"
      *
-     * @param DoctrineAnnotationTokens<Token> $tokens
+     * @param DoctrineAnnotationTokens<DoctrineAnnotationToken> $tokens
      */
     public function isOpeningBracketFollowedByAnnotation(
         Token $token,
@@ -62,7 +62,7 @@ public function isOpeningBracketFollowedByAnnotation(
             return false;
         }
 
-        $nextTokenIndex = $tokens->getNextMeaningfulToken($braceIndex + 1);
+        $nextTokenIndex = $tokens->getNextMeaningfulToken($braceIndex);
         if ($nextTokenIndex === null) {
             return false;
         }