[Php80] Skip union callable on ClassPropertyAssignToConstructorPromot…

…ionRector (#1101) * Add failing test fixture for ClassPropertyAssignToConstructorPromotionRector * Closes #1100 * cs fix * Add PropertyAnalyzer * [ci-review] Rector Rectify * rectify * clean up * [ci-review] Rector Rectify * [ci-review] Rector Rectify * [ci-review] Rector Rectify Co-authored-by: zingimmick <zingimmick@outlook.com> Co-authored-by: GitHub Action <action@github.com>
rectorphp · Oct 29, 2021 · 5ca93fd · 5ca93fd
1 parent a7d8b39
commit 5ca93fd
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 12 deletions.
diff --git a/...ssignToConstructorPromotionRector/Fixture/skip_nullable_callable_without_typehint.php.inc b/...ssignToConstructorPromotionRector/Fixture/skip_nullable_callable_without_typehint.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+final class SkipNullableCallableWithoutTypehint
+{
+    /** @var callable|null */
+    public $cb;
+
+    public function __construct($cb = null)
+    {
+        $this->cb = $cb;
+    }
+}
diff --git a/...rtyAssignToConstructorPromotionRector/Fixture/skip_union_typed_with_callable_type.php.inc b/...rtyAssignToConstructorPromotionRector/Fixture/skip_union_typed_with_callable_type.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+final class SkipUnionTypedWithCallableType
+{
+    /** @var callable|array */
+    public $cb;
+
+    public function __construct(callable|array $cb = null)
+    {
+        $this->cb = $cb;
+    }
+}
diff --git a/rules/Php74/Rector/Property/TypedPropertyRector.php b/rules/Php74/Rector/Property/TypedPropertyRector.php
@@ -16,6 +16,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
+use Rector\Core\NodeAnalyzer\PropertyAnalyzer;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
@@ -71,7 +72,8 @@ public function __construct(
         private VarTagRemover $varTagRemover,
         private ReflectionProvider $reflectionProvider,
         private PropertyFetchAnalyzer $propertyFetchAnalyzer,
-        private FamilyRelationsAnalyzer $familyRelationsAnalyzer
+        private FamilyRelationsAnalyzer $familyRelationsAnalyzer,
+        private PropertyAnalyzer $propertyAnalyzer
     ) {
     }
 
@@ -246,14 +248,6 @@ private function shouldSkipNonClassLikeType(Name|NullableType|PhpParserUnionType
             return false;
         }
 
-        if ($typeName === 'null') {
-            return true;
-        }
-
-        if ($typeName === 'callable') {
-            return true;
-        }
-
         if (! $this->classLikeTypeOnly) {
             return false;
         }
@@ -311,6 +305,14 @@ private function shouldSkipProperty(Property $property): bool
             return true;
         }
 
-        return $this->privatePropertyOnly && ! $property->isPrivate();
+        if (! $this->privatePropertyOnly) {
+            return $this->propertyAnalyzer->hasForbiddenType($property);
+        }
+
+        if ($property->isPrivate()) {
+            return $this->propertyAnalyzer->hasForbiddenType($property);
+        }
+
+        return true;
     }
 }
diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
@@ -11,10 +11,12 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
+use PhpParser\Node\UnionType;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\Core\NodeAnalyzer\ParamAnalyzer;
+use Rector\Core\NodeAnalyzer\PropertyAnalyzer;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\MethodName;
 use Rector\Core\ValueObject\PhpVersionFeature;
@@ -39,7 +41,8 @@ public function __construct(
         private VariableRenamer $variableRenamer,
         private VarTagRemover $varTagRemover,
         private ParamAnalyzer $paramAnalyzer,
-        private PhpDocTypeChanger $phpDocTypeChanger
+        private PhpDocTypeChanger $phpDocTypeChanger,
+        private PropertyAnalyzer $propertyAnalyzer
     ) {
     }
 
@@ -106,6 +109,10 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            if ($this->propertyAnalyzer->hasForbiddenType($property)) {
+                continue;
+            }
+
             $this->removeNode($property);
             $this->removeNode($promotionCandidate->getAssign());
 
@@ -184,6 +191,22 @@ private function shouldSkipParam(Param $param): bool
             $type = $param->type;
         }
 
-        return $type instanceof Identifier && $this->isName($type, 'callable');
+        if (! $type instanceof UnionType) {
+            return false;
+        }
+
+        foreach ($type->types as $type) {
+            if (! $type instanceof Identifier) {
+                continue;
+            }
+
+            if (! $this->isName($type, 'callable')) {
+                continue;
+            }
+
+            return true;
+        }
+
+        return false;
     }
 }
diff --git a/src/NodeAnalyzer/PropertyAnalyzer.php b/src/NodeAnalyzer/PropertyAnalyzer.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\NodeAnalyzer;
+
+use PhpParser\Node\Stmt\Property;
+use PHPStan\Type\CallableType;
+use PHPStan\Type\NullType;
+use PHPStan\Type\Type;
+use PHPStan\Type\UnionType;
+use Rector\NodeTypeResolver\NodeTypeResolver;
+
+final class PropertyAnalyzer
+{
+    public function __construct(
+        private NodeTypeResolver $nodeTypeResolver
+    ) {
+    }
+
+    public function hasForbiddenType(Property $property): bool
+    {
+        $propertyType = $this->nodeTypeResolver->getType($property);
+        if ($propertyType instanceof NullType) {
+            return true;
+        }
+
+        if ($this->isCallableType($propertyType)) {
+            return true;
+        }
+
+        if (! $propertyType instanceof UnionType) {
+            return false;
+        }
+
+        $types = $propertyType->getTypes();
+        foreach ($types as $type) {
+            if ($this->isCallableType($type)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function isCallableType(Type $type): bool
+    {
+        return $type instanceof CallableType;
+    }
+}