Refactoring - extract ConsistentConstructorHelper

ondrejmirtes · ondrejmirtes · commit 8c38bbc3ddae · 2025-09-10T11:37:39.000+02:00
diff --git a/src/Rules/Classes/ConsistentConstructorHelper.php b/src/Rules/Classes/ConsistentConstructorHelper.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Classes;
+
+use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\Dummy\DummyConstructorReflection;
+use PHPStan\Reflection\ExtendedMethodReflection;
+
+#[AutowiredService]
+final class ConsistentConstructorHelper
+{
+
+	public function findConsistentConstructor(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->findConsistentConstructor($parent);
+	}
+
+}
diff --git a/src/Rules/Classes/InstantiationRule.php b/src/Rules/Classes/InstantiationRule.php
@@ -10,8 +10,6 @@
 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;
@@ -45,6 +43,7 @@ public function __construct(
 		private ReflectionProvider $reflectionProvider,
 		private FunctionCallParametersCheck $check,
 		private ClassNameCheck $classCheck,
+		private ConsistentConstructorHelper $consistentConstructorHelper,
 		#[AutowiredParameter(ref: '%tips.discoveringSymbols%')]
 		private bool $discoveringSymbolsTip,
 	)
@@ -96,7 +95,7 @@ private function checkClassName(string $class, bool $isName, Node $node, Scope $
 					&& $constructor instanceof PhpMethodReflection
 					&& !$constructor->isFinal()->yes()
 					&& !$constructor->getPrototype()->isAbstract()
-					&& $this->findConsistentParentConstructor($classReflection) === null
+					&& $this->consistentConstructorHelper->findConsistentConstructor($classReflection) === null
 				) {
 					return [];
 				}
@@ -312,22 +311,4 @@ 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);
-	}
-
 }
diff --git a/src/Rules/Classes/NewStaticRule.php b/src/Rules/Classes/NewStaticRule.php
@@ -6,9 +6,6 @@
 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;
@@ -24,6 +21,7 @@ final class NewStaticRule implements Rule
 
 	public function __construct(
 		private PhpVersion $phpVersion,
+		private ConsistentConstructorHelper $consistentConstructorHelper,
 	)
 	{
 	}
@@ -58,7 +56,8 @@ 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()) {
+		$consistentConstructor = $this->consistentConstructorHelper->findConsistentConstructor($classReflection);
+		if ($consistentConstructor !== null) {
 			return [];
 		}
 		if (!$classReflection->hasConstructor()) {
@@ -80,14 +79,6 @@ 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()) {
@@ -111,22 +102,4 @@ 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);
-	}
-
 }
diff --git a/src/Rules/Methods/ConsistentConstructorRule.php b/src/Rules/Methods/ConsistentConstructorRule.php
@@ -6,9 +6,7 @@
 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\Classes\ConsistentConstructorHelper;
 use PHPStan\Rules\Rule;
 use function array_merge;
 use function strtolower;
@@ -19,6 +17,7 @@ final class ConsistentConstructorRule implements Rule
 {
 
 	public function __construct(
+		private ConsistentConstructorHelper $consistentConstructorHelper,
 		private MethodParameterComparisonHelper $methodParameterComparisonHelper,
 		private MethodVisibilityComparisonHelper $methodVisibilityComparisonHelper,
 	)
@@ -42,7 +41,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$parentConstructor = $this->findConsistentParentConstructor($parent);
+		$parentConstructor = $this->consistentConstructorHelper->findConsistentConstructor($parent);
 		if ($parentConstructor === null) {
 			return [];
 		}
@@ -53,22 +52,4 @@ 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);
-	}
-
 }
diff --git a/tests/PHPStan/Rules/Classes/ForbiddenNameCheckExtensionRuleTest.php b/tests/PHPStan/Rules/Classes/ForbiddenNameCheckExtensionRuleTest.php
@@ -33,6 +33,7 @@ protected function getRule(): Rule
 				$reflectionProvider,
 				self::getContainer(),
 			),
+			new ConsistentConstructorHelper(),
 			true,
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php
@@ -33,6 +33,7 @@ protected function getRule(): Rule
 				$reflectionProvider,
 				self::getContainer(),
 			),
+			new ConsistentConstructorHelper(),
 			true,
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/NewStaticRuleTest.php b/tests/PHPStan/Rules/Classes/NewStaticRuleTest.php
@@ -17,6 +17,7 @@ protected function getRule(): Rule
 	{
 		return new NewStaticRule(
 			new PhpVersion(PHP_VERSION_ID),
+			new ConsistentConstructorHelper(),
 		);
 	}
 
diff --git a/tests/PHPStan/Rules/Methods/ConsistentConstructorRuleTest.php b/tests/PHPStan/Rules/Methods/ConsistentConstructorRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Methods;
 
+use PHPStan\Rules\Classes\ConsistentConstructorHelper;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use function sprintf;
@@ -13,6 +14,7 @@ class ConsistentConstructorRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new ConsistentConstructorRule(
+			new ConsistentConstructorHelper(),
 			self::getContainer()->getByType(MethodParameterComparisonHelper::class),
 			self::getContainer()->getByType(MethodVisibilityComparisonHelper::class),
 		);

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ protected function getRule(): Rule`
`33`	`33`	`$reflectionProvider,`
`34`	`34`	`self::getContainer(),`
`35`	`35`	`),`
	`36`	`+ new ConsistentConstructorHelper(),`
`36`	`37`	`true,`
`37`	`38`	`);`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ protected function getRule(): Rule`
`17`	`17`	`{`
`18`	`18`	`return new NewStaticRule(`
`19`	`19`	`new PhpVersion(PHP_VERSION_ID),`
	`20`	`+ new ConsistentConstructorHelper(),`
`20`	`21`	`);`
`21`	`22`	`}`
`22`	`23`