Merge e2abe1c into bdf1e50

sirbrillig · Mar 31, 2023 · edd6cb7 · edd6cb7
2 parents bdf1e50 + e2abe1c
commit edd6cb7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Tests/VariableAnalysisSniff/fixtures/ArrowFunctionFixture.php b/Tests/VariableAnalysisSniff/fixtures/ArrowFunctionFixture.php
@@ -127,3 +127,18 @@ function arrowFunctionWithReturnType() {
     $type = do_something(fn(string $func): string => $func ? $func : '');
     echo $type;
 }
+
+function arrowFunctionWithNewlines( $items ): array {
+    return $items
+      ->map(
+        fn ( array $item ) => apply_overrides(
+          [
+            'a' => ! empty( $item['b'] ),
+          ],
+          $item, // throws an undefined variable error
+        )
+      )
+      ->filter( fn ( array $item ) => ! empty( $item['post'] ) )
+      ->values()
+      ->all();
+  }
diff --git a/VariableAnalysis/Lib/Helpers.php b/VariableAnalysis/Lib/Helpers.php
@@ -665,11 +665,6 @@ public static function getArrowFunctionOpenClose(File $phpcsFile, $stackPtr)
 				break;
 			}
 
-			// A line break is always a closer.
-			if ($token['line'] !== $tokens[$stackPtr]['line']) {
-				$scopeCloserIndex = $index;
-				break;
-			}
 			$code = $token['code'];
 
 			// A semicolon is always a closer.