[HttpKernel] Extract method to make callable controller in ControllerResolver
correct naming
This commit is contained in:
parent
585b61db95
commit
88274df463
@ -78,7 +78,7 @@ class ControllerResolver implements ControllerResolverInterface
|
|||||||
|
|
||||||
if (false === strpos($controller, ':')) {
|
if (false === strpos($controller, ':')) {
|
||||||
if (method_exists($controller, '__invoke')) {
|
if (method_exists($controller, '__invoke')) {
|
||||||
return new $controller();
|
return $this->instantiateController($controller);
|
||||||
} elseif (function_exists($controller)) {
|
} elseif (function_exists($controller)) {
|
||||||
return $controller;
|
return $controller;
|
||||||
}
|
}
|
||||||
@ -167,6 +167,18 @@ class ControllerResolver implements ControllerResolverInterface
|
|||||||
throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
|
throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
|
||||||
}
|
}
|
||||||
|
|
||||||
return array(new $class(), $method);
|
return array($this->instantiateController($class), $method);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an instantiated controller
|
||||||
|
*
|
||||||
|
* @param string $class A class name
|
||||||
|
*
|
||||||
|
* @return object
|
||||||
|
*/
|
||||||
|
protected function instantiateController($class)
|
||||||
|
{
|
||||||
|
return new $class();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user