Improve InstantiationRule

Author: ondrejmirtes

src/Rules/Classes/InstantiationRule.php

@@ -10,6 +10,8 @@
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Internal\SprintfHelper;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\Dummy\DummyConstructorReflection;
+use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
@@ -94,7 +96,7 @@ private function checkClassName(string $class, bool $isName, Node $node, Scope $
 					&& $constructor instanceof PhpMethodReflection
 					&& !$constructor->isFinal()->yes()
 					&& !$constructor->getPrototype()->isAbstract()
-					&& !$constructor->getDeclaringClass()->hasConsistentConstructor()
+					&& $this->findConsistentParentConstructor($classReflection) === null
 				) {
 					return [];
 				}
@@ -310,4 +312,22 @@ private function getClassNames(Node $node, Scope $scope): array
 		);
 	}
 
+	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/InstantiationRuleTest.php

@@ -569,6 +569,10 @@ public function testNewStaticWithConsistentConstructor(): void
 				'Parameter #1 $i of class InstantiationNewStaticConsistentConstructor\Foo constructor expects int, string given.',
 				18,
 			],
+			[
+				'Parameter #1 $value of class InstantiationNewStaticConsistentConstructor\ChildClass3 constructor expects string, int given.',
+				38,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Classes/data/instantiation-new-static-consistent-constructor.php

@@ -19,3 +19,22 @@ public function doFoo(): void
 	}
 
 }
+
+class BaseClass {
+	public function __construct(protected string $value) {
+	}
+}
+
+/**
+ * @phpstan-consistent-constructor
+ */
+class ChildClass2 extends BaseClass
+{
+
+}
+
+class ChildClass3 extends ChildClass2 {
+	public function fromInt(int $value): static {
+		return new static($value);
+	}
+}