Fix RequiredAutowiringExtension for traits

ondrejmirtes · ondrejmirtes · commit 53e21286484a · 2026-01-23T10:02:59.000+01:00
diff --git a/src/Symfony/RequiredAutowiringExtension.php b/src/Symfony/RequiredAutowiringExtension.php
@@ -64,11 +64,15 @@ public function getAdditionalConstructors(ClassReflection $classReflection): arr
 		$additionalConstructors = [];
 		$nativeReflection = $classReflection->getNativeReflection();
 
-		foreach ($nativeReflection->getBetterReflection()->getImmediateMethods() as $method) {
+		foreach ($nativeReflection->getBetterReflection()->getMethods() as $method) {
 			if (!$method->isPublic()) {
 				continue;
 			}
 
+			if ($method->getImplementingClass()->getName() !== $nativeReflection->getName()) {
+				continue;
+			}
+
 			$declaringTrait = null;
 			if ($method->getDeclaringClass()->isTrait()) {
 				$declaringTrait = $method->getDeclaringClass()->getName();
diff --git a/tests/Symfony/RequiredAutowiringExtensionTest.php b/tests/Symfony/RequiredAutowiringExtensionTest.php
@@ -8,6 +8,7 @@
 use PHPStan\Testing\RuleTestCase;
 use Symfony\Contracts\Service\Attribute\Required;
 use function class_exists;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<UninitializedPropertyRule>
@@ -55,6 +56,18 @@ public function testRequiredAttributes(): void
 		]);
 	}
 
+
+	public function testBug468(): void
+	{
+		if (!class_exists(Required::class)) {
+			self::markTestSkipped('Required symfony/service-contracts@3.2.1 or higher is not installed');
+		}
+		if (PHP_VERSION_ID < 80100) {
+			self::markTestSkipped('Test requires PHP 8.1.');
+		}
+		$this->analyse([__DIR__ . '/data/bug-468.php'], []);
+	}
+
 	public static function getAdditionalConfigFiles(): array
 	{
 		return [
diff --git a/tests/Symfony/data/bug-468.php b/tests/Symfony/data/bug-468.php
@@ -0,0 +1,32 @@
+<?php // lint >= 8.1
+
+namespace Bug468;
+
+use Symfony\Contracts\Service\Attribute\Required;
+
+interface MyQueryInterface {
+	public function execute(): array;
+}
+
+trait GenreFetcherTrait
+{
+	private MyQueryInterface $query;
+
+	protected function dosomething(): array
+	{
+		return $this->query->execute();
+	}
+
+	#[Required]
+	public function setQuery(
+		MyQueryInterface $query,
+    ): void {
+		$this->query = $query;
+	}
+}
+
+class HelloWorld
+{
+	use GenreFetcherTrait;
+
+}
