Fix stale result cache for require-extends/require-implements

.github/workflows/e2e-tests.yml

@@ -114,6 +114,26 @@ jobs:
               mv src/Baz.php.orig src/Baz.php
               echo -n > phpstan-baseline.neon
               ../../bin/phpstan -vvv
+          - script: |
+              cd e2e/result-cache-6
+              echo -n > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+              patch -b src/Baz.php < patch-1.patch
+              cat baseline-1.neon > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+              mv src/Baz.php.orig src/Baz.php
+              echo -n > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+          - script: |
+              cd e2e/result-cache-7
+              echo -n > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+              patch -b src/Bar.php < patch-1.patch
+              cat baseline-1.neon > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+              mv src/Bar.php.orig src/Bar.php
+              echo -n > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
           - script: |
               cd e2e/bug-9622
               echo -n > phpstan-baseline.neon

e2e/result-cache-6/baseline-1.neon

@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Access to an undefined property TestResultCache6\\\\Bar\\:\\:\\$s\\.$#"
+			count: 1
+			path: src/Foo.php

e2e/result-cache-6/patch-1.patch

@@ -0,0 +1,10 @@
+diff --git b/e2e/result-cache-6/src/Baz.php a/e2e/result-cache-6/src/Baz.php
+index 4a94eb3ae..6fed0b9ec 100644
+--- b/e2e/result-cache-6/src/Baz.php
++++ a/e2e/result-cache-6/src/Baz.php
+@@ -4,5 +4,4 @@ namespace TestResultCache6;
+
+ class Baz
+ {
+-	public string $s;
+ }

e2e/result-cache-6/phpstan.neon

@@ -0,0 +1,7 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+	level: 8
+	paths:
+		- src

e2e/result-cache-6/src/Bar.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace TestResultCache6;
+
+/**
+ * @phpstan-require-extends Baz
+ */
+interface Bar
+{
+}

e2e/result-cache-6/src/Baz.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace TestResultCache6;
+
+class Baz
+{
+	public string $s;
+}

e2e/result-cache-6/src/Foo.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace TestResultCache6;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	public function doFoo(Bar $b): void
+	{
+		echo $b->s;
+	}
+
+}

e2e/result-cache-7/baseline-1.neon

@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^PHPDoc tag @phpstan\\-require\\-implements cannot contain non\\-interface type TestResultCache7\\\\Bar\\.$#"
+			count: 1
+			path: src/Foo.php

e2e/result-cache-7/patch-1.patch

@@ -0,0 +1,12 @@
+diff --git a/e2e/result-cache-7/src/Bar.php b/e2e/result-cache-7/src/Bar.php
+index b698e695d..0bbcc3093 100644
+--- a/e2e/result-cache-7/src/Bar.php
++++ b/e2e/result-cache-7/src/Bar.php
+@@ -2,6 +2,6 @@
+
+ namespace TestResultCache7;
+
+-interface Bar
++class Bar
+ {
+ }

e2e/result-cache-7/phpstan.neon

@@ -0,0 +1,7 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+	level: 8
+	paths:
+		- src

e2e/result-cache-7/src/Bar.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace TestResultCache7;
+
+interface Bar
+{
+}

e2e/result-cache-7/src/Foo.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace TestResultCache7;
+
+/** @phpstan-require-implements Bar */
+trait Foo
+{
+}

src/Dependency/DependencyResolver.php

@@ -384,6 +384,22 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 			&& $node->class instanceof Node\Name
 		) {
 			$this->addClassToDependencies($scope->resolveName($node->class), $dependenciesReflections);
+		} elseif ($node instanceof Node\Stmt\Trait_ && $node->namespacedName !== null) {
+			try {
+				$classReflection = $this->reflectionProvider->getClass($node->namespacedName->toString());
+
+				foreach ($classReflection->getRequireImplementsTags() as $implementsTag) {
+					foreach ($implementsTag->getType()->getReferencedClasses() as $referencedClass) {
+						if (!$this->reflectionProvider->hasClass($referencedClass)) {
+							continue;
+						}
+
+						$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+					}
+				}
+			} catch (ClassNotFoundException) {
+				// pass
+			}
 		} elseif ($node instanceof Node\Stmt\TraitUse) {
 			foreach ($node->traits as $traitName) {
 				$this->addClassToDependencies($traitName->toString(), $dependenciesReflections);
@@ -495,6 +511,15 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 				}
 			}
 
+			foreach ($classReflection->getRequireExtendsTags() as $extendsTag) {
+				foreach ($extendsTag->getType()->getReferencedClasses() as $referencedClass) {
+					if (!$this->reflectionProvider->hasClass($referencedClass)) {
+						continue;
+					}
+					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+				}
+			}
+
 			foreach ($classReflection->getTemplateTags() as $templateTag) {
 				foreach ($templateTag->getBound()->getReferencedClasses() as $referencedClass) {
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {