TASK: Do not touch return inside a closure (#3213)

Resolves: #3084
sabbelasichon · Nov 13, 2022 · 6ab3d15 · 6ab3d15
1 parent 66f580b
commit 6ab3d15
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/Rector/v11/v0/ExtbaseControllerActionsMustReturnResponseInterfaceRector.php b/src/Rector/v11/v0/ExtbaseControllerActionsMustReturnResponseInterfaceRector.php
@@ -5,6 +5,7 @@
 namespace Ssch\TYPO3Rector\Rector\v11\v0;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Exit_;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
@@ -54,6 +55,13 @@ public function refactor(Node $node): ?Node
 
         $returns = $this->findReturns($node);
         foreach ($returns as $return) {
+            // If it is inside a closure do nothing
+            $closure = $this->betterNodeFinder->findParentType($return, Closure::class);
+
+            if (null !== $closure) {
+                continue;
+            }
+
             $returnCallExpression = $return->expr;
 
             if ($returnCallExpression instanceof FuncCall && $this->isName(

diff --git a/...rActionsMustReturnResponseInterfaceRector/Fixture/skip_extbase_controller_actions.php.inc b/...rActionsMustReturnResponseInterfaceRector/Fixture/skip_extbase_controller_actions.php.inc
@@ -20,6 +20,15 @@ class MyRefactoredController extends ActionController
         return new ForwardResponse('another');
     }
 
+    public function somethingAction($range): ResponseInterface
+    {
+        $years = array_map(static function ($item): string {
+            return 'C'.$item.'-';
+        }, $range);
+
+        return $this->htmlResponse($years);
+    }
+
     abstract public function listAction($filter = null, string $letter = ''): ResponseInterface;
 }