Skip union if parent type in ClassMethodParamTypeCompleter (#1103)

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/FixtureUnion/narrow_union.php.inc

@@ -17,7 +17,7 @@ final class NarrowUnion
         $this->someExpr($string);
     }
 
-    private function someExpr(Expr $expr)
+    private function someExpr($expr)
     {
     }
 }

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/FixtureUnion/skip_union_if_parent.php.inc

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\FixtureUnion;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Scalar\String_;
+
+final class SkipUnionIfParent
+{
+    public function run(MethodCall $methodCall, StaticCall $staticCall, String_ $string)
+    {
+        $this->someExpr($methodCall);
+        $this->someExpr($staticCall);
+        $this->someExpr($string);
+    }
+
+    private function someExpr(Expr $expr)
+    {
+    }
+}

rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php

@@ -28,7 +28,7 @@ public function __construct(
 
     /**
      * @param MethodCall[]|StaticCall[]|ArrayCallable[] $calls
-     * @return Type[]
+     * @return array<int, Type>
      */
     public function resolveStrictTypesFromCalls(array $calls): array
     {

rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php

@@ -97,6 +97,11 @@ private function shouldSkipArgumentStaticType(
             return true;
         }
 
+        // current type already accepts the one added
+        if ($currentParameterStaticType->accepts($argumentStaticType, true)->yes()) {
+            return true;
+        }
+
         // avoid overriding more precise type
         if ($argumentStaticType->isSuperTypeOf($currentParameterStaticType)->yes()) {
             return true;