github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use instance variable directly instead of passing it around

Browse Source
This commit is contained in:
Franz Liedke 2018-09-07 01:37:07 +02:00
parent df6f10da20
commit 30bc979fcb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
framework/core/src/Http/ControllerRouteHandler.php
View File

@ -46,7 +46,7 @@ class ControllerRouteHandler
*/
public function __invoke(ServerRequestInterface $request, array $routeParams)
{
$controller = $this->resolveController($this->controller);
$controller = $this->resolveController();
$request = $request->withQueryParams(array_merge($request->getQueryParams(), $routeParams));
@ -54,15 +54,14 @@ class ControllerRouteHandler
}
/**
* @param string|callable $class
* @return RequestHandlerInterface
*/
protected function resolveController($class)
protected function resolveController()
{
if (is_callable($class)) {
$controller = $this->container->call($class);
if (is_callable($this->controller)) {
$controller = $this->container->call($this->controller);
} else {
$controller = $this->container->make($class);
$controller = $this->container->make($this->controller);
}
if (! ($controller instanceof RequestHandlerInterface)) {