[Php80] Skip callable type different definition on ClassPropertyAssig…

…nToConstructorPromotionRector (#3010)

rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_callable_type_different_definition.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+final class SkipCallableTypeDifferentDefinition
+{
+    /** @var CallbackHandler */
+    private $fallback;
+
+    public function __construct(callable $fallback)
+    {
+        $this->fallback = $fallback;
+    }
+}
+
+?>

rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/skip_callable_type_different_definition2.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+final class SkipCallableTypeDifferentDefinition2
+{
+    /** @var \stdClass */
+    private $fallback;
+
+    public function __construct(callable $fallback)
+    {
+        $this->fallback = $fallback;
+    }
+}
+
+?>

rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php

@@ -206,22 +206,25 @@ private function shouldSkipParam(Param $param): bool
             $type = $param->type;
         }
 
+        if ($this->isCallableTypeIdentifier($type)) {
+            return true;
+        }
+
         if (! $type instanceof UnionType) {
             return false;
         }
 
         foreach ($type->types as $type) {
-            if (! $type instanceof Identifier) {
-                continue;
-            }
-
-            if (! $this->isName($type, 'callable')) {
-                continue;
+            if ($this->isCallableTypeIdentifier($type)) {
+                return true;
             }
-
-            return true;
         }
 
         return false;
     }
+
+    private function isCallableTypeIdentifier(?Node $node): bool
+    {
+        return $node instanceof Identifier && $this->isName($node, 'callable');
+    }
 }

src/NodeAnalyzer/PropertyAnalyzer.php

@@ -11,6 +11,7 @@
 use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\UnionType;
 use Rector\NodeTypeResolver\NodeTypeResolver;
+use Rector\StaticTypeMapper\ValueObject\Type\NonExistingObjectType;
 
 final class PropertyAnalyzer
 {
@@ -26,7 +27,7 @@ public function hasForbiddenType(Property $property): bool
             return true;
         }
 
-        if ($this->isCallableType($propertyType)) {
+        if ($this->isForbiddenType($propertyType)) {
             return true;
         }
 
@@ -36,14 +37,23 @@ public function hasForbiddenType(Property $property): bool
 
         $types = $propertyType->getTypes();
         foreach ($types as $type) {
-            if ($this->isCallableType($type)) {
+            if ($this->isForbiddenType($type)) {
                 return true;
             }
         }
 
         return false;
     }
 
+    private function isForbiddenType(Type $type): bool
+    {
+        if ($type instanceof NonExistingObjectType) {
+            return true;
+        }
+
+        return $this->isCallableType($type);
+    }
+
     private function isCallableType(Type $type): bool
     {
         if ($type instanceof TypeWithClassName) {