[TypeDeclaration] Handle inner function Yield and Return_ on ReturnTy…

…peFromStrictReturnExprRector (#2566)

* [TypeDeclaration] Handle inner function Yield and Return_ on ReturnTypeFromStrictReturnExprRector

* implemented 🎉

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector/Fixture/void_return_in_inner_function.php.inc

@@ -0,0 +1,45 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictReturnExprRector\Fixture;
+
+final class VoidReturnInInnerFunction
+{
+    public function run()
+    {
+        return $this->first() && true;
+    }
+
+    public function first()
+    {
+        function () {
+            return;
+        };
+
+        return true;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictReturnExprRector\Fixture;
+
+final class VoidReturnInInnerFunction
+{
+    public function run(): bool
+    {
+        return $this->first() && true;
+    }
+
+    public function first(): bool
+    {
+        function () {
+            return;
+        };
+
+        return true;
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector/Fixture/yield_parent_inner_function.php.inc

@@ -0,0 +1,45 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictReturnExprRector\Fixture;
+
+final class YieldParentInnerFunction
+{
+    public function run()
+    {
+        return $this->first() && true;
+    }
+
+    public function first()
+    {
+        function () {
+            yield 1;
+        };
+
+        return true;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictReturnExprRector\Fixture;
+
+final class YieldParentInnerFunction
+{
+    public function run(): bool
+    {
+        return $this->first() && true;
+    }
+
+    public function first(): bool
+    {
+        function () {
+            yield 1;
+        };
+
+        return true;
+    }
+}
+
+?>

rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictReturnExprRector.php

@@ -91,11 +91,11 @@ private function hasSingleStrictReturn(ClassMethod $classMethod): bool
             return false;
         }
 
-        if ($this->betterNodeFinder->hasInstancesOf($classMethod->stmts, [Yield_::class])) {
+        if ($this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($classMethod, [Yield_::class])) {
             return false;
         }
 
-        $returns = $this->betterNodeFinder->findInstanceOf($classMethod->stmts, Return_::class);
+        $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($classMethod, Return_::class);
         if (count($returns) !== 1) {
             return false;
         }