Merge pull request #8085 from cakephp/issue-8081

Inflect Controller::$name when it is derived from request params.
cakephp · Jan 22, 2016 · bc1ec25 · bc1ec25
2 parents f3943e4 + c6497c9
commit bc1ec25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -26,6 +26,7 @@
 use Cake\ORM\Locator\LocatorAwareTrait;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
+use Cake\Utility\Inflector;
 use Cake\Utility\MergeVariablesTrait;
 use Cake\View\ViewVarsTrait;
 use LogicException;
@@ -236,7 +237,7 @@ public function __construct(Request $request = null, Response $response = null,
         }
 
         if ($this->name === null && isset($request->params['controller'])) {
-            $this->name = $request->params['controller'];
+            $this->name = Inflector::camelize($request->params['controller']);
         }
 
         if ($this->name === null) {

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -359,6 +359,12 @@ public function testConstructSetModelClass()
         $this->assertEquals('Posts', $controller->modelClass);
         $this->assertInstanceOf('Cake\ORM\Table', $controller->Posts);
 
+        $request->params['controller'] = 'posts';
+        $controller = new \TestApp\Controller\PostsController($request, $response);
+        $this->assertEquals('Posts', $controller->modelClass);
+        $this->assertInstanceOf('Cake\ORM\Table', $controller->Posts);
+        unset($request->params['controller']);
+
         $controller = new \TestApp\Controller\Admin\PostsController($request, $response);
         $this->assertEquals('Posts', $controller->modelClass);
         $this->assertInstanceOf('Cake\ORM\Table', $controller->Posts);