[DX] Decouple PropertyTypeDecorator (#1055)

rectorphp · Oct 25, 2021 · b305c4e · b305c4e
1 parent 8e2908c
commit b305c4e
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 38 deletions.
diff --git a/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php b/rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php
@@ -189,17 +189,23 @@ private function createArrayItems(Array_ $array): array
      */
     private function createArrayMerge(Array_ $array, array $items): FuncCall
     {
-        /** @var Scope $nodeScope */
-        $nodeScope = $array->getAttribute(AttributeKey::SCOPE);
-        return new FuncCall(new Name('array_merge'), array_map(function (ArrayItem $item) use ($nodeScope): Arg {
-            if ($item !== null && $item->unpack) {
+        /** @var Scope $scope */
+        $scope = $array->getAttribute(AttributeKey::SCOPE);
+
+        $args = array_map(function (ArrayItem|null $arrayItem) use ($scope): Arg {
+            if ($arrayItem === null) {
+                throw new ShouldNotHappenException();
+            }
+
+            if ($arrayItem->unpack) {
                 // Do not unpack anymore
-                $item->unpack = false;
-                return $this->createArgFromSpreadArrayItem($nodeScope, $item);
+                $arrayItem->unpack = false;
+                return $this->createArgFromSpreadArrayItem($scope, $arrayItem);
             }
 
-            return new Arg($item);
-        }, $items));
+            return new Arg($arrayItem);
+        }, $items);
+        return new FuncCall(new Name('array_merge'), $args);
     }
 
     /**

diff --git a/rules/Naming/Naming/PropertyNaming.php b/rules/Naming/Naming/PropertyNaming.php
@@ -11,6 +11,7 @@
 use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
+use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Naming\RectorNamingInflector;
 use Rector\Naming\ValueObject\ExpectedName;
 use Rector\NodeTypeResolver\NodeTypeResolver;
@@ -204,8 +205,11 @@ private function fqnToShortName(string $fqn): string
             return $fqn;
         }
 
-        /** @var string $lastNamePart */
         $lastNamePart = Strings::after($fqn, '\\', - 1);
+        if (! is_string($lastNamePart)) {
+            throw new ShouldNotHappenException();
+        }
+
         if (\str_ends_with($lastNamePart, self::INTERFACE)) {
             return Strings::substring($lastNamePart, 0, - strlen(self::INTERFACE));
         }

diff --git a/rules/Naming/PhpArray/ArrayFilter.php b/rules/Naming/PhpArray/ArrayFilter.php
@@ -4,6 +4,8 @@
 
 namespace Rector\Naming\PhpArray;
 
+use Rector\Core\Exception\ShouldNotHappenException;
+
 final class ArrayFilter
 {
     /**
@@ -23,7 +25,10 @@ public function filterWithAtLeastTwoOccurences(array $values): array
                 continue;
             }
 
-            /** @var string $value */
+            if (! is_string($value)) {
+                throw new ShouldNotHappenException();
+            }
+
             $duplicatedValues[] = $value;
         }
 

diff --git a/src/NodeDecorator/PropertyTypeDecorator.php b/src/NodeDecorator/PropertyTypeDecorator.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\NodeDecorator;
+
+use PhpParser\Node\Stmt\Property;
+use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Type;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
+use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
+use Rector\Core\Php\PhpVersionProvider;
+use Rector\Core\ValueObject\PhpVersionFeature;
+use Rector\PHPStanStaticTypeMapper\ValueObject\TypeKind;
+use Rector\StaticTypeMapper\StaticTypeMapper;
+
+final class PropertyTypeDecorator
+{
+    public function __construct(
+        private PhpDocInfoFactory $phpDocInfoFactory,
+        private PhpVersionProvider $phpVersionProvider,
+        private StaticTypeMapper $staticTypeMapper,
+        private PhpDocTypeChanger $phpDocTypeChanger,
+    ) {
+    }
+
+    public function decorate(Property $property, ?Type $type): void
+    {
+        if ($type === null) {
+            return;
+        }
+
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
+
+        if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) {
+            $phpParserType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::PROPERTY());
+
+            if ($phpParserType !== null) {
+                $property->type = $phpParserType;
+
+                if ($type instanceof GenericObjectType) {
+                    $this->phpDocTypeChanger->changeVarType($phpDocInfo, $type);
+                }
+
+                return;
+            }
+        }
+
+        $this->phpDocTypeChanger->changeVarType($phpDocInfo, $type);
+    }
+}
diff --git a/src/PhpParser/Node/NodeFactory.php b/src/PhpParser/Node/NodeFactory.php
@@ -43,14 +43,14 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Core\Configuration\CurrentNodeProvider;
 use Rector\Core\Exception\NotImplementedYetException;
 use Rector\Core\Exception\ShouldNotHappenException;
+use Rector\Core\NodeDecorator\PropertyTypeDecorator;
 use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\ValueObject\MethodName;
@@ -103,6 +103,7 @@ public function __construct(
         private PhpDocTypeChanger $phpDocTypeChanger,
         private CurrentNodeProvider $currentNodeProvider,
         private AstResolver $reflectionAstResolver,
+        private PropertyTypeDecorator $propertyTypeDecorator
     ) {
     }
 
@@ -223,7 +224,7 @@ public function createPublicInjectPropertyFromNameAndType(string $name, ?Type $t
 
         $property = $propertyBuilder->getNode();
 
-        $this->addPropertyType($property, $type);
+        $this->propertyTypeDecorator->decorate($property, $type);
 
         // add @inject
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
@@ -238,7 +239,7 @@ public function createPrivatePropertyFromNameAndType(string $name, ?Type $type):
         $propertyBuilder->makePrivate();
 
         $property = $propertyBuilder->getNode();
-        $this->addPropertyType($property, $type);
+        $this->propertyTypeDecorator->decorate($property, $type);
 
         return $property;
     }
@@ -630,31 +631,6 @@ private function normalizeArgValue($value)
         return $value;
     }
 
-    private function addPropertyType(Property $property, ?Type $type): void
-    {
-        if ($type === null) {
-            return;
-        }
-
-        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
-
-        if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) {
-            $phpParserType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::PROPERTY());
-
-            if ($phpParserType !== null) {
-                $property->type = $phpParserType;
-
-                if ($type instanceof GenericObjectType) {
-                    $this->phpDocTypeChanger->changeVarType($phpDocInfo, $type);
-                }
-
-                return;
-            }
-        }
-
-        $this->phpDocTypeChanger->changeVarType($phpDocInfo, $type);
-    }
-
     private function createClassPart(string $class): Name | FullyQualified
     {
         if (in_array($class, self::REFERENCES, true)) {