Adjust InvalidPhpDocTagValueRule and InvalidPHPStanDocTagRule for property hooks

Author: ondrejmirtes

src/Rules/PhpDoc/InvalidPHPStanDocTagRule.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Rules\PhpDoc;
 
 use PhpParser\Node;
+use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\VirtualNode;
 use PHPStan\PhpDocParser\Lexer\Lexer;
@@ -15,7 +16,7 @@
 use function str_starts_with;
 
 /**
- * @implements Rule<Node\Stmt>
+ * @implements Rule<NodeAbstract>
  */
 final class InvalidPHPStanDocTagRule implements Rule
 {
@@ -69,7 +70,7 @@ public function __construct(
 
 	public function getNodeType(): string
 	{
-		return Node\Stmt::class;
+		return NodeAbstract::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
@@ -78,6 +79,9 @@ public function processNode(Node $node, Scope $scope): array
 		if ($node instanceof VirtualNode) {
 			return [];
 		}
+		if (!$node instanceof Node\Stmt && !$node instanceof Node\PropertyHook) {
+			return [];
+		}
 		if ($node instanceof Node\Stmt\Expression) {
 			if (!$node->expr instanceof Node\Expr\Assign && !$node->expr instanceof Node\Expr\AssignRef) {
 				return [];

src/Rules/PhpDoc/InvalidPhpDocTagValueRule.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Rules\PhpDoc;
 
 use PhpParser\Node;
+use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\VirtualNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\InvalidTagValueNode;
@@ -17,7 +18,7 @@
 use function str_starts_with;
 
 /**
- * @implements Rule<Node\Stmt>
+ * @implements Rule<NodeAbstract>
  */
 final class InvalidPhpDocTagValueRule implements Rule
 {
@@ -31,7 +32,7 @@ public function __construct(
 
 	public function getNodeType(): string
 	{
-		return Node\Stmt::class;
+		return NodeAbstract::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
@@ -40,6 +41,9 @@ public function processNode(Node $node, Scope $scope): array
 		if ($node instanceof VirtualNode) {
 			return [];
 		}
+		if (!$node instanceof Node\Stmt && !$node instanceof Node\PropertyHook) {
+			return [];
+		}
 		if ($node instanceof Node\Stmt\Expression) {
 			if (!$node->expr instanceof Node\Expr\Assign && !$node->expr instanceof Node\Expr\AssignRef) {
 				return [];

tests/PHPStan/Rules/PhpDoc/InvalidPHPStanDocTagRuleTest.php

@@ -6,6 +6,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<InvalidPHPStanDocTagRule>
@@ -52,4 +53,18 @@ public function testBug8697(): void
 		$this->analyse([__DIR__ . '/data/bug-8697.php'], []);
 	}
 
+	public function testPropertyHooks(): void
+	{
+		if (PHP_VERSION_ID < 80400) {
+			$this->markTestSkipped('Test requires PHP 8.4.');
+		}
+
+		$this->analyse([__DIR__ . '/data/invalid-phpstan-tag-property-hooks.php'], [
+			[
+				'Unknown PHPDoc tag: @phpstan-what',
+				9,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php

@@ -6,6 +6,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<InvalidPhpDocTagValueRule>
@@ -144,4 +145,18 @@ public function testBug6692(): void
 		]);
 	}
 
+	public function testPropertyHooks(): void
+	{
+		if (PHP_VERSION_ID < 80400) {
+			$this->markTestSkipped('Test requires PHP 8.4.');
+		}
+
+		$this->analyse([__DIR__ . '/data/invalid-phpdoc-property-hooks.php'], [
+			[
+				'PHPDoc tag @return has invalid value (Test(): Unexpected token "(", expected TOKEN_HORIZONTAL_WS at offset 16 on line 1',
+				9,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/data/invalid-phpdoc-property-hooks.php

@@ -0,0 +1,15 @@
+<?php // lint >= 8.4
+
+namespace InvalidPhpDocPropertyHooks;
+
+class Foo
+{
+
+	public int $i {
+		/** @return Test( */
+		get {
+
+		}
+	}
+
+}

tests/PHPStan/Rules/PhpDoc/data/invalid-phpstan-tag-property-hooks.php

@@ -0,0 +1,15 @@
+<?php // lint >= 8.4
+
+namespace InvalidPHPStanTagPropertyHooks;
+
+class Foo
+{
+
+	public int $i {
+		/** @phpstan-what what */
+		get {
+
+		}
+	}
+
+}