[TypeDeclaration] Retarget ClosureReturnTypeFromAssertInstanceOfRector to Class_ node

rules-tests/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector/ClosureReturnTypeFromAssertInstanceOfRectorTest.php → rules-tests/TypeDeclaration/Rector/Class_/ClosureReturnTypeFromAssertInstanceOfRector/ClosureReturnTypeFromAssertInstanceOfRectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector;
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;

rules-tests/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector/Fixture/assert_instance_of_narrowed_return.php.inc → rules-tests/TypeDeclaration/Rector/Class_/ClosureReturnTypeFromAssertInstanceOfRector/Fixture/assert_instance_of_narrowed_return.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 
@@ -20,7 +20,7 @@ final class AssertInstanceOfNarrowedReturn extends TestCase
 -----
 <?php
 
-namespace Rector\Tests\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 

rules-tests/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector/Fixture/skip_no_assert_instance_of.php.inc → rules-tests/TypeDeclaration/Rector/Class_/ClosureReturnTypeFromAssertInstanceOfRector/Fixture/skip_no_assert_instance_of.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
 
 use PHPUnit\Framework\TestCase;
 

rules-tests/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector/Fixture/skip_outside_test_case.php.inc → rules-tests/TypeDeclaration/Rector/Class_/ClosureReturnTypeFromAssertInstanceOfRector/Fixture/skip_outside_test_case.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector\Fixture;
 
 final class SkipOutsideTestCase
 {

rules-tests/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector/config/configured_rule.php → rules-tests/TypeDeclaration/Rector/Class_/ClosureReturnTypeFromAssertInstanceOfRector/config/configured_rule.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector;
+use Rector\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector;
 use Rector\ValueObject\PhpVersion;
 
 return static function (RectorConfig $rectorConfig): void {

rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector.php → rules/TypeDeclaration/Rector/Class_/ClosureReturnTypeFromAssertInstanceOfRector.php

@@ -2,18 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Rector\TypeDeclaration\Rector\Closure;
+namespace Rector\TypeDeclaration\Rector\Class_;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
-use PHPStan\Analyser\Scope;
+use PhpParser\Node\Stmt\Class_;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\NeverType;
 use Rector\Enum\ClassName;
 use Rector\PhpParser\Node\BetterNodeFinder;
-use Rector\PHPStan\ScopeFetcher;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\Rector\AbstractRector;
 use Rector\RuleDoc\CodeSample\CodeSample;
@@ -24,7 +23,7 @@
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 
 /**
- * @see \Rector\Tests\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector\ClosureReturnTypeFromAssertInstanceOfRectorTest
+ * @see \Rector\Tests\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector\ClosureReturnTypeFromAssertInstanceOfRectorTest
  */
 final class ClosureReturnTypeFromAssertInstanceOfRector extends AbstractRector implements MinPhpVersionInterface
 {
@@ -82,44 +81,60 @@ public function test()
      */
     public function getNodeTypes(): array
     {
-        return [Closure::class];
+        return [Class_::class];
     }
 
     /**
-     * @param Closure $node
+     * @param Class_ $node
      */
     public function refactor(Node $node): ?Node
     {
-        // type is already set
-        if ($node->returnType instanceof Node) {
+        $classReflection = $this->fetchClassLikeReflection($node);
+        if (! $classReflection instanceof ClassReflection) {
             return null;
         }
 
-        // only handle closures narrowed by assertInstanceOf(); plain returns are handled by ClosureReturnTypeRector
-        if (! $this->hasAssertInstanceOf($node)) {
+        // is phpunit test case?
+        if (! $classReflection->is(ClassName::TEST_CASE_CLASS)) {
             return null;
         }
 
-        $scope = ScopeFetcher::fetch($node);
-        if (! $this->isInsideTestCaseClass($scope)) {
-            return null;
-        }
+        $hasChanged = false;
 
-        $closureReturnType = $this->returnTypeInferer->inferFunctionLike($node);
+        /** @var Closure[] $closures */
+        $closures = $this->betterNodeFinder->findInstancesOf($node, [Closure::class]);
+        foreach ($closures as $closure) {
+            // type is already set
+            if ($closure->returnType instanceof Node) {
+                continue;
+            }
 
-        // handled by other rules
-        if ($closureReturnType instanceof NeverType) {
-            return null;
-        }
+            // only handle closures narrowed by assertInstanceOf(); plain returns are handled by ClosureReturnTypeRector
+            if (! $this->hasAssertInstanceOf($closure)) {
+                continue;
+            }
 
-        $returnTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($closureReturnType, TypeKind::RETURN);
-        if (! $returnTypeNode instanceof Node) {
-            return null;
+            $closureReturnType = $this->returnTypeInferer->inferFunctionLike($closure);
+
+            // handled by other rules
+            if ($closureReturnType instanceof NeverType) {
+                continue;
+            }
+
+            $returnTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($closureReturnType, TypeKind::RETURN);
+            if (! $returnTypeNode instanceof Node) {
+                continue;
+            }
+
+            $closure->returnType = $returnTypeNode;
+            $hasChanged = true;
         }
 
-        $node->returnType = $returnTypeNode;
+        if ($hasChanged) {
+            return $node;
+        }
 
-        return $node;
+        return null;
     }
 
     public function provideMinPhpVersion(): int
@@ -135,15 +150,4 @@ private function hasAssertInstanceOf(Closure $closure): bool
                 && $this->isName($node->name, 'assertInstanceOf')
         );
     }
-
-    private function isInsideTestCaseClass(Scope $scope): bool
-    {
-        $classReflection = $scope->getClassReflection();
-        if (! $classReflection instanceof ClassReflection) {
-            return false;
-        }
-
-        // is phpunit test case?
-        return $classReflection->is(ClassName::TEST_CASE_CLASS);
-    }
 }

src/Config/Level/TypeDeclarationLevel.php

@@ -10,6 +10,7 @@
 use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
 use Rector\TypeDeclaration\Rector\Class_\AddTestsVoidReturnTypeWhereNoReturnRector;
 use Rector\TypeDeclaration\Rector\Class_\ChildDoctrineRepositoryClassTypeRector;
+use Rector\TypeDeclaration\Rector\Class_\ClosureReturnTypeFromAssertInstanceOfRector;
 use Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector;
 use Rector\TypeDeclaration\Rector\Class_\ObjectTypedPropertyFromJMSSerializerAttributeTypeRector;
 use Rector\TypeDeclaration\Rector\Class_\PropertyTypeFromStrictSetterGetterRector;
@@ -56,7 +57,6 @@
 use Rector\TypeDeclaration\Rector\ClassMethod\StringReturnTypeFromStrictStringReturnsRector;
 use Rector\TypeDeclaration\Rector\Closure\AddClosureNeverReturnTypeRector;
 use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
-use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector;
 use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
 use Rector\TypeDeclaration\Rector\FuncCall\AddArrayAnyAllClosureParamTypeRector;
 use Rector\TypeDeclaration\Rector\FuncCall\AddArrayFunctionClosureParamTypeRector;