Bail out earlier on #[Override]

- `SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification`:
do not report missing native type hint when method has `#[Override]` attribute.

- `SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint`:
do not report missing native type hint when method has `#[Override]` attribute.

This time I took a more holistic approach and search for occurrences of
`DocCommentHelper::hasInheritdocAnnotation`, and checked if there was a
similar check for the override attribute.

Author: greg0ire

SlevomatCodingStandard/Sniffs/TypeHints/ParameterTypeHintSniff.php

@@ -111,10 +111,6 @@ public function process(File $phpcsFile, int $functionPointer): void
 			return;
 		}
 
-		if (DocCommentHelper::hasInheritdocAnnotation($phpcsFile, $functionPointer)) {
-			return;
-		}
-
 		$parametersTypeHints = FunctionHelper::getParametersTypeHints($phpcsFile, $functionPointer);
 		$parametersAnnotations = FunctionHelper::getValidParametersAnnotations($phpcsFile, $functionPointer);
 		$prefixedParametersAnnotations = FunctionHelper::getValidPrefixedParametersAnnotations($phpcsFile, $functionPointer);
@@ -143,6 +139,9 @@ private function checkTypeHints(
 		array $prefixedParametersAnnotations
 	): void
 	{
+		$isInherited = AttributeHelper::hasAttribute($phpcsFile, $functionPointer, '\Override')
+			|| DocCommentHelper::hasInheritdocAnnotation($phpcsFile, $functionPointer);
+
 		$suppressNameAnyTypeHint = self::getSniffName(self::CODE_MISSING_ANY_TYPE_HINT);
 		$isSuppressedAnyTypeHint = SuppressHelper::isSniffSuppressed($phpcsFile, $functionPointer, $suppressNameAnyTypeHint);
 
@@ -192,6 +191,10 @@ private function checkTypeHints(
 					continue;
 				}
 
+				if ($isInherited) {
+					continue;
+				}
+
 				$phpcsFile->addError(
 					sprintf(
 						'%s %s() does not have parameter type hint nor @param annotation for its parameter %s.',
@@ -206,10 +209,6 @@ private function checkTypeHints(
 				continue;
 			}
 
-			if (AttributeHelper::hasAttribute($phpcsFile, $functionPointer, '\Override')) {
-				continue;
-			}
-
 			$parameterTypeNode = $parametersAnnotations[$parameterName]->getValue()->type;
 
 			if (
@@ -363,6 +362,10 @@ private function checkTypeHints(
 				continue;
 			}
 
+			if ($isInherited) {
+				continue;
+			}
+
 			$fix = $phpcsFile->addFixableError(
 				sprintf(
 					'%s %s() does not have native type hint for its parameter %s but it should be possible to add it based on @param annotation "%s".',
@@ -456,6 +459,9 @@ private function checkTraversableTypeHintSpecification(
 		array $prefixedParametersAnnotations
 	): void
 	{
+		$isInherited = AttributeHelper::hasAttribute($phpcsFile, $functionPointer, '\Override')
+			|| DocCommentHelper::hasInheritdocAnnotation($phpcsFile, $functionPointer);
+
 		$suppressName = self::getSniffName(self::CODE_MISSING_TRAVERSABLE_TYPE_HINT_SPECIFICATION);
 		$isSniffSuppressed = SuppressHelper::isSniffSuppressed($phpcsFile, $functionPointer, $suppressName);
 		$suppressUseless = true;
@@ -490,7 +496,7 @@ private function checkTraversableTypeHintSpecification(
 			if ($hasTraversableTypeHint && !array_key_exists($parameterName, $parametersAnnotations)) {
 				$suppressUseless = false;
 
-				if (!$isSniffSuppressed) {
+				if (!$isSniffSuppressed && !$isInherited) {
 					$phpcsFile->addError(
 						sprintf(
 							'%s %s() does not have @param annotation for its traversable parameter %s.',
@@ -538,7 +544,7 @@ private function checkTraversableTypeHintSpecification(
 
 			$suppressUseless = false;
 
-			if ($isSniffSuppressed) {
+			if ($isSniffSuppressed || $isInherited) {
 				continue;
 			}
 

SlevomatCodingStandard/Sniffs/TypeHints/PropertyTypeHintSniff.php

@@ -184,6 +184,8 @@ private function checkTypeHint(
 		array $prefixedPropertyAnnotations
 	): void
 	{
+		$isInherited = AttributeHelper::hasAttribute($phpcsFile, $propertyPointer, '\Override');
+
 		$suppressNameAnyTypeHint = $this->getSniffName(self::CODE_MISSING_ANY_TYPE_HINT);
 		$isSuppressedAnyTypeHint = SuppressHelper::isSniffSuppressed($phpcsFile, $propertyPointer, $suppressNameAnyTypeHint);
 
@@ -204,7 +206,7 @@ private function checkTypeHint(
 
 			if (
 				!$isSuppressedAnyTypeHint
-				&& !AttributeHelper::hasAttribute($phpcsFile, $propertyPointer, '\Override')
+				&& !$isInherited
 			) {
 				$phpcsFile->addError(
 					sprintf(
@@ -225,10 +227,6 @@ private function checkTypeHint(
 			return;
 		}
 
-		if (AttributeHelper::hasAttribute($phpcsFile, $propertyPointer, '\Override')) {
-			return;
-		}
-
 		$typeNode = $propertyAnnotation->getValue()->type;
 		$originalTypeNode = $typeNode;
 		if ($typeNode instanceof NullableTypeNode) {
@@ -365,7 +363,7 @@ private function checkTypeHint(
 			$nullableTypeHint = true;
 		}
 
-		if ($isSuppressedNativeTypeHint) {
+		if ($isSuppressedNativeTypeHint || $isInherited) {
 			return;
 		}
 
@@ -429,6 +427,8 @@ private function checkTraversableTypeHintSpecification(
 		array $prefixedPropertyAnnotations
 	): void
 	{
+		$isInherited = AttributeHelper::hasAttribute($phpcsFile, $propertyPointer, '\Override');
+
 		$suppressName = $this->getSniffName(self::CODE_MISSING_TRAVERSABLE_TYPE_HINT_SPECIFICATION);
 		$isSuppressed = SuppressHelper::isSniffSuppressed($phpcsFile, $propertyPointer, $suppressName);
 
@@ -444,7 +444,7 @@ private function checkTraversableTypeHintSpecification(
 
 				if (
 					!$isSuppressed
-					&& !AttributeHelper::hasAttribute($phpcsFile, $propertyPointer, '\Override')
+					&& !$isInherited
 				) {
 					$phpcsFile->addError(
 						sprintf(

tests/Sniffs/TypeHints/data/parameterTypeHintNoErrors.php

@@ -8,8 +8,9 @@ class ParentClass
 
 	/**
 	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint
+	 * @param array{} $b
 	 */
-	public function overrideAttribute($a): void
+	public function overrideAttribute($a, array $b): void
 	{
 	}
 
@@ -293,7 +294,7 @@ public function brokenParameterDescription(int $a, array $b)
 	 * @param bool $a
 	 */
 	#[Override]
-	public function overrideAttribute($a): void
+	public function overrideAttribute($a, array $b): void
 	{
 	}
 

tests/Sniffs/TypeHints/data/propertyTypeHintEnabledNativeNoErrors.php

@@ -200,9 +200,6 @@ class Whatever extends ParentClass
 	 */
 	public WeakMap $objectShapeInItems;
 
-	/**
-	 * @var string[]
-	 */
 	#[Override]
 	public $arrayTypeHint = ['hello'];