Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

.github/workflows/e2e-tests.yml

@@ -160,6 +160,13 @@ jobs:
               echo "$OUTPUT"
               ../bashunit -a contains 'Result cache not used because the metadata do not match: projectConfig, scannedFiles' "$OUTPUT"
               ../bashunit -a contains 'Instantiated class ResultCacheE2EGenerated\Foo not found.' "$OUTPUT"
+          - script: |
+              cd e2e/result-cache-traits
+              ../../bin/phpstan analyse
+              patch -b src/FooTrait.php < renameFooTraitMethod.patch
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")
+              echo "$OUTPUT"
+              ../bashunit -a contains 'ClassMentioningClassUsingBarTrait.php:10:Call to an undefined method ResultCacheE2ETraits\ClassUsingBarTrait::doFooTrait(). [identifier=method.notFound]' "$OUTPUT"
           - script: |
               cd e2e/editor-mode
               OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")

e2e/result-cache-traits/phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+	level: 8
+	paths:
+		- src
+	tmpDir: tmp

e2e/result-cache-traits/renameFooTraitMethod.patch

@@ -0,0 +1,11 @@
+--- src/FooTrait.php	2025-05-20 14:00:38
++++ src/FooTrait.php	2025-05-20 14:00:49
+@@ -5,7 +5,7 @@
+ trait FooTrait
+ {
+
+-	public function doFooTrait(): void
++	public function doFooTrait2(): void
+ 	{
+
+ 	}

e2e/result-cache-traits/src/BarTrait.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace ResultCacheE2ETraits;
+
+trait BarTrait
+{
+
+	use FooTrait;
+
+}

e2e/result-cache-traits/src/ClassMentioningClassUsingBarTrait.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ResultCacheE2ETraits;
+
+class ClassMentioningClassUsingBarTrait
+{
+
+	public function doFoo(ClassUsingBarTrait $c): void
+	{
+		$c->doFooTrait();
+	}
+
+}

e2e/result-cache-traits/src/ClassUsingBarTrait.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace ResultCacheE2ETraits;
+
+class ClassUsingBarTrait
+{
+
+	use BarTrait;
+
+}

e2e/result-cache-traits/src/FooTrait.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ResultCacheE2ETraits;
+
+trait FooTrait
+{
+
+	public function doFooTrait(): void
+	{
+
+	}
+
+}

e2e/result-cache-traits/tmp/.gitignore

@@ -0,0 +1,2 @@
+*
+!.*

src/Dependency/DependencyResolver.php

@@ -501,7 +501,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 				$dependenciesReflections[] = $interface;
 			}
 
-			foreach ($classReflection->getTraits() as $trait) {
+			foreach ($classReflection->getTraits(true) as $trait) {
 				$dependenciesReflections[] = $trait;
 			}