diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index 25446deb1e7ec..d85132692af87 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -269,7 +269,17 @@ private function getDocBlockFromMethod(string $class, string $ucFirstProperty, i
}
try {
- return [$this->docBlockFactory->create($reflectionMethod, $this->createFromReflector($reflectionMethod->getDeclaringClass())), $prefix];
+ $reflector = $reflectionMethod->getDeclaringClass();
+
+ foreach ($reflector->getTraits() as $trait) {
+ if ($trait->hasMethod($methodName)) {
+ $reflector = $trait;
+
+ break;
+ }
+ }
+
+ return [$this->docBlockFactory->create($reflectionMethod, $this->createFromReflector($reflector)), $prefix];
} catch (\InvalidArgumentException $e) {
return null;
} catch (\RuntimeException $e) {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index 4e3ff39257537..9adfa6783a2c4 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -295,6 +295,23 @@ public function propertiesDefinedByTraitsProvider(): array
];
}
+ /**
+ * @dataProvider methodsDefinedByTraitsProvider
+ */
+ public function testMethodsDefinedByTraits(string $property, Type $type)
+ {
+ $this->assertEquals([$type], $this->extractor->getTypes(DummyUsingTrait::class, $property));
+ }
+
+ public function methodsDefinedByTraitsProvider(): array
+ {
+ return [
+ ['methodInTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
+ ['methodInTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
+ ['methodInTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+ ];
+ }
+
/**
* @dataProvider propertiesStaticTypeProvider
*/
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
index 6284ebf10567f..0599d979c2951 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
@@ -29,4 +29,28 @@ trait DummyTrait
* @var Dummy
*/
private $propertyInTraitObjectDifferentNamespace;
+
+ /**
+ * @return string
+ */
+ public function getMethodInTraitPrimitiveType()
+ {
+ return 'value';
+ }
+
+ /**
+ * @return DummyUsedInTrait
+ */
+ public function getMethodInTraitObjectSameNamespace()
+ {
+ return new DummyUsedInTrait();
+ }
+
+ /**
+ * @return Dummy
+ */
+ public function getMethodInTraitObjectDifferentNamespace()
+ {
+ return new Dummy();
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy