@@ -33,11 +33,7 @@ class ControllerFactory
33
33
*/
34
34
public function create (ServerRequest $ request , Response $ response )
35
35
{
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 );
41
37
if (!$ className ) {
42
38
$ this ->missingController ($ request );
43
39
}
@@ -46,22 +42,20 @@ public function create(ServerRequest $request, Response $response)
46
42
$ this ->missingController ($ request );
47
43
}
48
44
49
- return $ reflection ->newInstance ($ request , $ response, $ controller );
45
+ return $ reflection ->newInstance ($ request , $ response );
50
46
}
51
47
52
48
/**
53
49
* Determine the controller class name based on current request and controller param
54
50
*
55
51
* @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
57
52
* @return string|null
58
53
*/
59
- public function getControllerClass (ServerRequest $ request, $ controllerName = null )
54
+ public function getControllerClass (ServerRequest $ request )
60
55
{
61
- $ pluginPath = null ;
62
- $ controller = $ controllerName ;
56
+ $ pluginPath = $ controller = null ;
63
57
$ namespace = 'Controller ' ;
64
- if (! $ controller && $ request ->getParam ('controller ' )) {
58
+ if ($ request ->getParam ('controller ' )) {
65
59
$ controller = $ request ->getParam ('controller ' );
66
60
}
67
61
if ($ request ->getParam ('plugin ' )) {
0 commit comments