Fix NewStaticRule when there's @phpstan-consistent-constructor but constructor implementation is in a parent

Author: ondrejmirtes

src/Rules/Classes/NewStaticRule.php

@@ -6,6 +6,9 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Php\PhpVersion;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\Dummy\DummyConstructorReflection;
+use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -55,11 +58,10 @@ public function processNode(Node $node, Scope $scope): array
 				->tip('See: https://phpstan.org/blog/solving-phpstan-error-unsafe-usage-of-new-static')
 				->build(),
 		];
+		if ($classReflection->hasConsistentConstructor()) {
+			return [];
+		}
 		if (!$classReflection->hasConstructor()) {
-			if ($classReflection->hasConsistentConstructor()) {
-				return [];
-			}
-
 			return $messages;
 		}
 
@@ -68,10 +70,6 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($constructor->getDeclaringClass()->hasConsistentConstructor()) {
-			return [];
-		}
-
 		foreach ($classReflection->getImmediateInterfaces() as $interface) {
 			if ($interface->hasConstructor()) {
 				return [];
@@ -82,6 +80,14 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
+		$parent = $classReflection->getParentClass();
+		if ($parent !== null) {
+			$parentConstructor = $this->findConsistentParentConstructor($parent);
+			if ($parentConstructor !== null) {
+				return [];
+			}
+		}
+
 		if ($constructor instanceof PhpMethodReflection) {
 			$prototype = $constructor->getPrototype();
 			if ($prototype->isAbstract()) {
@@ -105,4 +111,22 @@ public function processNode(Node $node, Scope $scope): array
 		return $messages;
 	}
 
+	private function findConsistentParentConstructor(ClassReflection $classReflection): ?ExtendedMethodReflection
+	{
+		if ($classReflection->hasConsistentConstructor()) {
+			if ($classReflection->hasConstructor()) {
+				return $classReflection->getConstructor();
+			}
+
+			return new DummyConstructorReflection($classReflection);
+		}
+
+		$parent = $classReflection->getParentClass();
+		if ($parent === null) {
+			return null;
+		}
+
+		return $this->findConsistentParentConstructor($parent);
+	}
+
 }

tests/PHPStan/Rules/Classes/NewStaticRuleTest.php

@@ -67,4 +67,9 @@ public function testBug11316(): void
 		$this->analyse([__DIR__ . '/data/bug-11316.php'], []);
 	}
 
+	public function testBug10722(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-10722.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Classes/data/bug-10722.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Bug10722;
+
+class BaseClass {
+	public function __construct(protected string $value) {
+	}
+}
+
+/**
+ * @phpstan-consistent-constructor
+ */
+class ChildClass extends BaseClass {
+	public function fromString(string $value): static {
+		return new static($value);
+	}
+}
+
+/**
+ * @phpstan-consistent-constructor
+ */
+class ChildClass2 extends BaseClass {
+
+}
+
+class ChildClass3 extends ChildClass2 {
+	public function fromString(string $value): static {
+		return new static($value);
+	}
+}