Fixes zendframework#440 - Zend_Controller_Dispatcher_Abstract::_forma…

…tName() inconsistent with name handling
tripsta · Jun 17, 2016 · f5e0810 · f5e0810
1 parent 96fb075
commit f5e0810
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/library/Zend/Controller/Action/Helper/ViewRenderer.php b/library/Zend/Controller/Action/Helper/ViewRenderer.php
@@ -842,7 +842,11 @@ protected function _translateSpec(array $vars = array())
         $request    = $this->getRequest();
         $dispatcher = $this->getFrontController()->getDispatcher();
         $module     = $dispatcher->formatModuleName($request->getModuleName());
-        $controller = $request->getControllerName();
+        $controller = substr(
+            $dispatcher->formatControllerName($request->getControllerName()),
+            0,
+            -10
+        );
         $action     = $dispatcher->formatActionName($request->getActionName());
 
         $params     = compact('module', 'controller', 'action');

diff --git a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
@@ -904,6 +904,40 @@ public function providerViewScriptNameDoesNotIncludeDisallowedCharacters()
         );
     }
 
+    /**
+     * @group GH-440
+     * @dataProvider providerControllerNameDoesNotIncludeDisallowedCharacters
+     */
+    public function testControllerNameDoesNotIncludeDisallowedCharacters($controllerName)
+    {
+        $this->request->setControllerName($controllerName)
+                      ->setActionName('index');
+
+        $this->helper->setActionController(
+            new Bar_IndexController(
+                $this->request, $this->response, array()
+            )
+        );
+
+        $this->assertEquals(
+            'index/index.phtml', $this->helper->getViewScript()
+        );
+    }
+
+    /**
+     * Data provider for testControllerNameDoesNotIncludeDisallowedCharacters
+     * @group GH-440
+     * @return array
+     */
+    public function providerControllerNameDoesNotIncludeDisallowedCharacters()
+    {
+        return array(
+            array('!index'),
+            array('@index'),
+            array('-index'),
+        );
+    }
+
     protected function _normalizePath($path)
     {
         return str_replace(array('/', '\\'), '/', $path);