bug: Do not treat implements list comma as array comma (#6595)

Author: jrmajor

src/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixer.php

@@ -42,16 +42,15 @@ public function getDefinition(): FixerDefinitionInterface
             [
                 new CodeSample("<?php \$x = array(1 , \"2\");\n"),
                 new VersionSpecificCodeSample(
-                    <<<'SAMPLE'
-<?php
-    $x = [<<<EOD
-foo
-EOD
-        , 'bar'
-    ];
-
-SAMPLE
-                    ,
+                    <<<'PHP'
+                        <?php
+                            $x = [<<<EOD
+                        foo
+                        EOD
+                                , 'bar'
+                            ];
+
+                        PHP,
                     new VersionSpecification(70300),
                     ['after_heredoc' => true]
                 ),
@@ -72,7 +71,7 @@ public function isCandidate(Tokens $tokens): bool
      */
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     {
-        for ($index = $tokens->count() - 1; $index >= 0; --$index) {
+        for ($index = $tokens->count() - 1; $index > 0; --$index) {
             if ($tokens[$index]->isGivenKind([T_ARRAY, CT::T_ARRAY_SQUARE_BRACE_OPEN])) {
                 $this->fixSpacing($index, $tokens);
             }
@@ -121,8 +120,6 @@ private function fixSpacing(int $index, Tokens $tokens): void
 
     /**
      * Method to move index over the non-array elements like function calls or function declarations.
-     *
-     * @return int New index
      */
     private function skipNonArrayElements(int $index, Tokens $tokens): int
     {
@@ -138,6 +135,21 @@ private function skipNonArrayElements(int $index, Tokens $tokens): int
             }
         }
 
+        if ($tokens[$index]->equals(',') && $this->commaIsPartOfImplementsList($index, $tokens)) {
+            --$index;
+        }
+
         return $index;
     }
+
+    private function commaIsPartOfImplementsList(int $index, Tokens $tokens): bool
+    {
+        do {
+            $index = $tokens->getPrevMeaningfulToken($index);
+
+            $current = $tokens[$index];
+        } while ($current->isGivenKind(T_STRING) || $current->equals(','));
+
+        return $current->isGivenKind(T_IMPLEMENTS);
+    }
 }

src/Fixer/ArrayNotation/WhitespaceAfterCommaInArrayFixer.php

@@ -129,6 +129,21 @@ private function skipNonArrayElements(int $index, Tokens $tokens): int
             }
         }
 
+        if ($tokens[$index]->equals(',') && $this->commaIsPartOfImplementsList($index, $tokens)) {
+            --$index;
+        }
+
         return $index;
     }
+
+    private function commaIsPartOfImplementsList(int $index, Tokens $tokens): bool
+    {
+        do {
+            $index = $tokens->getPrevMeaningfulToken($index);
+
+            $current = $tokens[$index];
+        } while ($current->isGivenKind(T_STRING) || $current->equals(','));
+
+        return $current->isGivenKind(T_IMPLEMENTS);
+    }
 }

tests/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixerTest.php

@@ -80,6 +80,11 @@ public function provideFixCases(): array
                 '<?php $x = [ 1,  "2","c" => function( $x ,$y) { return [$x, $y]; }, $y];',
                 '<?php $x = [ 1 ,  "2","c" => function( $x ,$y) { return [$x , $y]; }, $y];',
             ],
+            // don't change anonymous class implements list but change array inside
+            [
+                '<?php $x = [ 1,  "2","c" => new class implements Foo , Bar { const FOO = ["x", "y"]; }, $y];',
+                '<?php $x = [ 1 ,  "2","c" => new class implements Foo , Bar { const FOO = ["x" , "y"]; }, $y];',
+            ],
             // associative array (old)
             [
                 '<?php $x = array( "a" => $a, "b" =>  "b",3=>$this->foo(), "d" => 30);',

tests/Fixer/ArrayNotation/WhitespaceAfterCommaInArrayFixerTest.php

@@ -73,6 +73,11 @@ public function provideFixCases(): array
                 '<?php $x = [1,  "2", "c" => function( $x ,$y) { return [$x , $y]; }, $y ];',
                 '<?php $x = [1,  "2","c" => function( $x ,$y) { return [$x ,$y]; },$y ];',
             ],
+            // don't change anonymous class implements list but change array inside
+            [
+                '<?php $x = [1,  "2", "c" => new class implements Foo ,Bar { const FOO = ["x", "y"]; }, $y ];',
+                '<?php $x = [1,  "2","c" => new class implements Foo ,Bar { const FOO = ["x","y"]; },$y ];',
+            ],
             // associative array (old)
             [
                 '<?php $x = array("a" => $a , "b" =>  "b", 3=>$this->foo(),  "d" => 30  );',