bug #6279 ClassReferenceNameCasingFixer - Fix for double arrow (Space…

…Possum) This PR was squashed before being merged into the master branch (closes #6279). Discussion ---------- ClassReferenceNameCasingFixer - Fix for double arrow closes #6278 Commits ------- 004f634 ClassReferenceNameCasingFixer - Fix for double arrow
PHP-CS-Fixer · Feb 9, 2022 · 17823f7 · 17823f7
2 parents dbd830d + 004f634
commit 17823f7
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 8 deletions.
diff --git a/src/AbstractNoUselessElseFixer.php b/src/AbstractNoUselessElseFixer.php
@@ -68,7 +68,7 @@ protected function isSuperfluousElse(Tokens $tokens, int $index): bool
                 return false;
             }
 
-            if ($tokens[$candidateIndex]->equals([T_THROW])) {
+            if ($tokens[$candidateIndex]->isGivenKind(T_THROW)) {
                 $previousIndex = $tokens->getPrevMeaningfulToken($candidateIndex);
 
                 if (!$tokens[$previousIndex]->equalsAny([';', '{'])) {

diff --git a/src/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixer.php b/src/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixer.php
@@ -121,7 +121,7 @@ private function fixSpacing(int $index, Tokens $tokens): void
 
             if (
                 $currentToken->equals(',') && !$tokens[$prevIndex]->isComment()
-                && (true === $this->configuration['after_heredoc'] || !$tokens[$prevIndex]->equals([T_END_HEREDOC]))
+                && (true === $this->configuration['after_heredoc'] || !$tokens[$prevIndex]->isGivenKind(T_END_HEREDOC))
             ) {
                 $tokens->removeLeadingWhitespace($i);
             }

diff --git a/src/Fixer/Casing/ClassReferenceNameCasingFixer.php b/src/Fixer/Casing/ClassReferenceNameCasingFixer.php
@@ -78,6 +78,7 @@ private function getClassReference(Tokens $tokens, NamespaceAnalysis $namespace)
                 T_CASE, // PHP 8.1 trait enum-case
                 T_CLASS,
                 T_CONST,
+                T_DOUBLE_ARROW,
                 T_DOUBLE_COLON,
                 T_FUNCTION,
                 T_INTERFACE,
@@ -120,7 +121,7 @@ private function getClassReference(Tokens $tokens, NamespaceAnalysis $namespace)
                 continue;
             }
 
-            if (!$tokens[$prevIndex]->isGivenKind([T_NEW]) && $tokens[$nextIndex]->equals('(')) {
+            if (!$tokens[$prevIndex]->isGivenKind(T_NEW) && $tokens[$nextIndex]->equals('(')) {
                 continue;
             }
 

diff --git a/src/Fixer/ControlStructure/NoBreakCommentFixer.php b/src/Fixer/ControlStructure/NoBreakCommentFixer.php
@@ -154,7 +154,7 @@ private function fixCase(Tokens $tokens, int $casePosition): void
                 continue;
             }
 
-            if ($tokens[$i]->isGivenKind([T_THROW])) {
+            if ($tokens[$i]->isGivenKind(T_THROW)) {
                 $previousIndex = $tokens->getPrevMeaningfulToken($i);
 
                 if ($previousIndex === $casePosition || $tokens[$previousIndex]->equalsAny(['{', ';', '}', [T_OPEN_TAG]])) {

diff --git a/src/Fixer/Import/SingleImportPerStatementFixer.php b/src/Fixer/Import/SingleImportPerStatementFixer.php
@@ -130,7 +130,7 @@ private function getGroupStatements(Tokens $tokens, string $groupPrefix, int $gr
         for ($i = $groupOpenIndex + 1; $i <= $groupCloseIndex; ++$i) {
             $token = $tokens[$i];
 
-            if ($token->equals(',') && $tokens[$tokens->getNextMeaningfulToken($i)]->equals([CT::T_GROUP_IMPORT_BRACE_CLOSE])) {
+            if ($token->equals(',') && $tokens[$tokens->getNextMeaningfulToken($i)]->isGivenKind(CT::T_GROUP_IMPORT_BRACE_CLOSE)) {
                 continue;
             }
 

diff --git a/src/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixer.php b/src/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixer.php
@@ -169,7 +169,7 @@ protected function applyPhpUnitClassFix(Tokens $tokens, int $startIndex, int $en
             $expectedTypeTokenIndex = $tokens->getNextMeaningfulToken($bracketTokenIndex);
             $expectedTypeToken = $tokens[$expectedTypeTokenIndex];
 
-            if (!$expectedTypeToken->equals([T_CONSTANT_ENCAPSED_STRING])) {
+            if (!$expectedTypeToken->isGivenKind(T_CONSTANT_ENCAPSED_STRING)) {
                 continue;
             }
 

diff --git a/src/Tokenizer/AbstractTypeTransformer.php b/src/Tokenizer/AbstractTypeTransformer.php
@@ -56,7 +56,7 @@ protected function doProcess(Tokens $tokens, int $index, $originalToken): void
 
         $prevPrevTokenIndex = $tokens->getPrevMeaningfulToken($prevIndex);
 
-        if ($tokens[$prevPrevTokenIndex]->isGivenKind([T_CATCH])) {
+        if ($tokens[$prevPrevTokenIndex]->isGivenKind(T_CATCH)) {
             $this->replaceToken($tokens, $index);
 
             return;

diff --git a/src/Tokenizer/Transformer/BraceClassInstantiationTransformer.php b/src/Tokenizer/Transformer/BraceClassInstantiationTransformer.php
@@ -51,7 +51,7 @@ public function getRequiredPhpVersionId(): int
      */
     public function process(Tokens $tokens, Token $token, int $index): void
     {
-        if (!$tokens[$index]->equals('(') || !$tokens[$tokens->getNextMeaningfulToken($index)]->equals([T_NEW])) {
+        if (!$tokens[$index]->equals('(') || !$tokens[$tokens->getNextMeaningfulToken($index)]->isGivenKind(T_NEW)) {
             return;
         }
 

diff --git a/tests/Fixer/Casing/ClassReferenceNameCasingFixerTest.php b/tests/Fixer/Casing/ClassReferenceNameCasingFixerTest.php
@@ -137,6 +137,10 @@ public function provideFixCases(): \Generator
             '<?php class Foo { use exception; }',
         ];
 
+        yield [
+            '<?php $foo = ["const" => exception];',
+        ];
+
         yield [
             '<?php
 namespace {
@@ -181,6 +185,23 @@ public function provideFixCases(): \Generator
             '<?php try { foo(); } catch(\LogicException $e) {}',
             '<?php try { foo(); } catch(\logicexception $e) {}',
         ];
+
+        yield [
+            '<?php
+                Closure::bind(fn () => null, null, new class {});
+                \Closure::bind(fn () => null, null, new class {});
+
+                Foo\Bar::bind(fn () => null, null, new class {});
+                \A\B\\Bar::bind(fn () => null, null, new class {});
+            ',
+            '<?php
+                CLOSURE::bind(fn () => null, null, new class {});
+                \CLOSURE::bind(fn () => null, null, new class {});
+
+                Foo\Bar::bind(fn () => null, null, new class {});
+                \A\B\\Bar::bind(fn () => null, null, new class {});
+            ',
+        ];
     }
 
     /**