From e70a5181c95e3cc91e176f226ae5fc64cb3dccdc Mon Sep 17 00:00:00 2001
From: bjorn <bjorn@swis.nl>
Date: Sat, 14 Nov 2026 16:16:29 +0100
Subject: [PATCH] [PHPUnit60] Follow parent::test() calls in
 AddDoesNotPerformAssertionToNonAssertingTestRector (rectorphp/rector#9965)

"parent::test()" was not resolved, as "parent" is a union of all ancestors in the type resolver. Resolve it to the direct parent class of the current class instead.

The containsAssertCall() cache key now includes the name of the class owning the method. Identical bodies ("parent::test()" or "$this->helper()") can mean different things per class, so sibling classes sharing a cache entry could get a wrong result. This also fixes a false positive that already happens without the parent:: change, see the sibling_classes_with_same_helper_body fixture.

PHPUnit\Framework\TestCase itself is never resolved as a parent, it has no asserting test methods and is slow to parse.
---
 .../parent_test_call_without_assert.php.inc   | 32 +++++++++
 ...ling_classes_with_same_helper_body.php.inc | 68 ++++++++++++++++++
 .../skip_parent_test_call_with_assert.php.inc | 13 ++++
 .../AbstractClassWithAssertingMethod.php      | 15 ++++
 .../AbstractClassWithNonAssertingMethod.php   | 15 ++++
 src/NodeAnalyzer/AssertCallAnalyzer.php       | 70 ++++++++++++++++---
 6 files changed, 203 insertions(+), 10 deletions(-)
 create mode 100644 rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/parent_test_call_without_assert.php.inc
 create mode 100644 rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/sibling_classes_with_same_helper_body.php.inc
 create mode 100644 rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/skip_parent_test_call_with_assert.php.inc
 create mode 100644 rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithAssertingMethod.php
 create mode 100644 rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithNonAssertingMethod.php

diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/parent_test_call_without_assert.php.inc b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/parent_test_call_without_assert.php.inc
new file mode 100644
index 00000000..1235c78c
--- /dev/null
+++ b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/parent_test_call_without_assert.php.inc
@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Fixture;
+
+use Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Source\AbstractClassWithNonAssertingMethod;
+
+class ParentTestCallWithoutAssert extends AbstractClassWithNonAssertingMethod
+{
+    public function testSomething()
+    {
+        parent::testSomething();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Fixture;
+
+use Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Source\AbstractClassWithNonAssertingMethod;
+
+class ParentTestCallWithoutAssert extends AbstractClassWithNonAssertingMethod
+{
+    #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
+    public function testSomething()
+    {
+        parent::testSomething();
+    }
+}
+
+?>
diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/sibling_classes_with_same_helper_body.php.inc b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/sibling_classes_with_same_helper_body.php.inc
new file mode 100644
index 00000000..7eae4967
--- /dev/null
+++ b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/sibling_classes_with_same_helper_body.php.inc
@@ -0,0 +1,68 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SiblingHelperNonAsserting extends TestCase
+{
+    public function testHelper()
+    {
+        $this->helper();
+    }
+
+    private function helper()
+    {
+        $value = 1;
+    }
+}
+
+final class SiblingHelperAsserting extends TestCase
+{
+    public function testHelper()
+    {
+        $this->helper();
+    }
+
+    private function helper()
+    {
+        $this->assertTrue(true);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SiblingHelperNonAsserting extends TestCase
+{
+    #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
+    public function testHelper()
+    {
+        $this->helper();
+    }
+
+    private function helper()
+    {
+        $value = 1;
+    }
+}
+
+final class SiblingHelperAsserting extends TestCase
+{
+    public function testHelper()
+    {
+        $this->helper();
+    }
+
+    private function helper()
+    {
+        $this->assertTrue(true);
+    }
+}
+
+?>
diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/skip_parent_test_call_with_assert.php.inc b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/skip_parent_test_call_with_assert.php.inc
new file mode 100644
index 00000000..db1ec5c6
--- /dev/null
+++ b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Fixture/skip_parent_test_call_with_assert.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Fixture;
+
+use Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Source\AbstractClassWithAssertingMethod;
+
+class SkipParentTestCallWithAssert extends AbstractClassWithAssertingMethod
+{
+    public function testSomething()
+    {
+        parent::testSomething();
+    }
+}
diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithAssertingMethod.php b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithAssertingMethod.php
new file mode 100644
index 00000000..3f1d9fb5
--- /dev/null
+++ b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithAssertingMethod.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Source;
+
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractClassWithAssertingMethod extends TestCase
+{
+    public function testSomething()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithNonAssertingMethod.php b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithNonAssertingMethod.php
new file mode 100644
index 00000000..b405a118
--- /dev/null
+++ b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/AbstractClassWithNonAssertingMethod.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector\Source;
+
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractClassWithNonAssertingMethod extends TestCase
+{
+    public function testSomething()
+    {
+        $value = 1 + 1;
+    }
+}
diff --git a/src/NodeAnalyzer/AssertCallAnalyzer.php b/src/NodeAnalyzer/AssertCallAnalyzer.php
index b76e212c..678321ad 100644
--- a/src/NodeAnalyzer/AssertCallAnalyzer.php
+++ b/src/NodeAnalyzer/AssertCallAnalyzer.php
@@ -10,12 +10,17 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\TypeWithClassName;
+use Rector\Enum\ObjectReference;
 use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\AstResolver;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
+use Rector\PHPUnit\Enum\PHPUnitClassName;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 
 final class AssertCallAnalyzer
@@ -74,7 +79,10 @@ public function containsAssertCall(ClassMethod $classMethod): bool
                 return false;
             }
 
-            $cacheHash = md5($this->betterStandardPrinter->prettyPrint([$classMethod]));
+            // the same body means a different method per class, e.g. "$this->helper()" or "parent::test()"
+            $cacheHash = md5(
+                $this->betterStandardPrinter->prettyPrint([$classMethod]) . $this->resolveOwnClassName($classMethod)
+            );
 
             if (isset($this->containsAssertCallByClassMethod[$cacheHash])) {
                 return $this->containsAssertCallByClassMethod[$cacheHash];
@@ -83,7 +91,7 @@ public function containsAssertCall(ClassMethod $classMethod): bool
             // A. try "->assert" shallow search first for performance
             $hasDirectAssertOrMockCall = $this->hasDirectAssertOrMockCall($classMethod);
             if ($hasDirectAssertOrMockCall) {
-                $this->containsAssertCallByClassMethod[$cacheHash] = $hasDirectAssertOrMockCall;
+                $this->containsAssertCallByClassMethod[$cacheHash] = true;
                 return true;
             }
 
@@ -203,22 +211,64 @@ private function hasNestedAssertCall(ClassMethod $classMethod): bool
 
     private function resolveClassMethodFromCall(StaticCall|MethodCall $call): ?ClassMethod
     {
-        if ($call instanceof MethodCall) {
-            $objectType = $this->nodeTypeResolver->getType($call->var);
-        } else {
-            // StaticCall
-            $objectType = $this->nodeTypeResolver->getType($call->class);
+        $methodName = $this->nodeNameResolver->getName($call->name);
+        if ($methodName === null) {
+            return null;
+        }
+
+        $className = $this->resolveClassName($call);
+        if ($className === null) {
+            return null;
+        }
+
+        return $this->astResolver->resolveClassMethod($className, $methodName);
+    }
+
+    private function resolveOwnClassName(ClassMethod $classMethod): string
+    {
+        $classReflection = $this->resolveClassReflection($classMethod);
+        if (! $classReflection instanceof ClassReflection) {
+            return '';
+        }
+
+        return $classReflection->getName();
+    }
+
+    private function resolveClassName(StaticCall|MethodCall $call): ?string
+    {
+        if ($call instanceof StaticCall && $this->nodeNameResolver->isName($call->class, ObjectReference::PARENT)) {
+            // "parent" resolves to a union of all ancestors in type resolver, so use the direct parent class instead
+            $parentClassReflection = $this->resolveClassReflection($call)?->getParentClass();
+            if (! $parentClassReflection instanceof ClassReflection) {
+                return null;
+            }
+
+            // PHPUnit itself has no asserting test methods, no need to parse its huge classes
+            if ($parentClassReflection->getName() === PHPUnitClassName::TEST_CASE) {
+                return null;
+            }
+
+            return $parentClassReflection->getName();
         }
 
+        $objectType = $call instanceof MethodCall
+            ? $this->nodeTypeResolver->getType($call->var)
+            : $this->nodeTypeResolver->getType($call->class);
+
         if (! $objectType instanceof TypeWithClassName) {
             return null;
         }
 
-        $methodName = $this->nodeNameResolver->getName($call->name);
-        if ($methodName === null) {
+        return $objectType->getClassName();
+    }
+
+    private function resolveClassReflection(Node $node): ?ClassReflection
+    {
+        $scope = $node->getAttribute(AttributeKey::SCOPE);
+        if (! $scope instanceof Scope) {
             return null;
         }
 
-        return $this->astResolver->resolveClassMethod($objectType->getClassName(), $methodName);
+        return $scope->getClassReflection();
     }
 }