Added missing unit tests for #3061

squizlabs · Sep 21, 2020 · af12525 · af12525 · jrfnl · Sep 21, 2020
1 parent 1100d89
commit af12525
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -620,10 +620,11 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
 
                 $valuePointer = $value['value'];
 
-                $ignoreTokens = ([
+                $ignoreTokens  = [
                     T_WHITESPACE => T_WHITESPACE,
                     T_COMMA      => T_COMMA,
-                ] + Tokens::$castTokens);
+                ];
+                $ignoreTokens += Tokens::$castTokens;
 
                 if ($tokens[$valuePointer]['code'] === T_CLOSURE) {
                     $ignoreTokens += [T_STATIC => T_STATIC];

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

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