When setting the controller name, we also set the modelClass property…

… in order for the magic get property to properly load the Model associated to the controller being invoked
HavokInspiration · Sep 22, 2017 · 813800f · 813800f
1 parent c9aac48
commit 813800f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Controller/Action.php b/src/Controller/Action.php
@@ -52,6 +52,7 @@ public function getControllerName()
     public function setControllerName(string $controllerName) : Action
     {
         $this->controllerName = $controllerName;
+        $this->modelClass = $controllerName;
 
         return $this;
     }

diff --git a/tests/TestCase/Http/ActionFactoryTest.php b/tests/TestCase/Http/ActionFactoryTest.php
@@ -54,6 +54,7 @@ public function testApplicationAction()
         $this->assertInstanceOf('TestApp\Controller\Cakes\IndexAction', $result);
         $this->assertEquals('Index', $result->name);
         $this->assertEquals('Cakes', $result->getControllerName());
+        $this->assertEquals('Cakes', $result->modelClass);
         $this->assertSame($request, $result->request);
         $this->assertSame($this->response, $result->response);
     }