MethodAssertRule - do not report implicitly inherited assert tags

Author: ondrejmirtes

src/PhpDoc/PhpDocNodeResolver.php

@@ -515,19 +515,19 @@ private function resolveAssertTagsFor(PhpDocNode $phpDocNode, NameScope $nameSco
 		foreach ($phpDocNode->getAssertTagValues($tagName) as $assertTagValue) {
 			$type = $this->typeNodeResolver->resolve($assertTagValue->type, $nameScope);
 			$parameter = new AssertTagParameter($assertTagValue->parameter, null, null);
-			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false);
+			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false, true);
 		}
 
 		foreach ($phpDocNode->getAssertPropertyTagValues($tagName) as $assertTagValue) {
 			$type = $this->typeNodeResolver->resolve($assertTagValue->type, $nameScope);
 			$parameter = new AssertTagParameter($assertTagValue->parameter, $assertTagValue->property, null);
-			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false);
+			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false, true);
 		}
 
 		foreach ($phpDocNode->getAssertMethodTagValues($tagName) as $assertTagValue) {
 			$type = $this->typeNodeResolver->resolve($assertTagValue->type, $nameScope);
 			$parameter = new AssertTagParameter($assertTagValue->parameter, null, $assertTagValue->method);
-			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false);
+			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false, true);
 		}
 
 		return $resolved;

src/PhpDoc/ResolvedPhpDocBlock.php

@@ -934,7 +934,7 @@ private static function mergeAssertTags(array $assertTags, array $parents, array
 				static fn (AssertTag $assertTag) => self::resolveTemplateTypeInTag(
 					$assertTag->withParameter(
 						$phpDocBlock->transformAssertTagParameterWithParameterNameMapping($assertTag->getParameter()),
-					),
+					)->toImplicit(),
 					$phpDocBlock,
 					TemplateTypeVariance::createCovariant(),
 				),

src/PhpDoc/Tag/AssertTag.php

@@ -18,7 +18,7 @@ final class AssertTag implements TypedTag
 	/**
 	 * @param self::NULL|self::IF_TRUE|self::IF_FALSE $if
 	 */
-	public function __construct(private string $if, private Type $type, private AssertTagParameter $parameter, private bool $negated, private bool $equality)
+	public function __construct(private string $if, private Type $type, private AssertTagParameter $parameter, private bool $negated, private bool $equality, private bool $isExplicit)
 	{
 	}
 
@@ -60,14 +60,14 @@ public function isEquality(): bool
 	 */
 	public function withType(Type $type): TypedTag
 	{
-		$tag = new self($this->if, $type, $this->parameter, $this->negated, $this->equality);
+		$tag = new self($this->if, $type, $this->parameter, $this->negated, $this->equality, $this->isExplicit);
 		$tag->originalType = $this->getOriginalType();
 		return $tag;
 	}
 
 	public function withParameter(AssertTagParameter $parameter): self
 	{
-		$tag = new self($this->if, $this->type, $parameter, $this->negated, $this->equality);
+		$tag = new self($this->if, $this->type, $parameter, $this->negated, $this->equality, $this->isExplicit);
 		$tag->originalType = $this->getOriginalType();
 		return $tag;
 	}
@@ -78,9 +78,19 @@ public function negate(): self
 			throw new ShouldNotHappenException();
 		}
 
-		$tag = new self($this->if, $this->type, $this->parameter, !$this->negated, $this->equality);
+		$tag = new self($this->if, $this->type, $this->parameter, !$this->negated, $this->equality, $this->isExplicit);
 		$tag->originalType = $this->getOriginalType();
 		return $tag;
 	}
 
+	public function isExplicit(): bool
+	{
+		return $this->isExplicit;
+	}
+
+	public function toImplicit(): self
+	{
+		return new self($this->if, $this->type, $this->parameter, $this->negated, $this->equality, false);
+	}
+
 }

src/Rules/PhpDoc/AssertRuleHelper.php

@@ -49,6 +49,10 @@ public function check(ExtendedMethodReflection|FunctionReflection $reflection, P
 				continue;
 			}
 
+			if (!$assert->isExplicit()) {
+				continue;
+			}
+
 			$assertedExpr = $assert->getParameter()->getExpr(new TypeExpr($parametersByName[$parameterName]));
 			$assertedExprType = $this->initializerExprTypeResolver->getType($assertedExpr, $context);
 			if ($assertedExprType instanceof ErrorType) {

tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php

@@ -57,4 +57,9 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug10573(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-10573.php'], []);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/data/bug-10573.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Bug10573;
+
+/**
+ * @template TAttribute of string
+ * @template TSubject of mixed
+ */
+abstract class Voter
+{
+	/**
+	 * Determines if the attribute and subject are supported by this voter.
+	 *
+	 * @param string $attribute
+	 * @param mixed $subject
+	 *
+	 * @phpstan-assert-if-true TSubject $subject
+	 * @phpstan-assert-if-true TAttribute $attribute
+	 *
+	 * @return bool
+	 */
+	abstract protected function supports(string $attribute, $subject);
+}
+
+class Post {}
+
+/**
+ * @extends Voter<string, Post>
+ */
+class PostVoter extends Voter {
+	function supports($attribute, $subject): bool
+	{
+		return $attribute === 'POST_READ' && $subject instanceof Post;
+	}
+}