ActionController should not default to index

- If no action is present, default to not-found
weierophinney · Feb 14, 2012 · 878cb78 · 878cb78
1 parent 34bc3d7
commit 878cb78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/library/Zend/Mvc/Controller/ActionController.php b/library/Zend/Mvc/Controller/ActionController.php
@@ -99,7 +99,7 @@ public function execute(MvcEvent $e)
             throw new \DomainException('Missing route matches; unsure how to retrieve action');
         }
 
-        $action = $routeMatch->getParam('action', 'index');
+        $action = $routeMatch->getParam('action', 'not-found');
         $method = static::getMethodFromAction($action);
 
         if (!method_exists($this, $method)) {

diff --git a/tests/Zend/Mvc/Controller/ActionControllerTest.php b/tests/Zend/Mvc/Controller/ActionControllerTest.php
@@ -29,11 +29,13 @@ public function setUp()
         StaticEventManager::resetInstance();
     }
 
-    public function testDispatchInvokesIndexActionWhenNoActionPresentInRouteMatch()
+    public function testDispatchInvokesNotFoundActionWhenNoActionPresentInRouteMatch()
     {
         $result = $this->controller->dispatch($this->request, $this->response);
+        $response = $this->controller->getResponse();
+        $this->assertEquals(404, $response->getStatusCode());
         $this->assertTrue(isset($result['content']));
-        $this->assertContains('Placeholder page', $result['content']);
+        $this->assertContains('Page not found', $result['content']);
     }
 
     public function testDispatchInvokesNotFoundActionWhenInvalidActionPresentInRouteMatch()