From 4844147f33f83cc20a907ddbfc95a8be58b2de68 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 9 Dec 2025 12:14:53 +0100
Subject: [PATCH 1/2] [code-quality] Add
 AddInstanceofAssertForNullableArgumentRector

---
 config/sets/phpunit-code-quality.php          |   4 +
 ...eofAssertForNullableArgumentRectorTest.php |  28 +++
 .../Fixture/passing_nullable_arg.php.inc      |  68 ++++++
 .../Fixture/skip_non_nullable_type.php.inc    |  27 +++
 .../Source/SomeClassUsedInTests.php           |  18 ++
 .../Source/SomeNestedObject.php               |  13 ++
 .../config/configured_rule.php                |  10 +
 .../NodeFactory/AssertMethodCallFactory.php   |  28 +++
 ...tanceofAssertForNullableArgumentRector.php | 220 ++++++++++++++++++
 ...tanceofAssertForNullableInstanceRector.php |  46 +---
 .../MethodCallParameterTypeResolver.php       |  43 ++++
 .../TypeAnalyzer/SimpleTypeAnalyzer.php       |  25 ++
 12 files changed, 494 insertions(+), 36 deletions(-)
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/AddInstanceofAssertForNullableArgumentRectorTest.php
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/passing_nullable_arg.php.inc
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/skip_non_nullable_type.php.inc
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeClassUsedInTests.php
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeNestedObject.php
 create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/config/configured_rule.php
 create mode 100644 rules/CodeQuality/NodeFactory/AssertMethodCallFactory.php
 create mode 100644 rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php
 create mode 100644 rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php
 create mode 100644 rules/CodeQuality/TypeAnalyzer/SimpleTypeAnalyzer.php

diff --git a/config/sets/phpunit-code-quality.php b/config/sets/phpunit-code-quality.php
index dac88304..9a168f34 100644
--- a/config/sets/phpunit-code-quality.php
+++ b/config/sets/phpunit-code-quality.php
@@ -101,6 +101,10 @@
 
         // avoid call on nullable object
         AddInstanceofAssertForNullableInstanceRector::class,
+
+        // enable next after testing
+        // \Rector\PHPUnit\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector::class,
+
         AssertArrayCastedObjectToAssertSameRector::class,
 
         /**
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/AddInstanceofAssertForNullableArgumentRectorTest.php b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/AddInstanceofAssertForNullableArgumentRectorTest.php
new file mode 100644
index 00000000..dace023c
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/AddInstanceofAssertForNullableArgumentRectorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class AddInstanceofAssertForNullableArgumentRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/passing_nullable_arg.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/passing_nullable_arg.php.inc
new file mode 100644
index 00000000..7d1d9fe4
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/passing_nullable_arg.php.inc
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Source\SomeClassUsedInTests;
+
+final class PassingNullableArg extends TestCase
+{
+    public function test(): void
+    {
+        $someObject = $this->getSomeObject();
+        $this->process($someObject);
+    }
+
+    private function getSomeObject(): ?SomeClassUsedInTests
+    {
+        if (mt_rand(0, 1)) {
+            return new SomeClassUsedInTests();
+        }
+
+        return null;
+    }
+
+    private function process(SomeClassUsedInTests $someObject): void
+    {
+        // non nullable required
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Source\SomeClassUsedInTests;
+
+final class PassingNullableArg extends TestCase
+{
+    public function test(): void
+    {
+        $someObject = $this->getSomeObject();
+        $this->assertInstanceOf(\Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Source\SomeClassUsedInTests::class, $someObject);
+        $this->process($someObject);
+    }
+
+    private function getSomeObject(): ?SomeClassUsedInTests
+    {
+        if (mt_rand(0, 1)) {
+            return new SomeClassUsedInTests();
+        }
+
+        return null;
+    }
+
+    private function process(SomeClassUsedInTests $someObject): void
+    {
+        // non nullable required
+    }
+}
+
+?>
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/skip_non_nullable_type.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/skip_non_nullable_type.php.inc
new file mode 100644
index 00000000..ca556600
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Fixture/skip_non_nullable_type.php.inc
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Source\SomeClassUsedInTests;
+
+final class SkipNonNullableType extends TestCase
+{
+    public function test(): void
+    {
+        $someObject = $this->getSomeObject();
+
+        $this->process($someObject);
+    }
+
+    private function getSomeObject(): SomeClassUsedInTests
+    {
+        return new SomeClassUsedInTests();
+    }
+
+    private function process(SomeClassUsedInTests $someObject)
+    {
+    }
+}
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeClassUsedInTests.php b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeClassUsedInTests.php
new file mode 100644
index 00000000..9455363e
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeClassUsedInTests.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Source;
+
+final class SomeClassUsedInTests
+{
+    public function getSomeMethod(): int
+    {
+         return 1000;
+    }
+
+    public function getSomeNestedObject(): ?SomeNestedObject
+    {
+        return new SomeNestedObject();
+    }
+}
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeNestedObject.php b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeNestedObject.php
new file mode 100644
index 00000000..2c54d944
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/Source/SomeNestedObject.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\Source;
+
+final class SomeNestedObject
+{
+    public function getNumber(): int
+    {
+        return 456;
+    }
+}
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/config/configured_rule.php
new file mode 100644
index 00000000..9f123c47
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(AddInstanceofAssertForNullableArgumentRector::class);
+};
diff --git a/rules/CodeQuality/NodeFactory/AssertMethodCallFactory.php b/rules/CodeQuality/NodeFactory/AssertMethodCallFactory.php
new file mode 100644
index 00000000..7d054938
--- /dev/null
+++ b/rules/CodeQuality/NodeFactory/AssertMethodCallFactory.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\NodeFactory;
+
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Stmt\Expression;
+use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToType;
+
+final class AssertMethodCallFactory
+{
+    public function createAssertInstanceOf(VariableNameToType $variableNameToType): Expression
+    {
+        $args = [
+            new Arg(new ClassConstFetch(new FullyQualified($variableNameToType->getObjectType()), 'class')),
+            new Arg(new Variable($variableNameToType->getVariableName())),
+        ];
+
+        $methodCall = new MethodCall(new Variable('this'), 'assertInstanceOf', $args);
+
+        return new Expression($methodCall);
+    }
+}
diff --git a/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php b/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php
new file mode 100644
index 00000000..fcfa01ba
--- /dev/null
+++ b/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php
@@ -0,0 +1,220 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\Rector\ClassMethod;
+
+use PhpParser\NodeVisitor;
+use PhpParser\Node;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Foreach_;
+use PHPStan\Type\ObjectType;
+use Rector\PHPUnit\CodeQuality\NodeAnalyser\NullableObjectAssignCollector;
+use Rector\PHPUnit\CodeQuality\NodeFactory\AssertMethodCallFactory;
+use Rector\PHPUnit\CodeQuality\TypeAnalyzer\MethodCallParameterTypeResolver;
+use Rector\PHPUnit\CodeQuality\TypeAnalyzer\SimpleTypeAnalyzer;
+use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToType;
+use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToTypeCollection;
+use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
+use Rector\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see \Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableArgumentRector\AddInstanceofAssertForNullableArgumentRectorTest
+ */
+final class AddInstanceofAssertForNullableArgumentRector extends AbstractRector
+{
+    public function __construct(
+        private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
+        private readonly NullableObjectAssignCollector $nullableObjectAssignCollector,
+        private readonly AssertMethodCallFactory $assertMethodCallFactory,
+        private readonly MethodCallParameterTypeResolver $methodCallParameterTypeResolver,
+    ) {
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Add explicit instance assert between above nullable object pass',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+use PHPUnit\Framework\TestCase;
+
+final class SomeTest extends TestCase
+{
+    public function test()
+    {
+        $someObject = $this->getSomeObject();
+
+        $this->process($someObject);
+    }
+
+    private function getSomeObject(): ?SomeClass
+    {
+        if (mt_rand(0, 1)) {
+            return new SomeClass();
+        }
+
+        return null;
+    }
+
+    private function process(SomeClass $someObject): void
+    {
+        // non-nullable use here
+    }
+}
+CODE_SAMPLE
+
+                    ,
+                    <<<'CODE_SAMPLE'
+use PHPUnit\Framework\TestCase;
+
+final class SomeTest extends TestCase
+{
+    public function test()
+    {
+        $someObject = $this->getSomeObject();
+        $this->assertInstanceOf(SomeClass::class, $someObject);
+
+        $this->process($someObject);
+    }
+
+    private function getSomeObject(): ?SomeClass
+    {
+        if (mt_rand(0, 1)) {
+            return new SomeClass();
+        }
+
+        return null;
+    }
+
+    private function process(SomeClass $someObject): void
+    {
+        // non-nullable use here
+    }
+}
+CODE_SAMPLE
+                ),
+            ]
+        );
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [ClassMethod::class, Foreach_::class];
+    }
+
+    /**
+     * @param ClassMethod|Foreach_ $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (! $this->testsNodeAnalyzer->isInTestClass($node)) {
+            return null;
+        }
+
+        if ($node->stmts === null || count($node->stmts) < 2) {
+            return null;
+        }
+
+        $hasChanged = false;
+        $variableNameToTypeCollection = $this->nullableObjectAssignCollector->collect($node);
+
+        $next = 0;
+        foreach ($node->stmts as $key => $stmt) {
+            // has callable on nullable variable of already collected name?
+            $matchedNullableVariableNameToType = $this->matchedNullableArgumentNameToType(
+                $stmt,
+                $variableNameToTypeCollection
+            );
+
+            if (! $matchedNullableVariableNameToType instanceof VariableNameToType) {
+                continue;
+            }
+
+            // adding type here + popping the variable name out
+            $assertInstanceOfExpression = $this->assertMethodCallFactory->createAssertInstanceOf(
+                $matchedNullableVariableNameToType
+            );
+            array_splice($node->stmts, $key + $next, 0, [$assertInstanceOfExpression]);
+
+            // remove variable name from nullable ones
+            $hasChanged = true;
+
+            // from now on, the variable is not nullable, remove to avoid double asserts
+            $variableNameToTypeCollection->remove($matchedNullableVariableNameToType);
+
+            ++$next;
+        }
+
+        if (! $hasChanged) {
+            return null;
+        }
+
+        return $node;
+    }
+
+    private function matchedNullableArgumentNameToType(
+        Stmt $stmt,
+        VariableNameToTypeCollection $variableNameToTypeCollection
+    ): ?VariableNameToType {
+        $matchedNullableVariableNameToType = null;
+
+        $this->traverseNodesWithCallable($stmt, function (Node $node) use (
+            $variableNameToTypeCollection,
+            &$matchedNullableVariableNameToType
+        ): ?int {
+            if (! $node instanceof MethodCall) {
+                return null;
+            }
+
+            if ($node->isFirstClassCallable()) {
+                return null;
+            }
+
+            $classMethodParameterTypes = $this->methodCallParameterTypeResolver->resolve($node);
+
+            foreach ($node->getArgs() as $position => $arg) {
+                if (! $arg->value instanceof Variable) {
+                    continue;
+                }
+
+                $variableType = $this->getType($arg->value);
+                if (! SimpleTypeAnalyzer::isNullableType($variableType)) {
+                    return null;
+                }
+
+                // should not happen
+                if (! isset($classMethodParameterTypes[$position])) {
+                    return null;
+                }
+
+                $variableName = $this->getName($arg->value);
+                if (! is_string($variableName)) {
+                    return null;
+                }
+
+                $matchedNullableVariableNameToType = $variableNameToTypeCollection->matchByVariableName($variableName);
+
+                // is object type required?
+                if (! $classMethodParameterTypes[$position] instanceof ObjectType) {
+                    return null;
+                }
+
+                return NodeVisitor::STOP_TRAVERSAL;
+            }
+
+            return null;
+        });
+
+        return $matchedNullableVariableNameToType;
+    }
+}
diff --git a/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableInstanceRector.php b/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableInstanceRector.php
index f24e41c7..ea7473c9 100644
--- a/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableInstanceRector.php
+++ b/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableInstanceRector.php
@@ -5,19 +5,15 @@
 namespace Rector\PHPUnit\CodeQuality\Rector\ClassMethod;
 
 use PhpParser\Node;
-use PhpParser\Node\Arg;
-use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Foreach_;
-use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\UnionType;
+use PhpParser\NodeVisitor;
 use Rector\PHPUnit\CodeQuality\NodeAnalyser\NullableObjectAssignCollector;
+use Rector\PHPUnit\CodeQuality\NodeFactory\AssertMethodCallFactory;
+use Rector\PHPUnit\CodeQuality\TypeAnalyzer\SimpleTypeAnalyzer;
 use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToType;
 use Rector\PHPUnit\CodeQuality\ValueObject\VariableNameToTypeCollection;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
@@ -33,6 +29,7 @@ final class AddInstanceofAssertForNullableInstanceRector extends AbstractRector
     public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
         private readonly NullableObjectAssignCollector $nullableObjectAssignCollector,
+        private readonly AssertMethodCallFactory $assertMethodCallFactory,
     ) {
     }
 
@@ -130,7 +127,9 @@ public function refactor(Node $node): ?Node
             }
 
             // adding type here + popping the variable name out
-            $assertInstanceOfExpression = $this->createAssertInstanceOf($matchedNullableVariableNameToType);
+            $assertInstanceOfExpression = $this->assertMethodCallFactory->createAssertInstanceOf(
+                $matchedNullableVariableNameToType
+            );
             array_splice($node->stmts, $key + $next, 0, [$assertInstanceOfExpression]);
 
             // remove variable name from nullable ones
@@ -149,31 +148,6 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
-    private function isNullableType(Type $type): bool
-    {
-        if (! $type instanceof UnionType) {
-            return false;
-        }
-
-        if (! TypeCombinator::containsNull($type)) {
-            return false;
-        }
-
-        return count($type->getTypes()) === 2;
-    }
-
-    private function createAssertInstanceOf(VariableNameToType $variableNameToType): Expression
-    {
-        $args = [
-            new Arg(new ClassConstFetch(new FullyQualified($variableNameToType->getObjectType()), 'class')),
-            new Arg(new Variable($variableNameToType->getVariableName())),
-        ];
-
-        $methodCall = new MethodCall(new Variable('this'), 'assertInstanceOf', $args);
-
-        return new Expression($methodCall);
-    }
-
     private function matchedNullableVariableNameToType(
         Stmt $stmt,
         VariableNameToTypeCollection $variableNameToTypeCollection
@@ -183,7 +157,7 @@ private function matchedNullableVariableNameToType(
         $this->traverseNodesWithCallable($stmt, function (Node $node) use (
             $variableNameToTypeCollection,
             &$matchedNullableVariableNameToType
-        ): null {
+        ): ?int {
             if (! $node instanceof MethodCall) {
                 return null;
             }
@@ -193,7 +167,7 @@ private function matchedNullableVariableNameToType(
             }
 
             $variableType = $this->getType($node->var);
-            if (! $this->isNullableType($variableType)) {
+            if (! SimpleTypeAnalyzer::isNullableType($variableType)) {
                 return null;
             }
 
@@ -205,7 +179,7 @@ private function matchedNullableVariableNameToType(
             $matchedNullableVariableNameToType = $variableNameToTypeCollection->matchByVariableName($variableName);
 
             // is the variable we're interested in?
-            return null;
+            return NodeVisitor::STOP_TRAVERSAL;
         });
 
         return $matchedNullableVariableNameToType;
diff --git a/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php b/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php
new file mode 100644
index 00000000..33d1370e
--- /dev/null
+++ b/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\TypeAnalyzer;
+
+use PHPStan\Type\Type;
+use PhpParser\Node\Expr\MethodCall;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
+use Rector\Reflection\ReflectionResolver;
+
+final readonly class MethodCallParameterTypeResolver
+{
+    public function __construct(
+        private ReflectionResolver $reflectionResolver
+    ) {
+    }
+
+    /**
+     * @return Type[]|null
+     */
+    public function resolve(MethodCall $methodCall): ?array
+    {
+        if ($methodCall->getArgs() === []) {
+            return null;
+        }
+
+        $methodReflection = $this->reflectionResolver->resolveMethodReflectionFromMethodCall($methodCall);
+        if (! $methodReflection instanceof MethodReflection) {
+            return null;
+        }
+
+        $extendedParametersAcceptor = ParametersAcceptorSelector::combineAcceptors($methodReflection->getVariants());
+
+        $parameterTypesByPosition = [];
+        foreach ($extendedParametersAcceptor->getParameters() as $extendedParameterReflection) {
+            $parameterTypesByPosition[] = $extendedParameterReflection->getType();
+        }
+
+        return $parameterTypesByPosition;
+    }
+}
diff --git a/rules/CodeQuality/TypeAnalyzer/SimpleTypeAnalyzer.php b/rules/CodeQuality/TypeAnalyzer/SimpleTypeAnalyzer.php
new file mode 100644
index 00000000..f8588ee0
--- /dev/null
+++ b/rules/CodeQuality/TypeAnalyzer/SimpleTypeAnalyzer.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\TypeAnalyzer;
+
+use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\UnionType;
+
+final class SimpleTypeAnalyzer
+{
+    public static function isNullableType(Type $type): bool
+    {
+        if (! $type instanceof UnionType) {
+            return false;
+        }
+
+        if (! TypeCombinator::containsNull($type)) {
+            return false;
+        }
+
+        return count($type->getTypes()) === 2;
+    }
+}

From 569ae18c44638716b436df92e52eceb47c58e26b Mon Sep 17 00:00:00 2001
From: GitHub Action <actions@github.com>
Date: Tue, 9 Dec 2025 13:52:36 +0000
Subject: [PATCH 2/2] [ci-review] Rector Rectify

---
 .../AddInstanceofAssertForNullableArgumentRector.php            | 2 +-
 .../TypeAnalyzer/MethodCallParameterTypeResolver.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php b/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php
index fcfa01ba..0eef1610 100644
--- a/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php
+++ b/rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php
@@ -4,13 +4,13 @@
 
 namespace Rector\PHPUnit\CodeQuality\Rector\ClassMethod;
 
-use PhpParser\NodeVisitor;
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Foreach_;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\PHPUnit\CodeQuality\NodeAnalyser\NullableObjectAssignCollector;
 use Rector\PHPUnit\CodeQuality\NodeFactory\AssertMethodCallFactory;
diff --git a/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php b/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php
index 33d1370e..667c932a 100644
--- a/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php
+++ b/rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php
@@ -4,10 +4,10 @@
 
 namespace Rector\PHPUnit\CodeQuality\TypeAnalyzer;
 
-use PHPStan\Type\Type;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Type\Type;
 use Rector\Reflection\ReflectionResolver;
 
 final readonly class MethodCallParameterTypeResolver