use constructor arg

Author: staabm

src/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRule.php

@@ -4,7 +4,6 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\FunctionReturnStatementsNode;
 use PHPStan\Rules\Rule;
@@ -19,8 +18,6 @@ final class TooWideFunctionReturnTypehintRule implements Rule
 
 	public function __construct(
 		private TooWideTypeCheck $check,
-		#[AutowiredParameter(ref: '%featureToggles.reportTooWideBool%')]
-		private bool $reportTooWideBool,
 	)
 	{
 	}
@@ -43,7 +40,6 @@ public function processNode(Node $node, Scope $scope): array
 				$function->getName(),
 			),
 			false,
-			$this->reportTooWideBool,
 		);
 	}
 

src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php

@@ -21,8 +21,6 @@ public function __construct(
 		#[AutowiredParameter(ref: '%checkTooWideReturnTypesInProtectedAndPublicMethods%')]
 		private bool $checkProtectedAndPublicMethods,
 		private TooWideTypeCheck $check,
-		#[AutowiredParameter(ref: '%featureToggles.reportTooWideBool%')]
-		private bool $reportTooWideBool,
 	)
 	{
 	}
@@ -61,7 +59,6 @@ public function processNode(Node $node, Scope $scope): array
 				$method->getName(),
 			),
 			!$isFirstDeclaration && !$method->isPrivate(),
-			$this->reportTooWideBool,
 		);
 	}
 

src/Rules/TooWideTypehints/TooWideTypeCheck.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\TooWideTypehints;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\ClassPropertyNode;
 use PHPStan\Node\FunctionReturnStatementsNode;
@@ -21,6 +22,13 @@
 final class TooWideTypeCheck
 {
 
+	public function __construct(
+		#[AutowiredParameter(ref: '%featureToggles.reportTooWideBool%')]
+		private bool $reportTooWideBool,
+	)
+	{
+	}
+
 	/**
 	 * @return list<IdentifierRuleError>
 	 */
@@ -66,13 +74,12 @@ public function checkFunction(
 		Type $functionReturnType,
 		string $functionDescription,
 		bool $checkDescendantClass,
-		bool $reportTooWideBool,
 	): array
 	{
 		$functionReturnType = TypeUtils::resolveLateResolvableTypes($functionReturnType);
 
 		if (!$functionReturnType instanceof UnionType) {
-			if (!$functionReturnType->isBoolean()->yes() || !$reportTooWideBool) {
+			if (!$functionReturnType->isBoolean()->yes() || !$this->reportTooWideBool) {
 				return [];
 			}
 		}

tests/PHPStan/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRuleTest.php

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

tests/PHPStan/Rules/TooWideTypehints/TooWideClosureReturnTypehintRuleTest.php

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

tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php

@@ -15,7 +15,7 @@ class TooWideFunctionReturnTypehintRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new TooWideFunctionReturnTypehintRule(new TooWideTypeCheck(), $this->reportTooWideBool);
+		return new TooWideFunctionReturnTypehintRule(new TooWideTypeCheck($this->reportTooWideBool));
 	}
 
 	public function testRule(): void

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodReturnTypehintRuleTest.php

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

tests/PHPStan/Rules/TooWideTypehints/TooWidePropertyTypeRuleTest.php

@@ -21,7 +21,7 @@ protected function getRule(): Rule
 		return new TooWidePropertyTypeRule(
 			new DirectReadWritePropertiesExtensionProvider([]),
 			new PropertyReflectionFinder(),
-			new TooWideTypeCheck(),
+			new TooWideTypeCheck($this->reportTooWideBool),
 			$this->reportTooWideBool,
 		);
 	}