extract TooWideReturnTypeCheck->checkProperty()

Author: staabm

src/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRule.php

@@ -17,7 +17,7 @@ final class TooWideArrowFunctionReturnTypehintRule implements Rule
 {
 
 	public function __construct(
-		private TooWideReturnTypeCheck $check,
+		private TooWideTypeCheck $check,
 	)
 	{
 	}

src/Rules/TooWideTypehints/TooWideClosureReturnTypehintRule.php

@@ -19,7 +19,7 @@ final class TooWideClosureReturnTypehintRule implements Rule
 {
 
 	public function __construct(
-		private TooWideReturnTypeCheck $check,
+		private TooWideTypeCheck $check,
 	)
 	{
 	}

src/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRule.php

@@ -17,7 +17,7 @@ final class TooWideFunctionReturnTypehintRule implements Rule
 {
 
 	public function __construct(
-		private TooWideReturnTypeCheck $check,
+		private TooWideTypeCheck $check,
 	)
 	{
 	}

src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php

@@ -20,7 +20,7 @@ final class TooWideMethodReturnTypehintRule implements Rule
 	public function __construct(
 		#[AutowiredParameter(ref: '%checkTooWideReturnTypesInProtectedAndPublicMethods%')]
 		private bool $checkProtectedAndPublicMethods,
-		private TooWideReturnTypeCheck $check,
+		private TooWideTypeCheck $check,
 	)
 	{
 	}

src/Rules/TooWideTypehints/TooWidePropertyTypeRule.php

@@ -10,11 +10,8 @@
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
 use PHPStan\Rules\Rule;
-use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\NullType;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
-use PHPStan\Type\VerbosityLevel;
 use function count;
 use function sprintf;
 
@@ -28,6 +25,7 @@ final class TooWidePropertyTypeRule implements Rule
 	public function __construct(
 		private ReadWritePropertiesExtensionProvider $extensionProvider,
 		private PropertyReflectionFinder $propertyReflectionFinder,
+		private TooWideTypeCheck $check,
 	)
 	{
 	}
@@ -100,27 +98,9 @@ public function processNode(Node $node, Scope $scope): array
 
 			$assignedType = TypeCombinator::union(...$assignedTypes);
 			$propertyDescription = $this->describePropertyByName($propertyReflection, $propertyName);
-			$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($propertyType, $assignedType);
-			foreach ($propertyType->getTypes() as $type) {
-				if (!$type->isSuperTypeOf($assignedType)->no()) {
-					continue;
-				}
-
-				if ($property->getNativeType() === null && (new NullType())->isSuperTypeOf($type)->yes()) {
-					continue;
-				}
-
-				$errors[] = RuleErrorBuilder::message(sprintf(
-					'%s (%s) is never assigned %s so it can be removed from the property type.',
-					$propertyDescription,
-					$propertyType->describe($verbosityLevel),
-					$type->describe($verbosityLevel),
-				))
-					->identifier('property.unusedType')
-					->line($property->getStartLine())
-					->build();
+			foreach ($this->check->checkProperty($property, $propertyType, $propertyDescription, $assignedType) as $error) {
+				$errors[] = $error;
 			}
-
 		}
 		return $errors;
 	}

src/Rules/TooWideTypehints/TooWideReturnTypeCheck.php renamed to src/Rules/TooWideTypehints/TooWideTypeCheck.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Rules\TooWideTypehints;
 
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Node\ClassPropertyNode;
 use PHPStan\Node\FunctionReturnStatementsNode;
 use PHPStan\Node\MethodReturnStatementsNode;
 use PHPStan\Rules\IdentifierRuleError;
@@ -17,12 +18,48 @@
 use function sprintf;
 
 #[AutowiredService]
-final class TooWideReturnTypeCheck
+final class TooWideTypeCheck
 {
 
 	/**
 	 * @return list<IdentifierRuleError>
 	 */
+	public function checkProperty(
+		ClassPropertyNode $property,
+		UnionType $propertyType,
+		string $propertyDescription,
+		Type $assignedType,
+	): array
+	{
+		$errors = [];
+
+		$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($propertyType, $assignedType);
+		foreach ($propertyType->getTypes() as $type) {
+			if (!$type->isSuperTypeOf($assignedType)->no()) {
+				continue;
+			}
+
+			if ($property->getNativeType() === null && $type->isNull()->yes()) {
+				continue;
+			}
+
+			$errors[] = RuleErrorBuilder::message(sprintf(
+				'%s (%s) is never assigned %s so it can be removed from the property type.',
+				$propertyDescription,
+				$propertyType->describe($verbosityLevel),
+				$type->describe($verbosityLevel),
+			))
+				->identifier('property.unusedType')
+				->line($property->getStartLine())
+				->build();
+		}
+
+		return $errors;
+	}
+
+		/**
+		 * @return list<IdentifierRuleError>
+		 */
 	public function checkFunction(
 		MethodReturnStatementsNode|FunctionReturnStatementsNode $node,
 		Type $functionReturnType,

tests/PHPStan/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRuleTest.php

@@ -14,7 +14,7 @@ class TooWideArrowFunctionReturnTypehintRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new TooWideArrowFunctionReturnTypehintRule(
-			new TooWideReturnTypeCheck(),
+			new TooWideTypeCheck(),
 		);
 	}
 

tests/PHPStan/Rules/TooWideTypehints/TooWideClosureReturnTypehintRuleTest.php

@@ -14,7 +14,7 @@ class TooWideClosureReturnTypehintRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new TooWideClosureReturnTypehintRule(
-			new TooWideReturnTypeCheck(),
+			new TooWideTypeCheck(),
 		);
 	}
 

tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php

@@ -13,7 +13,7 @@ class TooWideFunctionReturnTypehintRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new TooWideFunctionReturnTypehintRule(new TooWideReturnTypeCheck());
+		return new TooWideFunctionReturnTypehintRule(new TooWideTypeCheck());
 	}
 
 	public function testRule(): void

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodReturnTypehintRuleTest.php

@@ -17,7 +17,7 @@ class TooWideMethodReturnTypehintRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new TooWideMethodReturnTypehintRule($this->checkProtectedAndPublicMethods, new TooWideReturnTypeCheck());
+		return new TooWideMethodReturnTypehintRule($this->checkProtectedAndPublicMethods, new TooWideTypeCheck());
 	}
 
 	public function testPrivate(): void