Fixed bug #3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays

Author: gsherwood

package.xml

@@ -67,6 +67,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #3357 : Generic.Functions.OpeningFunctionBraceBsdAllman removes return type when additional lines are present
     -- Thanks to Juliette Reinders Folmer for the patch
+  - Fixed bug #3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays
  </notes>
  <contents>
   <dir name="/">

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

@@ -1547,6 +1547,15 @@ $foo = match ($type) {
     ],
 };
 
+$a = [
+    'a' => [
+        'a' => fn () => foo()
+    ],
+    'a' => [
+        'a' => 'a',
+    ]
+];
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

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

@@ -1547,6 +1547,15 @@ $foo = match ($type) {
     ],
 };
 
+$a = [
+    'a' => [
+        'a' => fn () => foo()
+    ],
+    'a' => [
+        'a' => 'a',
+    ]
+];
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

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

@@ -1547,6 +1547,15 @@ $foo = match ($type) {
 	],
 };
 
+$a = [
+	'a' => [
+		'a' => fn () => foo()
+	],
+	'a' => [
+		'a' => 'a',
+	]
+];
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

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

@@ -1547,6 +1547,15 @@ $foo = match ($type) {
 	],
 };
 
+$a = [
+	'a' => [
+		'a' => fn () => foo()
+	],
+	'a' => [
+		'a' => 'a',
+	]
+];
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

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

@@ -187,10 +187,10 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
             1527 => 1,
             1529 => 1,
             1530 => 1,
-            1558 => 1,
-            1559 => 1,
-            1560 => 1,
-            1561 => 1,
+            1567 => 1,
+            1568 => 1,
+            1569 => 1,
+            1570 => 1,
         ];
 
     }//end getErrorList()

src/Tokenizers/PHP.php

@@ -2344,8 +2344,10 @@ protected function processAdditional()
 
                             if (isset($endTokens[$this->tokens[$scopeCloser]['code']]) === true) {
                                 if ($lastEndToken !== null
-                                    && $this->tokens[$scopeCloser]['code'] === T_CLOSE_PARENTHESIS
-                                    && $this->tokens[$scopeCloser]['parenthesis_opener'] < $arrow
+                                    && ((isset($this->tokens[$scopeCloser]['parenthesis_opener']) === true
+                                    && $this->tokens[$scopeCloser]['parenthesis_opener'] < $arrow)
+                                    || (isset($this->tokens[$scopeCloser]['bracket_opener']) === true
+                                    && $this->tokens[$scopeCloser]['bracket_opener'] < $arrow))
                                 ) {
                                     for ($lastNonEmpty = ($scopeCloser - 1); $lastNonEmpty > $arrow; $lastNonEmpty--) {
                                         if (isset(Util\Tokens::$emptyTokens[$this->tokens[$lastNonEmpty]['code']]) === false) {

tests/Core/Tokenizer/BackfillFnTokenTest.inc

@@ -63,6 +63,11 @@ $a = [
     'a' => fn() => return 1,
 ];
 
+/* testArrayValueNoTrailingComma */
+$a = [
+    'a' => fn() => foo()
+];
+
 /* testYield */
 $a = fn($x) => yield 'k' => $x;
 

tests/Core/Tokenizer/BackfillFnTokenTest.php

@@ -307,6 +307,22 @@ public function testArrayValue()
     }//end testArrayValue()
 
 
+    /**
+     * Test arrow functions that are used as array values with no trailing comma.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     *
+     * @return void
+     */
+    public function testArrayValueNoTrailingComma()
+    {
+        $token = $this->getTargetToken('/* testArrayValueNoTrailingComma */', T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 4, 8, 'closing parenthesis');
+
+    }//end testArrayValueNoTrailingComma()
+
+
     /**
      * Test arrow functions that use the yield keyword.
      *