bug #6202 SquareBraceTransformer - fix for destructing square brace a…

…fter double arrow (kubawerlos) This PR was squashed before being merged into the master branch (closes #6202). Discussion ---------- SquareBraceTransformer - fix for destructing square brace after double arrow Commits ------- 585b50a SquareBraceTransformer - fix for destructing square brace after double arrow
PHP-CS-Fixer · Dec 20, 2021 · fe85ada · fe85ada
2 parents 80e7ca1 + 585b50a
commit fe85ada
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 1 deletion.
diff --git a/src/Tokenizer/Transformer/SquareBraceTransformer.php b/src/Tokenizer/Transformer/SquareBraceTransformer.php
@@ -167,7 +167,8 @@ private function isArrayDestructing(Tokens $tokens, int $index): bool
             [CT::T_ARRAY_INDEX_CURLY_BRACE_CLOSE],
         ];
 
-        $prevToken = $tokens[$tokens->getPrevMeaningfulToken($index)];
+        $prevIndex = $tokens->getPrevMeaningfulToken($index);
+        $prevToken = $tokens[$prevIndex];
         if ($prevToken->equalsAny($disallowedPrevTokens)) {
             return false;
         }
@@ -176,6 +177,18 @@ private function isArrayDestructing(Tokens $tokens, int $index): bool
             return true;
         }
 
+        if ($prevToken->isGivenKind(T_DOUBLE_ARROW)) {
+            $variableIndex = $tokens->getPrevMeaningfulToken($prevIndex);
+            if (!$tokens[$variableIndex]->isGivenKind(T_VARIABLE)) {
+                return false;
+            }
+
+            $prevVariableIndex = $tokens->getPrevMeaningfulToken($variableIndex);
+            if ($tokens[$prevVariableIndex]->isGivenKind(T_AS)) {
+                return true;
+            }
+        }
+
         $type = Tokens::detectBlockType($tokens[$index]);
         $end = $tokens->findBlockEnd($type['type'], $index);
 

diff --git a/tests/Fixer/ArrayNotation/ArraySyntaxFixerTest.php b/tests/Fixer/ArrayNotation/ArraySyntaxFixerTest.php
@@ -77,6 +77,8 @@ public function provideLongSyntaxCases(): array
             ['<?php $x = func()[$x];'],
             ['<?php $x = "foo"[$x];'],
             ['<?php $text = "foo ${aaa[123]} bar $bbb[0] baz";'],
+            ['<?php foreach ($array as [$x, $y]) {}'],
+            ['<?php foreach ($array as $key => [$x, $y]) {}'],
         ];
     }
 

diff --git a/tests/Fixer/ListNotation/ListSyntaxFixerTest.php b/tests/Fixer/ListNotation/ListSyntaxFixerTest.php
@@ -88,6 +88,11 @@ public function updateAttributeKey($key, $value)
         ];
 
         yield ['<?php [$b[$a]] = $foo();'];
+
+        yield [
+            '<?php [$iHaveList => list($x, $y) = getList()];',
+            '<?php [$iHaveList => [$x, $y] = getList()];',
+        ];
     }
 
     /**

diff --git a/tests/Tokenizer/Transformer/SquareBraceTransformerTest.php b/tests/Tokenizer/Transformer/SquareBraceTransformerTest.php
@@ -325,6 +325,38 @@ public function updateAttributeKey($key, $value)
                     13 => CT::T_DESTRUCTURING_SQUARE_BRACE_CLOSE,
                 ],
             ],
+            [
+                '<?php foreach ($a as $key => [$x, $y]) {}',
+                [
+                    12 => CT::T_DESTRUCTURING_SQUARE_BRACE_OPEN,
+                    17 => CT::T_DESTRUCTURING_SQUARE_BRACE_CLOSE,
+                ],
+            ],
+            [
+                '<?php [$key => [$x, $y]];',
+                [
+                    1 => CT::T_ARRAY_SQUARE_BRACE_OPEN,
+                    6 => CT::T_ARRAY_SQUARE_BRACE_OPEN,
+                    11 => CT::T_ARRAY_SQUARE_BRACE_CLOSE,
+                    12 => CT::T_ARRAY_SQUARE_BRACE_CLOSE,
+                ],
+            ],
+            [
+                '<?php array($key => [$x, $y]);',
+                [
+                    7 => CT::T_ARRAY_SQUARE_BRACE_OPEN,
+                    12 => CT::T_ARRAY_SQUARE_BRACE_CLOSE,
+                ],
+            ],
+            [
+                '<?php [$key => [$x, $y] = foo()];',
+                [
+                    1 => CT::T_ARRAY_SQUARE_BRACE_OPEN,
+                    6 => CT::T_DESTRUCTURING_SQUARE_BRACE_OPEN,
+                    11 => CT::T_DESTRUCTURING_SQUARE_BRACE_CLOSE,
+                    18 => CT::T_ARRAY_SQUARE_BRACE_CLOSE,
+                ],
+            ],
         ];
     }