cleanup

Author: TomasVotruba

rules/CodeQuality/NodeAnalyser/NullableObjectAssignCollector.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\NodeAnalyser;
+
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Variable;
+use PHPStan\Type\ObjectType;
+use PHPStan\Type\TypeCombinator;
+use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\NodeTypeResolver\NodeTypeResolver;
+use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToType;
+
+final class NullableObjectAssignCollector
+{
+    public function __construct(
+        private readonly NodeNameResolver $nodeNameResolver,
+        private readonly NodeTypeResolver $nodeTypeResolver,
+    ) {
+    }
+
+    public function collect(Assign $assign): ?VariableNameToType
+    {
+        if (! $assign->expr instanceof MethodCall) {
+            return null;
+        }
+
+        if (! $assign->var instanceof Variable) {
+            return null;
+        }
+
+        $variableName = $this->nodeNameResolver->getName($assign->var);
+        $variableType = $this->nodeTypeResolver->getType($assign);
+
+        $bareVariableType = TypeCombinator::removeNull($variableType);
+        if (! $bareVariableType instanceof ObjectType) {
+            return null;
+        }
+
+        return new VariableNameToType($variableName, $bareVariableType->getClassName());
+    }
+}

rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableInstanceRector.php

@@ -15,10 +15,10 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Foreach_;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
+use Rector\PHPUnit\CodeQuality\NodeAnalyser\NullableObjectAssignCollector;
 use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToType;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -32,6 +32,7 @@ final class AddInstanceofAssertForNullableInstanceRector extends AbstractRector
 {
     public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
+        private readonly NullableObjectAssignCollector $nullableObjectAssignCollector,
     ) {
     }
 
@@ -121,7 +122,7 @@ public function refactor(Node $node): ?Node
 
         foreach ($node->stmts as $key => $stmt) {
             if ($stmt instanceof Expression && $stmt->expr instanceof Assign) {
-                $variableNameToType = $this->collectVariableFromAssign($stmt->expr);
+                $variableNameToType = $this->nullableObjectAssignCollector->collect($stmt->expr);
                 if ($variableNameToType instanceof VariableNameToType) {
                     $nullableVariableNamesToTypes[] = $variableNameToType;
                     continue;
@@ -172,32 +173,6 @@ private function isNullableType(Type $type): bool
         return count($type->getTypes()) === 2;
     }
 
-    private function collectVariableFromAssign(Assign $assign): ?VariableNameToType
-    {
-        if (! $assign->expr instanceof MethodCall) {
-            return null;
-        }
-
-        if (! $assign->var instanceof Variable) {
-            return null;
-        }
-
-        $variableType = $this->getType($assign);
-        if (! $this->isNullableType($variableType)) {
-            return null;
-        }
-
-        // $fullType = TypeCombinator::removeNull($variableType);
-        $variableName = $this->getName($assign->var);
-
-        $bareVariableType = TypeCombinator::removeNull($variableType);
-        if (! $bareVariableType instanceof ObjectType) {
-            return null;
-        }
-
-        return new VariableNameToType($variableName, $bareVariableType->getClassName());
-    }
-
     private function createAssertInstanceof(VariableNameToType $variableNameToType): Expression
     {
         $args = [

rules/CodeQuality/ValueObject/VariableNameToTypeCollection.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\ValueObject;
+
+final class VariableNameToTypeCollection
+{
+    /**
+     * @param VariableNameToType[] $variableNameToType
+     */
+    public function __construct(
+        private array $variableNameToType
+    ) {
+    }
+}