[TypeDeclaration] Handle with inner function on AddParamTypeBasedOnPHPUnitDataProviderRector (#5786)

samsonasik · web-flow · commit 35c1bf45b0be · 2024-04-01T03:45:30.000+07:00
diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/Fixture/with_inner_function.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/Fixture/with_inner_function.php.inc
@@ -0,0 +1,55 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector\Fixture;
+
+use Iterator;
+use PHPUnit\Framework\TestCase;
+
+final class WithInnerFunction extends TestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test($name)
+    {
+    }
+
+    public function provideData()
+    {
+        function () {
+            return [['some']];
+        };
+
+        yield [1];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector\Fixture;
+
+use Iterator;
+use PHPUnit\Framework\TestCase;
+
+final class WithInnerFunction extends TestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(int $name)
+    {
+    }
+
+    public function provideData()
+    {
+        function () {
+            return [['some']];
+        };
+
+        yield [1];
+    }
+}
+
+?>
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php
@@ -161,13 +161,13 @@ private function inferParam(
         }
 
         /** @var Return_[] $returns */
-        $returns = $this->betterNodeFinder->findInstanceOf((array) $dataProviderClassMethod->stmts, Return_::class);
+        $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($dataProviderClassMethod, Return_::class);
         if ($returns !== []) {
             return $this->resolveReturnStaticArrayTypeByParameterPosition($returns, $parameterPosition);
         }
 
         /** @var Yield_[] $yields */
-        $yields = $this->betterNodeFinder->findInstanceOf((array) $dataProviderClassMethod->stmts, Yield_::class);
+        $yields = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($dataProviderClassMethod, Yield_::class);
         return $this->resolveYieldStaticArrayTypeByParameterPosition($yields, $parameterPosition);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,13 @@ private function inferParam(`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/** @var Return_[] $returns */`
`164`		`- $returns = $this->betterNodeFinder->findInstanceOf((array) $dataProviderClassMethod->stmts, Return_::class);`
	`164`	`+ $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($dataProviderClassMethod, Return_::class);`
`165`	`165`	`if ($returns !== []) {`
`166`	`166`	`return $this->resolveReturnStaticArrayTypeByParameterPosition($returns, $parameterPosition);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/** @var Yield_[] $yields */`
`170`		`- $yields = $this->betterNodeFinder->findInstanceOf((array) $dataProviderClassMethod->stmts, Yield_::class);`
	`170`	`+ $yields = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($dataProviderClassMethod, Yield_::class);`
`171`	`171`	`return $this->resolveYieldStaticArrayTypeByParameterPosition($yields, $parameterPosition);`
`172`	`172`	`}`
`173`	`173`