ParameterTypeHintSniff, PropertyTypeHintSniff, ReturnTypeHintSniff: F…

…ixed false positives
slevomat · Apr 14, 2021 · 7815b13 · 7815b13
1 parent e7286b9
commit 7815b13
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 20 deletions.
diff --git a/SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php b/SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php
@@ -19,7 +19,6 @@
 use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
-use function array_filter;
 use function array_merge;
 use function count;
 use function in_array;
@@ -661,12 +660,16 @@ public static function getTraversableTypeHintsFromType(
 			return [];
 		}
 
-		return array_filter($typeHints, static function (string $typeHint) use ($phpcsFile, $pointer, $traversableTypeHints): bool {
-			return TypeHintHelper::isTraversableType(
+		foreach ($typeHints as $typeHint) {
+			if (!TypeHintHelper::isTraversableType(
 				TypeHintHelper::getFullyQualifiedTypeHint($phpcsFile, $pointer, $typeHint),
 				$traversableTypeHints
-			);
-		});
+			)) {
+				return [];
+			}
+		}
+
+		return $typeHints;
 	}
 
 	/**

diff --git a/SlevomatCodingStandard/Sniffs/TypeHints/ParameterTypeHintSniff.php b/SlevomatCodingStandard/Sniffs/TypeHints/ParameterTypeHintSniff.php
@@ -245,17 +245,13 @@ private function checkTypeHints(
 
 				$itemsSpecificationTypeHint = AnnotationTypeHelper::getItemsSpecificationTypeFromType($parameterTypeNode);
 				if ($itemsSpecificationTypeHint !== null) {
-					$possibleParameterTypeHints = AnnotationTypeHelper::getTraversableTypeHintsFromType(
+					$typeHints = AnnotationTypeHelper::getTraversableTypeHintsFromType(
 						$parameterTypeNode,
 						$phpcsFile,
 						$functionPointer,
 						$this->getTraversableTypeHints(),
 						$canTryUnionTypeHint
 					);
-
-					if (count($possibleParameterTypeHints) > 0) {
-						$typeHints = $possibleParameterTypeHints;
-					}
 				}
 			}
 

diff --git a/SlevomatCodingStandard/Sniffs/TypeHints/PropertyTypeHintSniff.php b/SlevomatCodingStandard/Sniffs/TypeHints/PropertyTypeHintSniff.php
@@ -267,17 +267,13 @@ private function checkTypeHint(
 
 			$itemsSpecificationTypeHint = AnnotationTypeHelper::getItemsSpecificationTypeFromType($typeNode);
 			if ($itemsSpecificationTypeHint !== null) {
-				$possibleTypeHints = AnnotationTypeHelper::getTraversableTypeHintsFromType(
+				$typeHints = AnnotationTypeHelper::getTraversableTypeHintsFromType(
 					$typeNode,
 					$phpcsFile,
 					$propertyPointer,
 					$this->getTraversableTypeHints(),
 					$this->enableUnionTypeHint
 				);
-
-				if (count($possibleTypeHints) > 0) {
-					$typeHints = $possibleTypeHints;
-				}
 			}
 		}
 

diff --git a/SlevomatCodingStandard/Sniffs/TypeHints/ReturnTypeHintSniff.php b/SlevomatCodingStandard/Sniffs/TypeHints/ReturnTypeHintSniff.php
@@ -287,17 +287,13 @@ private function checkFunctionTypeHint(
 
 			$itemsSpecificationTypeHint = AnnotationTypeHelper::getItemsSpecificationTypeFromType($returnTypeNode);
 			if ($itemsSpecificationTypeHint !== null) {
-				$possibleReturnTypeHints = AnnotationTypeHelper::getTraversableTypeHintsFromType(
+				$typeHints = AnnotationTypeHelper::getTraversableTypeHintsFromType(
 					$returnTypeNode,
 					$phpcsFile,
 					$functionPointer,
 					$this->getTraversableTypeHints(),
 					$canTryUnionTypeHint
 				);
-
-				if (count($possibleReturnTypeHints) > 0) {
-					$typeHints = $possibleReturnTypeHints;
-				}
 			}
 		}
 

diff --git a/tests/Sniffs/TypeHints/data/parameterTypeHintWithUnionNoErrors.php b/tests/Sniffs/TypeHints/data/parameterTypeHintWithUnionNoErrors.php
@@ -14,4 +14,11 @@ private function withTrue(string|bool $a)
 	{
 	}
 
+	/**
+	 * @param ArrayHash|array|mixed[] $a
+	 */
+	public function arrayAndArrayHash($a)
+	{
+	}
+
 }
diff --git a/tests/Sniffs/TypeHints/data/propertyTypeHintEnabledNativeWithUnionNoErrors.php b/tests/Sniffs/TypeHints/data/propertyTypeHintEnabledNativeWithUnionNoErrors.php
@@ -8,4 +8,9 @@ class Whatever
 	/** @var string|true */
 	private string|bool $withTrue;
 
+	/**
+	 * @var ArrayHash|array|mixed[]
+	 */
+	protected $arrayAndArrayHash;
+
 }
diff --git a/tests/Sniffs/TypeHints/data/returnTypeHintWithUnionNoErrors.php b/tests/Sniffs/TypeHints/data/returnTypeHintWithUnionNoErrors.php
@@ -12,4 +12,11 @@ private function withTrue(): string|bool
 	{
 	}
 
+	/**
+	 * @return ArrayHash|array|mixed[]
+	 */
+	public function arrayAndArrayHash()
+	{
+	}
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,11 @@ private function withTrue(string|bool $a) @@
     	{
     	}
+    	/**
+    	 * @param ArrayHash|array|mixed[] $a
+    	 */
+    	public function arrayAndArrayHash($a)
+    	{
+    	}
     }