Extract TooWideReturnTypeCheck

Author: staabm

src/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRule.php

@@ -7,10 +7,7 @@
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\InArrowFunctionNode;
 use PHPStan\Rules\Rule;
-use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\UnionType;
-use PHPStan\Type\VerbosityLevel;
-use function sprintf;
 
 /**
  * @implements Rule<InArrowFunctionNode>
@@ -19,6 +16,12 @@
 final class TooWideArrowFunctionReturnTypehintRule implements Rule
 {
 
+	public function __construct(
+		private TooWideReturnTypeCheck $check,
+	)
+	{
+	}
+
 	public function getNodeType(): string
 	{
 		return InArrowFunctionNode::class;
@@ -41,23 +44,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$returnType = $scope->getType($expr);
-		if ($returnType->isNull()->yes()) {
-			return [];
-		}
-		$messages = [];
-		foreach ($functionReturnType->getTypes() as $type) {
-			if (!$type->isSuperTypeOf($returnType)->no()) {
-				continue;
-			}
-
-			$messages[] = RuleErrorBuilder::message(sprintf(
-				'Anonymous function never returns %s so it can be removed from the return type.',
-				$type->describe(VerbosityLevel::getRecommendedLevelByType($type)),
-			))->identifier('return.unusedType')->build();
-		}
-
-		return $messages;
+		return $this->check->checkAnonymousFunction($scope->getType($expr), $functionReturnType);
 	}
 
 }

src/Rules/TooWideTypehints/TooWideClosureReturnTypehintRule.php

@@ -7,12 +7,9 @@
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\ClosureReturnStatementsNode;
 use PHPStan\Rules\Rule;
-use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
-use PHPStan\Type\VerbosityLevel;
 use function count;
-use function sprintf;
 
 /**
  * @implements Rule<ClosureReturnStatementsNode>
@@ -21,6 +18,12 @@
 final class TooWideClosureReturnTypehintRule implements Rule
 {
 
+	public function __construct(
+		private TooWideReturnTypeCheck $check,
+	)
+	{
+	}
+
 	public function getNodeType(): string
 	{
 		return ClosureReturnStatementsNode::class;
@@ -62,24 +65,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$returnType = TypeCombinator::union(...$returnTypes);
-		if ($returnType->isNull()->yes()) {
-			return [];
-		}
-
-		$messages = [];
-		foreach ($closureReturnType->getTypes() as $type) {
-			if (!$type->isSuperTypeOf($returnType)->no()) {
-				continue;
-			}
-
-			$messages[] = RuleErrorBuilder::message(sprintf(
-				'Anonymous function never returns %s so it can be removed from the return type.',
-				$type->describe(VerbosityLevel::getRecommendedLevelByType($type)),
-			))->identifier('return.unusedType')->build();
-		}
-
-		return $messages;
+		return $this->check->checkAnonymousFunction(TypeCombinator::union(...$returnTypes), $closureReturnType);
 	}
 
 }

src/Rules/TooWideTypehints/TooWideReturnTypeCheck.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\TooWideTypehints;
+
+use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Rules\IdentifierRuleError;
+use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\Type;
+use PHPStan\Type\UnionType;
+use PHPStan\Type\VerbosityLevel;
+use function sprintf;
+
+#[AutowiredService]
+final class TooWideReturnTypeCheck
+{
+
+	/**
+	 * @return list<IdentifierRuleError>
+	 */
+	public function checkAnonymousFunction(
+		Type $returnType,
+		UnionType $functionReturnType,
+	): array
+	{
+		if ($returnType->isNull()->yes()) {
+			return [];
+		}
+		$messages = [];
+		foreach ($functionReturnType->getTypes() as $type) {
+			if (!$type->isSuperTypeOf($returnType)->no()) {
+				continue;
+			}
+
+			$messages[] = RuleErrorBuilder::message(sprintf(
+				'%s never returns %s so it can be removed from the return type.',
+				'Anonymous function',
+				$type->describe(VerbosityLevel::getRecommendedLevelByType($type)),
+			))->identifier('return.unusedType')->build();
+		}
+
+		return $messages;
+	}
+
+}

tests/PHPStan/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRuleTest.php

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

tests/PHPStan/Rules/TooWideTypehints/TooWideClosureReturnTypehintRuleTest.php

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