[TypeDeclaration] Skip param already typed on AddMethodCallBasedStrictParamTypeRector

Author: samsonasik

rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php

@@ -60,11 +60,6 @@ private function resolveStrictArgValueType(Arg $arg): Type
         // "self" in another object is not correct, this make it independent
         $argValueType = $this->correctSelfType($argValueType);
 
-        $type = $this->nodeTypeResolver->getType($arg->value);
-        if (! $type->equals($argValueType) && $this->typeComparator->isSubtype($type, $argValueType)) {
-            return $type;
-        }
-
         if (! $argValueType instanceof ObjectType) {
             return $argValueType;
         }
@@ -74,6 +69,11 @@ private function resolveStrictArgValueType(Arg $arg): Type
             return new MixedType();
         }
 
+        $type = $this->nodeTypeResolver->getType($arg->value);
+        if (! $type->equals($argValueType) && $this->typeComparator->isSubtype($type, $argValueType)) {
+            return $type;
+        }
+
         return $argValueType;
     }
 

rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php

@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Identifier;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Type\MixedType;
@@ -55,7 +54,7 @@ public function complete(ClassMethod $classMethod, array $classParameterTypes, i
             }
 
             // skip if param type already filled
-            if ($param->type instanceof Identifier) {
+            if ($param->type instanceof Node) {
                 continue;
             }