phpstan/phpdoc-parser ^1.6.2

slevomat · Jun 13, 2022 · 55e5dc5 · 55e5dc5
1 parent dd2ab21
commit 55e5dc5
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 11 deletions.
diff --git a/SlevomatCodingStandard/Helpers/Annotation/ParameterAnnotation.php b/SlevomatCodingStandard/Helpers/Annotation/ParameterAnnotation.php
@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypelessParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
@@ -25,10 +26,13 @@
 class ParameterAnnotation extends Annotation
 {
 
-	/** @var ParamTagValueNode|null */
+	/** @var ParamTagValueNode|TypelessParamTagValueNode|null */
 	private $contentNode;
 
-	public function __construct(string $name, int $startPointer, int $endPointer, ?string $content, ?ParamTagValueNode $contentNode)
+	/**
+	 * @param ParamTagValueNode|TypelessParamTagValueNode|null $contentNode
+	 */
+	public function __construct(string $name, int $startPointer, int $endPointer, ?string $content, $contentNode)
 	{
 		if (!in_array($name, ['@param', '@psalm-param', '@phpstan-param'], true)) {
 			throw new InvalidArgumentException(sprintf('Unsupported annotation %s.', $name));
@@ -44,7 +48,10 @@ public function isInvalid(): bool
 		return $this->contentNode === null;
 	}
 
-	public function getContentNode(): ParamTagValueNode
+	/**
+	 * @return ParamTagValueNode|TypelessParamTagValueNode|null
+	 */
+	public function getContentNode()
 	{
 		$this->errorWhenInvalid();
 
@@ -71,12 +78,16 @@ public function getParameterName(): string
 	}
 
 	/**
-	 * @return GenericTypeNode|CallableTypeNode|IntersectionTypeNode|UnionTypeNode|ArrayTypeNode|ArrayShapeNode|IdentifierTypeNode|ThisTypeNode|NullableTypeNode|ConstTypeNode
+	 * @return GenericTypeNode|CallableTypeNode|IntersectionTypeNode|UnionTypeNode|ArrayTypeNode|ArrayShapeNode|IdentifierTypeNode|ThisTypeNode|NullableTypeNode|ConstTypeNode|null
 	 */
-	public function getType(): TypeNode
+	public function getType(): ?TypeNode
 	{
 		$this->errorWhenInvalid();
 
+		if ($this->contentNode instanceof TypelessParamTagValueNode) {
+			return null;
+		}
+
 		/** @var GenericTypeNode|CallableTypeNode|IntersectionTypeNode|UnionTypeNode|ArrayTypeNode|ArrayShapeNode|IdentifierTypeNode|ThisTypeNode|NullableTypeNode|ConstTypeNode $type */
 		$type = $this->contentNode->type;
 		return $type;

diff --git a/SlevomatCodingStandard/Helpers/AnnotationHelper.php b/SlevomatCodingStandard/Helpers/AnnotationHelper.php
@@ -89,7 +89,7 @@ public static function getAnnotationTypes(Annotation $annotation): array
 			}
 		} elseif ($annotation instanceof TypeImportAnnotation) {
 			$annotationTypes[] = $annotation->getImportedFrom();
-		} else {
+		} elseif ($annotation->getType() !== null) {
 			$annotationTypes[] = $annotation->getType();
 		}
 

diff --git a/SlevomatCodingStandard/Sniffs/TypeHints/ParameterTypeHintSniff.php b/SlevomatCodingStandard/Sniffs/TypeHints/ParameterTypeHintSniff.php
@@ -409,6 +409,7 @@ private function checkTraversableTypeHintSpecification(
 				$hasTraversableTypeHint = true;
 			} elseif (
 				array_key_exists($parameterName, $parametersAnnotations)
+				&& $parametersAnnotations[$parameterName]->getType() !== null
 				&& AnnotationTypeHelper::containsTraversableType(
 					$parametersAnnotations[$parameterName]->getType(),
 					$phpcsFile,
@@ -443,6 +444,9 @@ private function checkTraversableTypeHintSpecification(
 			}
 
 			$parameterTypeNode = $parametersAnnotations[$parameterName]->getType();
+			if ($parameterTypeNode === null) {
+				continue;
+			}
 
 			if (
 				(
@@ -508,6 +512,9 @@ private function checkUselessAnnotations(
 			}
 
 			$parameterAnnotation = $parametersAnnotations[$parameterName];
+			if ($parameterAnnotation->getType() === null) {
+				continue;
+			}
 
 			if (!AnnotationHelper::isAnnotationUseless(
 				$phpcsFile,

diff --git a/build/PHPStan/phpstan.neon b/build/PHPStan/phpstan.neon
@@ -25,7 +25,15 @@ parameters:
 			path: %currentWorkingDirectory%/SlevomatCodingStandard/Sniffs/ControlStructures/AssignmentInConditionSniff.php
 		-
 			message: '#Parameter \#5 \$contentNode of class SlevomatCodingStandard\\Helpers\\Annotation\\\w+Annotation constructor expects PHPStan\\PhpDocParser\\Ast\\PhpDoc\\\w+TagValueNode\|null, PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagValueNode\|null given.#'
-			count: 14
+			count: 13
+			path: %currentWorkingDirectory%/SlevomatCodingStandard/Helpers/AnnotationHelper.php
+		-
+			message: "#^Access to an undefined property PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\AssertTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\MixinTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\ParamTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\PropertyTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\ReturnTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\ThrowsTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\TypeAliasTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\TypelessParamTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\VarTagValueNode\\:\\:\\$type\\.$#"
+			count: 1
+			path: %currentWorkingDirectory%/SlevomatCodingStandard/Helpers/AnnotationHelper.php
+		-
+			message: "#^Parameter \\#5 \\$contentNode of class SlevomatCodingStandard\\\\Helpers\\\\Annotation\\\\ParameterAnnotation constructor expects PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\ParamTagValueNode\\|PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\TypelessParamTagValueNode\\|null, PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\PhpDocTagValueNode\\|null given\\.$#"
+			count: 1
 			path: %currentWorkingDirectory%/SlevomatCodingStandard/Helpers/AnnotationHelper.php
 
 services:

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 	"require": {
 		"php": "^7.2 || ^8.0",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
-		"phpstan/phpdoc-parser": "^1.5.1",
+		"phpstan/phpdoc-parser": "^1.6.2",
 		"squizlabs/php_codesniffer": "^3.7.0"
 	},
 	"require-dev": {

diff --git a/tests/Sniffs/TypeHints/data/parameterTypeHintNoErrors.php b/tests/Sniffs/TypeHints/data/parameterTypeHintNoErrors.php
@@ -121,13 +121,21 @@ public function emptyAnnotation(int $a)
 	}
 
 	/**
-	 * @param $a
+	 * @param invalid invalid $a
 	 */
 	public function invalidAnnotation(int $a)
 	{
 
 	}
 
+	/**
+	 * @param $a
+	 */
+	public function noType(int $a)
+	{
+
+	}
+
 	/**
 	 * @param $this $a
 	 */
@@ -217,7 +225,7 @@ public function withPhpstanAnnotationAndMissingNativeTypeHint($a)
 
 	/**
 	 * @psalm-param
-	 * @psalm-param $b Invalid
+	 * @psalm-param invalid invalid $b Invalid
 	 * @psalm-param Whatever<int> $a
 	 */
 	public function withPsalmAnnotationAndTraversableNativeTypeHint(array $a)
@@ -226,7 +234,7 @@ public function withPsalmAnnotationAndTraversableNativeTypeHint(array $a)
 
 	/**
 	 * @phpstan-param
-	 * @phpstan-param $b Invalid
+	 * @phpstan-param invalid invalid $b Invalid
 	 * @phpstan-param Whatever<int> $a
 	 */
 	public function withPhpstanAnnotationAndTraversableNativeTypeHint(array $a)