fix: Squiz.Arrays.ArrayDeclaration for static closures (#369)

Fixes #368
PHPCSStandards · Mar 1, 2024 · 36d019c · 36d019c
1 parent 0eee691
commit 36d019c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -378,6 +378,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
 
             if ($tokens[$nextToken]['code'] === T_ARRAY
                 || $tokens[$nextToken]['code'] === T_OPEN_SHORT_ARRAY
+                || $tokens[$nextToken]['code'] === T_STATIC
                 || $tokens[$nextToken]['code'] === T_CLOSURE
                 || $tokens[$nextToken]['code'] === T_FN
                 || $tokens[$nextToken]['code'] === T_MATCH
@@ -388,6 +389,10 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                     $lastToken = $nextToken;
                 }
 
+                if ($tokens[$nextToken]['code'] === T_STATIC) {
+                    $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextToken + 1), null, true);
+                }
+
                 if ($tokens[$nextToken]['code'] === T_ARRAY) {
                     $nextToken = $tokens[$tokens[$nextToken]['parenthesis_opener']]['parenthesis_closer'];
                 } else if ($tokens[$nextToken]['code'] === T_OPEN_SHORT_ARRAY) {
@@ -651,12 +656,6 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                 ];
                 $ignoreTokens += Tokens::$castTokens;
 
-                if ($tokens[$valuePointer]['code'] === T_CLOSURE
-                    || $tokens[$valuePointer]['code'] === T_FN
-                ) {
-                    $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.1.inc b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc
@@ -535,3 +535,10 @@ $x = array(
   'a',
   'b',
    );
+
+$x = array(
+      1, static fn (float $item): float => match ($item) {
+        2.0 => 3.0,
+        default => $item
+    },
+     );
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed
@@ -571,3 +571,11 @@ $x = array(
   'a',
   'b',
  );
+
+$x = array(
+      1,
+      static fn (float $item): float => match ($item) {
+        2.0 => 3.0,
+        default => $item
+    },
+     );
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc
@@ -524,3 +524,10 @@ $x = [
   'a',
   'b',
    ];
+
+$x = [
+      1, static fn (float $item): float => match ($item) {
+        2.0 => 3.0,
+        default => $item
+    },
+     ];
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed
@@ -558,3 +558,11 @@ $x = [
   'a',
   'b',
  ];
+
+$x = [
+      1,
+      static fn (float $item): float => match ($item) {
+        2.0 => 3.0,
+        default => $item
+    },
+     ];
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
@@ -134,6 +134,7 @@ public function getErrorList($testFile='')
                 523 => 1,
                 530 => 1,
                 537 => 1,
+                540 => 1,
             ];
         case 'ArrayDeclarationUnitTest.2.inc':
             return [
@@ -225,6 +226,7 @@ public function getErrorList($testFile='')
                 512 => 1,
                 519 => 1,
                 526 => 1,
+                529 => 1,
             ];
         default:
             return [];