[PropertyInfo] Use the right context for methods defined in traits
This commit is contained in:
parent
3f42c08abd
commit
c7e9493c5b
@ -269,7 +269,17 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
|
||||
}
|
||||
|
||||
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) {
|
||||
|
@ -295,6 +295,23 @@ class PhpDocExtractorTest extends TestCase
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @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
|
||||
*/
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user