Ignore tokens that belong to array element declaration

squizlabs · Aug 29, 2020 · d24aeba · d24aeba
1 parent 5b0b6ab
commit d24aeba
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -620,7 +620,16 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
 
                 $valuePointer = $value['value'];
 
-                $previous = $phpcsFile->findPrevious([T_WHITESPACE, T_COMMA], ($valuePointer - 1), ($arrayStart + 1), true);
+                $ignoreTokens = ([
+                    T_WHITESPACE => T_WHITESPACE,
+                    T_COMMA      => T_COMMA,
+                ] + Tokens::$castTokens);
+
+                if ($tokens[$valuePointer]['code'] === T_CLOSURE) {
+                    $ignoreTokens += [T_STATIC => T_STATIC];
+                }
+
+                $previous = $phpcsFile->findPrevious($ignoreTokens, ($valuePointer - 1), ($arrayStart + 1), true);
                 if ($previous === false) {
                     $previous = $stackPtr;
                 }

diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc
@@ -436,6 +436,19 @@ $c];
 ['a' => $a, 'b' => $b,
 'c' => $c];
 
+[
+ static function() {
+     return null;
+ },
+ (array) [],
+ (bool) [],
+ (double) [],
+ (int) [],
+ (object) [],
+ (string) [],
+ (unset) [],
+];
+
 // Intentional syntax error.
 $a = [
       'a' =>

diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed
@@ -470,6 +470,19 @@ $foo = [
  'c' => $c,
 ];
 
+[
+ static function() {
+     return null;
+ },
+ (array) [],
+ (bool) [],
+ (double) [],
+ (int) [],
+ (object) [],
+ (string) [],
+ (unset) [],
+];
+
 // Intentional syntax error.
 $a = [
       'a' =>