Merge pull request #152 from PHPCSStandards/universal/disallowshortli…

…stsyntax-bug-fix Universal/DisallowShortListSyntax: bug fix - don't skip over nested brackets
PHPCSStandards · Nov 2, 2022 · e0c6bd0 · e0c6bd0
2 parents 80cb0d8 + 39a1bc9
commit e0c6bd0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Universal/Sniffs/Lists/DisallowShortListSyntaxSniff.php b/Universal/Sniffs/Lists/DisallowShortListSyntaxSniff.php
@@ -53,11 +53,6 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($openClose === false) {
             // Not a short list, live coding or parse error.
-            if (isset($tokens[$stackPtr]['bracket_closer']) === true) {
-                // No need to examine nested subs of this short array/array access.
-                return $tokens[$stackPtr]['bracket_closer'];
-            }
-
             return;
         }
 

diff --git a/Universal/Tests/Lists/DisallowShortListSyntaxUnitTest.inc b/Universal/Tests/Lists/DisallowShortListSyntaxUnitTest.inc
@@ -24,5 +24,10 @@ if ( true )
     [ $a ] = [ 'hi' ];
 return $a ?? '';
 
+// Short list in short array.
+$array = [
+    'key' => [$a, $b] = $args,
+];
+
 // Intentional parse error. This has to be the last test in the file.
 [ $a, $b
diff --git a/Universal/Tests/Lists/DisallowShortListSyntaxUnitTest.inc.fixed b/Universal/Tests/Lists/DisallowShortListSyntaxUnitTest.inc.fixed
@@ -24,5 +24,10 @@ if ( true )
     list( $a ) = [ 'hi' ];
 return $a ?? '';
 
+// Short list in short array.
+$array = [
+    'key' => list($a, $b) = $args,
+];
+
 // Intentional parse error. This has to be the last test in the file.
 [ $a, $b
diff --git a/Universal/Tests/Lists/DisallowShortListSyntaxUnitTest.php b/Universal/Tests/Lists/DisallowShortListSyntaxUnitTest.php
@@ -39,6 +39,7 @@ public function getErrorList()
             13 => 1,
             15 => 1,
             24 => 1,
+            29 => 1,
         ];
     }