Generic.WhiteSpace.ScopeIndent now supports static arrow functions (ref #2523)

Author: gsherwood

package.xml

@@ -33,6 +33,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - File::getMethodProperties() now supports arrow functions
   - Generic.CodeAnalysis.EmptyPhpStatement now reports unnecessary semicolons after control structure closing braces
     -- Thanks to Vincent Langlet for the patch
+  - Generic.WhiteSpace.ScopeIndent now supports static arrow functions
   - Fixed bug #2638 : Squiz.CSS.DuplicateClassDefinitionSniff sees comments as part of the class name
     -- Thanks to Raphael Horber for the patch
   - Fixed bug #2674 : Squiz.Functions.FunctionDeclarationArgumentSpacing prints wrong argument name in error message

src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -846,7 +846,8 @@ public function process(File $phpcsFile, $stackPtr)
                 $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($checkToken + 1), null, true);
                 if ($next === false
                     || ($tokens[$next]['code'] !== T_CLOSURE
-                    && $tokens[$next]['code'] !== T_VARIABLE)
+                    && $tokens[$next]['code'] !== T_VARIABLE
+                    && $tokens[$next]['code'] !== T_FN)
                 ) {
                     if ($this->debug === true) {
                         $line = $tokens[$checkToken]['line'];

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

@@ -1434,6 +1434,11 @@ $query = Model::query()
         static $b = '';
    });
 
+$result = array_map(
+    static fn(int $number) : int => $number + 1,
+    $numbers
+);
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed

@@ -1434,6 +1434,11 @@ $query = Model::query()
         static $b = '';
    });
 
+$result = array_map(
+    static fn(int $number) : int => $number + 1,
+    $numbers
+);
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

@@ -1434,6 +1434,11 @@ $query = Model::query()
 		static $b = '';
    });
 
+$result = array_map(
+	static fn(int $number) : int => $number + 1,
+	$numbers
+);
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed

@@ -1434,6 +1434,11 @@ $query = Model::query()
 		static $b = '';
    });
 
+$result = array_map(
+	static fn(int $number) : int => $number + 1,
+	$numbers
+);
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -178,10 +178,10 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
             1340 => 1,
             1342 => 1,
             1345 => 1,
-            1440 => 1,
-            1441 => 1,
-            1442 => 1,
-            1443 => 1,
+            1445 => 1,
+            1446 => 1,
+            1447 => 1,
+            1448 => 1,
         ];
 
     }//end getErrorList()