[ci-review] Rector Rectify

rectorphp · Jul 16, 2024 · 43868ca · 43868ca
1 parent cfb8514
commit 43868ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/rules/CodeQuality/NodeFactory/TypedPropertyFactory.php b/rules/CodeQuality/NodeFactory/TypedPropertyFactory.php
@@ -4,6 +4,7 @@
 
 namespace Rector\CodeQuality\NodeFactory;
 
+use PhpParser\Node\NullableType;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
@@ -12,7 +13,7 @@
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
-final class TypedPropertyFactory
+final readonly class TypedPropertyFactory
 {
     public function __construct(
         private StaticTypeMapper $staticTypeMapper,
@@ -42,8 +43,8 @@ public function createPropertyTypeNode(
 
         $typeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($propertyType, TypeKind::PROPERTY);
 
-        if ($isNullable && ! $typeNode instanceof Node\NullableType) {
-            return new Node\NullableType($typeNode);
+        if ($isNullable && ! $typeNode instanceof NullableType) {
+            return new NullableType($typeNode);
         }
 
         return $typeNode;

diff --git a/rules/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector.php b/rules/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\CodeQuality\Rector\Class_;
 
+use PhpParser\Node\Attribute;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Class_;
@@ -88,7 +89,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->attributeFinder->findAttributeByClass($node, 'AllowDynamicProperties')) {
+        if (!$this->attributeFinder->findAttributeByClass($node, 'AllowDynamicProperties') instanceof Attribute) {
             return null;
         }
 
@@ -158,11 +159,7 @@ private function createNewPropertyFromPropertyTagValueNodes(array $propertyPhpDo
                 }
 
                 $defaultValue = $existingProperty->props[0]->default;
-                if ($defaultValue instanceof Expr && $this->valueResolver->isNull($defaultValue)) {
-                    $isNullable = true;
-                } else {
-                    $isNullable = false;
-                }
+                $isNullable = $defaultValue instanceof Expr && $this->valueResolver->isNull($defaultValue);
 
                 $existingProperty->type = $this->typedPropertyFactory->createPropertyTypeNode(
                     $propertyTagValueNode,