Fixed bug causing annotations in inheriting controllers to be ignored
This commit is contained in:
parent
d2cdc9ccad
commit
a8c2fbb13a
|
@ -96,7 +96,7 @@ class AnnotationClassLoader implements LoaderInterface
|
||||||
|
|
||||||
$serviceMethod = new Definition\Method(
|
$serviceMethod = new Definition\Method(
|
||||||
$annotation->getValue(),
|
$annotation->getValue(),
|
||||||
$this->getController($method, $annotation)
|
$this->getController($class, $method, $annotation)
|
||||||
);
|
);
|
||||||
} elseif ($annotation instanceof Annotation\Result) {
|
} elseif ($annotation instanceof Annotation\Result) {
|
||||||
if ($serviceReturn) {
|
if ($serviceReturn) {
|
||||||
|
@ -134,12 +134,12 @@ class AnnotationClassLoader implements LoaderInterface
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private function getController(\ReflectionMethod $method, Annotation\Method $annotation)
|
private function getController(\ReflectionClass $class, \ReflectionMethod $method, Annotation\Method $annotation)
|
||||||
{
|
{
|
||||||
if(null !== $annotation->getService()) {
|
if(null !== $annotation->getService()) {
|
||||||
return $annotation->getService() . ':' . $method->name;
|
return $annotation->getService() . ':' . $method->name;
|
||||||
} else {
|
} else {
|
||||||
return $method->class . '::' . $method->name;
|
return $class->name . '::' . $method->name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue