SlevomatCodingStandard.TypeHints.ReturnTypeHint: Don't report only some errors when method is inherited

Author: kukulich

SlevomatCodingStandard/Sniffs/TypeHints/ReturnTypeHintSniff.php

@@ -110,14 +110,6 @@ public function process(File $phpcsFile, int $pointer): void
 			return;
 		}
 
-		if (AttributeHelper::hasAttribute($phpcsFile, $pointer, '\Override')) {
-			return;
-		}
-
-		if (DocCommentHelper::hasInheritdocAnnotation($phpcsFile, $pointer)) {
-			return;
-		}
-
 		$token = $phpcsFile->getTokens()[$pointer];
 
 		if ($token['code'] === T_FUNCTION) {
@@ -150,6 +142,12 @@ private function checkFunctionTypeHint(
 		array $prefixedReturnAnnotations
 	): void
 	{
+		$isInherited = AttributeHelper::hasAttribute(
+			$phpcsFile,
+			$functionPointer,
+			'\Override',
+		) || DocCommentHelper::hasInheritdocAnnotation($phpcsFile, $functionPointer);
+
 		$suppressNameAnyTypeHint = $this->getSniffName(self::CODE_MISSING_ANY_TYPE_HINT);
 		$isSuppressedAnyTypeHint = SuppressHelper::isSniffSuppressed($phpcsFile, $functionPointer, $suppressNameAnyTypeHint);
 
@@ -237,7 +235,7 @@ private function checkFunctionTypeHint(
 				return;
 			}
 
-			if (!$isSuppressedAnyTypeHint) {
+			if (!$isSuppressedAnyTypeHint && !$isInherited) {
 				$phpcsFile->addError(
 					sprintf(
 						'%s %s() does not have return type hint nor @return annotation for its return value.',
@@ -259,7 +257,7 @@ private function checkFunctionTypeHint(
 				|| $isAnnotationReturnTypeVoidOrNever
 			)
 		) {
-			if (!$isSuppressedNativeTypeHint) {
+			if (!$isSuppressedNativeTypeHint && !$isInherited) {
 				$message = !$hasReturnAnnotation
 					? sprintf(
 						'%s %s() does not have void return type hint.',
@@ -293,7 +291,7 @@ private function checkFunctionTypeHint(
 			return;
 		}
 
-		if (!$isSuppressedNativeTypeHint && $returnsValue && $isAnnotationReturnTypeVoidOrNever) {
+		if (!$isSuppressedNativeTypeHint && !$isInherited && $returnsValue && $isAnnotationReturnTypeVoidOrNever) {
 			$message = sprintf(
 				'%s %s() does not have native return type hint for its return value but it should be possible to add it based on @return annotation "%s".',
 				FunctionHelper::getTypeLabel($phpcsFile, $functionPointer),
@@ -444,7 +442,7 @@ private function checkFunctionTypeHint(
 			$nullableReturnTypeHint = true;
 		}
 
-		if ($isSuppressedNativeTypeHint) {
+		if ($isSuppressedNativeTypeHint || $isInherited) {
 			return;
 		}
 
@@ -497,6 +495,12 @@ private function checkFunctionTraversableTypeHintSpecification(
 		array $prefixedReturnAnnotations
 	): void
 	{
+		$isInherited = AttributeHelper::hasAttribute(
+			$phpcsFile,
+			$functionPointer,
+			'\Override',
+		) || DocCommentHelper::hasInheritdocAnnotation($phpcsFile, $functionPointer);
+
 		$suppressName = $this->getSniffName(self::CODE_MISSING_TRAVERSABLE_TYPE_HINT_SPECIFICATION);
 		$isSuppressed = SuppressHelper::isSniffSuppressed($phpcsFile, $functionPointer, $suppressName);
 
@@ -510,7 +514,7 @@ private function checkFunctionTraversableTypeHintSpecification(
 					return;
 				}
 
-				if (!$isSuppressed) {
+				if (!$isSuppressed && !$isInherited) {
 					$phpcsFile->addError(
 						sprintf(
 							'%s %s() does not have @return annotation for its traversable return value.',
@@ -551,7 +555,7 @@ private function checkFunctionTraversableTypeHintSpecification(
 			return;
 		}
 
-		if ($isSuppressed) {
+		if ($isSuppressed || $isInherited) {
 			return;
 		}