Fix ConsistentConstructorRule

Author: ondrejmirtes

src/Rules/Methods/ConsistentConstructorRule.php

@@ -6,7 +6,9 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\InClassMethodNode;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\Dummy\DummyConstructorReflection;
+use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Rules\Rule;
 use function array_merge;
 use function strtolower;
@@ -36,18 +38,12 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$parent = $method->getDeclaringClass()->getParentClass();
-
 		if ($parent === null) {
 			return [];
 		}
 
-		if ($parent->hasConstructor()) {
-			$parentConstructor = $parent->getConstructor();
-		} else {
-			$parentConstructor = new DummyConstructorReflection($parent);
-		}
-
-		if (! $parentConstructor->getDeclaringClass()->hasConsistentConstructor()) {
+		$parentConstructor = $this->findConsistentParentConstructor($parent);
+		if ($parentConstructor === null) {
 			return [];
 		}
 
@@ -57,4 +53,22 @@ public function processNode(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/Methods/ConsistentConstructorRuleTest.php

@@ -37,6 +37,10 @@ public function testRule(): void
 				'Method ConsistentConstructor\FakeConnection::__construct() overrides method ConsistentConstructor\Connection::__construct() but misses parameter #1 $i.',
 				78,
 			],
+			[
+				'Parameter #1 $i of method ConsistentConstructor\ChildTwo::__construct() is not optional.',
+				102,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Methods/data/consistent-constructor.php

@@ -80,3 +80,28 @@ public function __construct()
 	}
 }
 
+class ParentOne
+{
+	public function __construct()
+	{
+
+	}
+}
+
+/**
+ * @phpstan-consistent-constructor
+ */
+class ChildOne extends ParentOne
+{
+
+}
+
+class ChildTwo extends ChildOne
+{
+
+	public function __construct(int $i)
+	{
+
+	}
+
+}