Skip to content

Commit d81eded

Browse files
committed
cleanup duplication
1 parent 4a49f1e commit d81eded

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/Http/ControllerFactory.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ class ControllerFactory
3333
*/
3434
public function create(ServerRequest $request, Response $response)
3535
{
36-
$controller = null;
37-
if ($request->getParam('controller')) {
38-
$controller = $request->getParam('controller');
39-
}
40-
$className = $this->getControllerClass($request, $controller);
36+
$className = $this->getControllerClass($request);
4137
if (!$className) {
4238
$this->missingController($request);
4339
}
@@ -46,22 +42,20 @@ public function create(ServerRequest $request, Response $response)
4642
$this->missingController($request);
4743
}
4844

49-
return $reflection->newInstance($request, $response, $controller);
45+
return $reflection->newInstance($request, $response);
5046
}
5147

5248
/**
5349
* Determine the controller class name based on current request and controller param
5450
*
5551
* @param \Cake\Http\ServerRequest $request The request to build a controller for.
56-
* @param string|null $controllerName The controller name present in the request params
5752
* @return string|null
5853
*/
59-
public function getControllerClass(ServerRequest $request, $controllerName = null)
54+
public function getControllerClass(ServerRequest $request)
6055
{
61-
$pluginPath = null;
62-
$controller = $controllerName;
56+
$pluginPath = $controller = null;
6357
$namespace = 'Controller';
64-
if (!$controller && $request->getParam('controller')) {
58+
if ($request->getParam('controller')) {
6559
$controller = $request->getParam('controller');
6660
}
6761
if ($request->getParam('plugin')) {

0 commit comments

Comments
 (0)