Missing typehints should be consistently checked on level 6

ondrejmirtes · ondrejmirtes · commit e3e80f6c9c24 · 2024-09-09T09:50:38.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -919,17 +919,20 @@ services:
 		class: PHPStan\Rules\Classes\MethodTagCheck
 		arguments:
 			checkClassCaseSensitivity: %checkClassCaseSensitivity%
+			checkMissingTypehints: %checkMissingTypehints%
 
 	-
 		class: PHPStan\Rules\Classes\MixinCheck
 		arguments:
 			checkClassCaseSensitivity: %checkClassCaseSensitivity%
 			absentTypeChecks: %featureToggles.absentTypeChecks%
+			checkMissingTypehints: %checkMissingTypehints%
 
 	-
 		class: PHPStan\Rules\Classes\PropertyTagCheck
 		arguments:
 			checkClassCaseSensitivity: %checkClassCaseSensitivity%
+			checkMissingTypehints: %checkMissingTypehints%
 
 	-
 		class: PHPStan\Rules\Comparison\ConstantConditionRuleHelper
diff --git a/src/PhpDoc/StubValidator.php b/src/PhpDoc/StubValidator.php
@@ -251,12 +251,12 @@ private function getRuleRegistry(Container $container): RuleRegistry
 		if ((bool) $container->getParameter('featureToggles')['absentTypeChecks']) {
 			$rules[] = new MissingMethodSelfOutTypeRule($missingTypehintCheck);
 
-			$methodTagCheck = new MethodTagCheck($reflectionProvider, $classNameCheck, $genericObjectTypeCheck, $missingTypehintCheck, $unresolvableTypeHelper, true);
+			$methodTagCheck = new MethodTagCheck($reflectionProvider, $classNameCheck, $genericObjectTypeCheck, $missingTypehintCheck, $unresolvableTypeHelper, true, true);
 			$rules[] = new MethodTagRule($methodTagCheck);
 			$rules[] = new MethodTagTraitRule($methodTagCheck, $reflectionProvider);
 			$rules[] = new MethodTagTraitUseRule($methodTagCheck);
 
-			$propertyTagCheck = new PropertyTagCheck($reflectionProvider, $classNameCheck, $genericObjectTypeCheck, $missingTypehintCheck, $unresolvableTypeHelper, true);
+			$propertyTagCheck = new PropertyTagCheck($reflectionProvider, $classNameCheck, $genericObjectTypeCheck, $missingTypehintCheck, $unresolvableTypeHelper, true, true);
 			$rules[] = new PropertyTagRule($propertyTagCheck);
 			$rules[] = new PropertyTagTraitRule($propertyTagCheck, $reflectionProvider);
 			$rules[] = new PropertyTagTraitUseRule($propertyTagCheck);
diff --git a/src/Rules/Classes/MethodTagCheck.php b/src/Rules/Classes/MethodTagCheck.php
@@ -29,6 +29,7 @@ public function __construct(
 		private MissingTypehintCheck $missingTypehintCheck,
 		private UnresolvableTypeHelper $unresolvableTypeHelper,
 		private bool $checkClassCaseSensitivity,
+		private bool $checkMissingTypehints,
 	)
 	{
 	}
@@ -161,6 +162,10 @@ public function checkInTraitUseContext(
 	 */
 	private function checkMethodTypeInTraitDefinitionContext(ClassReflection $classReflection, string $methodName, string $description, Type $type): array
 	{
+		if (!$this->checkMissingTypehints) {
+			return [];
+		}
+
 		$errors = [];
 		foreach ($this->missingTypehintCheck->getNonGenericObjectTypesWithGenericClass($type) as [$innerName, $genericTypeNames]) {
 			$errors[] = RuleErrorBuilder::message(sprintf(
diff --git a/src/Rules/Classes/MixinCheck.php b/src/Rules/Classes/MixinCheck.php
@@ -28,6 +28,7 @@ public function __construct(
 		private UnresolvableTypeHelper $unresolvableTypeHelper,
 		private bool $checkClassCaseSensitivity,
 		private bool $absentTypeChecks,
+		private bool $checkMissingTypehints,
 	)
 	{
 	}
@@ -68,6 +69,10 @@ public function checkInTraitDefinitionContext(ClassReflection $classReflection):
 				continue;
 			}
 
+			if (!$this->checkMissingTypehints) {
+				continue;
+			}
+
 			foreach ($this->missingTypehintCheck->getIterableTypesWithMissingValueTypehint($type) as $iterableType) {
 				$iterableTypeDescription = $iterableType->describe(VerbosityLevel::typeOnly());
 				$errors[] = RuleErrorBuilder::message(sprintf(
diff --git a/src/Rules/Classes/PropertyTagCheck.php b/src/Rules/Classes/PropertyTagCheck.php
@@ -31,6 +31,7 @@ public function __construct(
 		private MissingTypehintCheck $missingTypehintCheck,
 		private UnresolvableTypeHelper $unresolvableTypeHelper,
 		private bool $checkClassCaseSensitivity,
+		private bool $checkMissingTypehints,
 	)
 	{
 	}
@@ -141,6 +142,10 @@ private function getTypesAndTagName(PropertyTag $propertyTag): array
 	 */
 	private function checkPropertyTypeInTraitDefinitionContext(ClassReflection $classReflection, string $propertyName, string $tagName, Type $type): array
 	{
+		if (!$this->checkMissingTypehints) {
+			return [];
+		}
+
 		$errors = [];
 
 		foreach ($this->missingTypehintCheck->getNonGenericObjectTypesWithGenericClass($type) as [$innerName, $genericTypeNames]) {
diff --git a/tests/PHPStan/Rules/Classes/MethodTagRuleTest.php b/tests/PHPStan/Rules/Classes/MethodTagRuleTest.php
@@ -32,6 +32,7 @@ protected function getRule(): TRule
 				new MissingTypehintCheck(true, true, true, true, []),
 				new UnresolvableTypeHelper(),
 				true,
+				true,
 			),
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/MethodTagTraitRuleTest.php b/tests/PHPStan/Rules/Classes/MethodTagTraitRuleTest.php
@@ -32,6 +32,7 @@ protected function getRule(): TRule
 				new MissingTypehintCheck(true, true, true, true, []),
 				new UnresolvableTypeHelper(),
 				true,
+				true,
 			),
 			$reflectionProvider,
 		);
diff --git a/tests/PHPStan/Rules/Classes/MethodTagTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/MethodTagTraitUseRuleTest.php
@@ -33,6 +33,7 @@ protected function getRule(): TRule
 				new MissingTypehintCheck(true, true, true, true, []),
 				new UnresolvableTypeHelper(),
 				true,
+				true,
 			),
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/MixinRuleTest.php b/tests/PHPStan/Rules/Classes/MixinRuleTest.php
@@ -34,6 +34,7 @@ protected function getRule(): Rule
 				new UnresolvableTypeHelper(),
 				true,
 				true,
+				true,
 			),
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/MixinTraitRuleTest.php b/tests/PHPStan/Rules/Classes/MixinTraitRuleTest.php
@@ -33,6 +33,7 @@ protected function getRule(): Rule
 				new UnresolvableTypeHelper(),
 				true,
 				true,
+				true,
 			),
 			$reflectionProvider,
 		);
diff --git a/tests/PHPStan/Rules/Classes/MixinTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/MixinTraitUseRuleTest.php
@@ -33,6 +33,7 @@ protected function getRule(): Rule
 				new UnresolvableTypeHelper(),
 				true,
 				true,
+				true,
 			),
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/PropertyTagRuleTest.php b/tests/PHPStan/Rules/Classes/PropertyTagRuleTest.php
@@ -32,6 +32,7 @@ protected function getRule(): TRule
 				new MissingTypehintCheck(true, true, true, true, []),
 				new UnresolvableTypeHelper(),
 				true,
+				true,
 			),
 		);
 	}
diff --git a/tests/PHPStan/Rules/Classes/PropertyTagTraitRuleTest.php b/tests/PHPStan/Rules/Classes/PropertyTagTraitRuleTest.php
@@ -32,6 +32,7 @@ protected function getRule(): TRule
 				new MissingTypehintCheck(true, true, true, true, []),
 				new UnresolvableTypeHelper(),
 				true,
+				true,
 			),
 			$reflectionProvider,
 		);
diff --git a/tests/PHPStan/Rules/Classes/PropertyTagTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/PropertyTagTraitUseRuleTest.php
@@ -32,6 +32,7 @@ protected function getRule(): TRule
 				new MissingTypehintCheck(true, true, true, true, []),
 				new UnresolvableTypeHelper(),
 				true,
+				true,
 			),
 		);
 	}

Original file line number	Diff line number	Diff line change
`@@ -919,17 +919,20 @@ services:`
`919`	`919`	`class: PHPStan\Rules\Classes\MethodTagCheck`
`920`	`920`	`arguments:`
`921`	`921`	`checkClassCaseSensitivity: %checkClassCaseSensitivity%`
	`922`	`+ checkMissingTypehints: %checkMissingTypehints%`
`922`	`923`
`923`	`924`	`-`
`924`	`925`	`class: PHPStan\Rules\Classes\MixinCheck`
`925`	`926`	`arguments:`
`926`	`927`	`checkClassCaseSensitivity: %checkClassCaseSensitivity%`
`927`	`928`	`absentTypeChecks: %featureToggles.absentTypeChecks%`
	`929`	`+ checkMissingTypehints: %checkMissingTypehints%`
`928`	`930`
`929`	`931`	`-`
`930`	`932`	`class: PHPStan\Rules\Classes\PropertyTagCheck`
`931`	`933`	`arguments:`
`932`	`934`	`checkClassCaseSensitivity: %checkClassCaseSensitivity%`
	`935`	`+ checkMissingTypehints: %checkMissingTypehints%`
`933`	`936`
`934`	`937`	`-`
`935`	`938`	`class: PHPStan\Rules\Comparison\ConstantConditionRuleHelper`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public function __construct(`
`29`	`29`	`private MissingTypehintCheck $missingTypehintCheck,`
`30`	`30`	`private UnresolvableTypeHelper $unresolvableTypeHelper,`
`31`	`31`	`private bool $checkClassCaseSensitivity,`
	`32`	`+ private bool $checkMissingTypehints,`
`32`	`33`	`)`
`33`	`34`	`{`
`34`	`35`	`}`
`@@ -161,6 +162,10 @@ public function checkInTraitUseContext(`
`161`	`162`	`*/`
`162`	`163`	`private function checkMethodTypeInTraitDefinitionContext(ClassReflection $classReflection, string $methodName, string $description, Type $type): array`
`163`	`164`	`{`
	`165`	`+ if (!$this->checkMissingTypehints) {`
	`166`	`+ return [];`
	`167`	`+ }`
	`168`	`+`
`164`	`169`	`$errors = [];`
`165`	`170`	`foreach ($this->missingTypehintCheck->getNonGenericObjectTypesWithGenericClass($type) as [$innerName, $genericTypeNames]) {`
`166`	`171`	`$errors[] = RuleErrorBuilder::message(sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public function __construct(`
`28`	`28`	`private UnresolvableTypeHelper $unresolvableTypeHelper,`
`29`	`29`	`private bool $checkClassCaseSensitivity,`
`30`	`30`	`private bool $absentTypeChecks,`
	`31`	`+ private bool $checkMissingTypehints,`
`31`	`32`	`)`
`32`	`33`	`{`
`33`	`34`	`}`
`@@ -68,6 +69,10 @@ public function checkInTraitDefinitionContext(ClassReflection $classReflection):`
`68`	`69`	`continue;`
`69`	`70`	`}`
`70`	`71`
	`72`	`+ if (!$this->checkMissingTypehints) {`
	`73`	`+ continue;`
	`74`	`+ }`
	`75`	`+`
`71`	`76`	`foreach ($this->missingTypehintCheck->getIterableTypesWithMissingValueTypehint($type) as $iterableType) {`
`72`	`77`	`$iterableTypeDescription = $iterableType->describe(VerbosityLevel::typeOnly());`
`73`	`78`	`$errors[] = RuleErrorBuilder::message(sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public function __construct(`
`31`	`31`	`private MissingTypehintCheck $missingTypehintCheck,`
`32`	`32`	`private UnresolvableTypeHelper $unresolvableTypeHelper,`
`33`	`33`	`private bool $checkClassCaseSensitivity,`
	`34`	`+ private bool $checkMissingTypehints,`
`34`	`35`	`)`
`35`	`36`	`{`
`36`	`37`	`}`
`@@ -141,6 +142,10 @@ private function getTypesAndTagName(PropertyTag $propertyTag): array`
`141`	`142`	`*/`
`142`	`143`	`private function checkPropertyTypeInTraitDefinitionContext(ClassReflection $classReflection, string $propertyName, string $tagName, Type $type): array`
`143`	`144`	`{`
	`145`	`+ if (!$this->checkMissingTypehints) {`
	`146`	`+ return [];`
	`147`	`+ }`
	`148`	`+`
`144`	`149`	`$errors = [];`
`145`	`150`
`146`	`151`	`foreach ($this->missingTypehintCheck->getNonGenericObjectTypesWithGenericClass($type) as [$innerName, $genericTypeNames]) {`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ protected function getRule(): TRule`
`32`	`32`	`new MissingTypehintCheck(true, true, true, true, []),`
`33`	`33`	`new UnresolvableTypeHelper(),`
`34`	`34`	`true,`
	`35`	`+ true,`
`35`	`36`	`),`
`36`	`37`	`);`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ protected function getRule(): TRule`
`33`	`33`	`new MissingTypehintCheck(true, true, true, true, []),`
`34`	`34`	`new UnresolvableTypeHelper(),`
`35`	`35`	`true,`
	`36`	`+ true,`
`36`	`37`	`),`
`37`	`38`	`);`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ protected function getRule(): Rule`
`34`	`34`	`new UnresolvableTypeHelper(),`
`35`	`35`	`true,`
`36`	`36`	`true,`
	`37`	`+ true,`
`37`	`38`	`),`
`38`	`39`	`);`
`39`	`40`	`}`