Fixed bug #2849 : Generic.WhiteSpace.ScopeIndent false positive with arrow function inside array

Author: gsherwood

package.xml

@@ -27,6 +27,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
   - Fixed bug #2848 : PSR12.Files.FileHeader false positive for file with mixed PHP and HTML and no file header
+  - Fixed bug #2849 : Generic.WhiteSpace.ScopeIndent false positive with arrow function inside array
  </notes>
  <contents>
   <dir name="/">

src/Files/File.php

@@ -2277,6 +2277,7 @@ public function findStartOfStatement($start, $ignore=null)
 
             if (isset($this->tokens[$i]['scope_opener']) === true
                 && $i === $this->tokens[$i]['scope_closer']
+                && $this->tokens[$i]['code'] !== T_CLOSE_PARENTHESIS
             ) {
                 // Found the end of the previous scope block.
                 return $lastNotEmpty;

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

@@ -1445,6 +1445,15 @@ $a = $a === true ? [
     'a' => 100,
 ];
 
+return [
+    Url::make('View Song', fn($song) => $song->url())
+        ->onlyOnDetail(),
+
+    new Panel('Information', [
+        Text::make('Title')
+    ]),
+];
+
 ?>
 
      <?php if (true) : ?>

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

@@ -1445,6 +1445,15 @@ $a = $a === true ? [
     'a' => 100,
 ];
 
+return [
+    Url::make('View Song', fn($song) => $song->url())
+        ->onlyOnDetail(),
+
+    new Panel('Information', [
+        Text::make('Title')
+    ]),
+];
+
 ?>
 
      <?php if (true) : ?>

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

@@ -1445,6 +1445,15 @@ $a = $a === true ? [
 	'a' => 100,
 ];
 
+return [
+	Url::make('View Song', fn($song) => $song->url())
+		->onlyOnDetail(),
+
+	new Panel('Information', [
+		Text::make('Title')
+	]),
+];
+
 ?>
 
 	 <?php if (true) : ?>

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

@@ -1445,6 +1445,15 @@ $a = $a === true ? [
 	'a' => 100,
 ];
 
+return [
+	Url::make('View Song', fn($song) => $song->url())
+		->onlyOnDetail(),
+
+	new Panel('Information', [
+		Text::make('Title')
+	]),
+];
+
 ?>
 
 	 <?php if (true) : ?>

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

@@ -178,10 +178,10 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
             1340 => 1,
             1342 => 1,
             1345 => 1,
-            1455 => 1,
-            1456 => 1,
-            1457 => 1,
-            1458 => 1,
+            1464 => 1,
+            1465 => 1,
+            1466 => 1,
+            1467 => 1,
         ];
 
     }//end getErrorList()