ParameterTypeHintSniff, PropertyTypeHintSniff, ReturnTypeHintSniff: F…

…ixed false positives
slevomat · Feb 3, 2020 · 49e6021 · 49e6021
1 parent 7812bac
commit 49e6021
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php b/SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php
@@ -554,24 +554,22 @@ public static function getTraversableTypeHintFromType(
 		array $traversableTypeHints
 	): ?string
 	{
+		$typeHint = null;
+
 		foreach ($typeNode->types as $type) {
 			if (
-				!$type instanceof GenericTypeNode
-				&& !$type instanceof ThisTypeNode
-				&& !$type instanceof IdentifierTypeNode
+				$type instanceof GenericTypeNode
+				|| $type instanceof ThisTypeNode
+				|| $type instanceof IdentifierTypeNode
 			) {
-				continue;
+				$typeHint = self::getTypeHintFromOneType($type);
+				break;
 			}
-
-			$typeHint = self::getTypeHintFromOneType($type);
-			if (!TypeHintHelper::isTraversableType(TypeHintHelper::getFullyQualifiedTypeHint($phpcsFile, $pointer, $typeHint), $traversableTypeHints)) {
-				continue;
-			}
-
-			return $typeHint;
 		}
 
-		return null;
+		return $typeHint !== null && TypeHintHelper::isTraversableType(TypeHintHelper::getFullyQualifiedTypeHint($phpcsFile, $pointer, $typeHint), $traversableTypeHints)
+			? $typeHint
+			: null;
 	}
 
 	/**

diff --git a/tests/Sniffs/TypeHints/data/parameterTypeHintNoErrors.php b/tests/Sniffs/TypeHints/data/parameterTypeHintNoErrors.php
@@ -197,4 +197,11 @@ public function anotherDifferentTypes($a)
 	{
 	}
 
+	/**
+	 * @param Whatever|mixed[]|array $a
+	 */
+	public function yetAnotherDifferentTypes($a)
+	{
+	}
+
 }
diff --git a/tests/Sniffs/TypeHints/data/propertyTypeHintEnabledNativeNoErrors.php b/tests/Sniffs/TypeHints/data/propertyTypeHintEnabledNativeNoErrors.php
@@ -131,4 +131,9 @@ class Whatever
 	 */
 	public $anotherDifferentTypes;
 
+	/**
+	 * @var Whatever|mixed[]|array
+	 */
+	public $yetAnotherDifferentTypes;
+
 }
diff --git a/tests/Sniffs/TypeHints/data/returnTypeHintNoErrors.php b/tests/Sniffs/TypeHints/data/returnTypeHintNoErrors.php
@@ -214,4 +214,11 @@ public function anotherDifferentTypes()
 	{
 	}
 
+	/**
+	 * @return Whatever|mixed[]|array
+	 */
+	public function yetAnotherDifferentTypes()
+	{
+	}
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -197,4 +197,11 @@ public function anotherDifferentTypes($a) @@
     	{
     	}
+    	/**
+    	 * @param Whatever|mixed[]|array $a
+    	 */
+    	public function yetAnotherDifferentTypes($a)
+    	{
+    	}
     }