Merge branch 'froschdesign-hotfix/440'

Author: akrabat

library/Zend/Controller/Action/Helper/ViewRenderer.php

@@ -841,14 +841,21 @@ protected function _translateSpec(array $vars = array())
         $inflector  = $this->getInflector();
         $request    = $this->getRequest();
         $dispatcher = $this->getFrontController()->getDispatcher();
-        $module     = $dispatcher->formatModuleName($request->getModuleName());
-        $controller = $dispatcher->formatControllerName(
-            $request->getControllerName()
-        );
+
+        // Format module name
+        $module = $dispatcher->formatModuleName($request->getModuleName());
+
+        // Format controller name
+        require_once 'Zend/Filter/Word/CamelCaseToDash.php';
+        $filter     = new Zend_Filter_Word_CamelCaseToDash();
+        $controller = $filter->filter($request->getControllerName());
+        $controller = $dispatcher->formatControllerName($controller);
         if ('Controller' == substr($controller, -10)) {
             $controller = substr($controller, 0, -10);
         }
-        $action     = $dispatcher->formatActionName($request->getActionName());
+
+        // Format action name
+        $action = $dispatcher->formatActionName($request->getActionName());
 
         $params     = compact('module', 'controller', 'action');
         foreach ($vars as $key => $value) {

tests/Zend/Controller/Action/Helper/ViewRendererTest.php

@@ -938,6 +938,25 @@ public function providerControllerNameDoesNotIncludeDisallowedCharacters()
         );
     }
 
+    /**
+     * @group GH-440
+     */
+    public function testControllerNameFormattingShouldRespectWordCamelCaseToDash()
+    {
+       $this->request->setControllerName('MetadataValidation')
+                     ->setActionName('index');
+
+       $this->helper->setActionController(
+           new Bar_IndexController(
+               $this->request, $this->response, array()
+           )
+       );
+
+       $this->assertEquals(
+           'metadata-validation/index.phtml', $this->helper->getViewScript()
+       );
+    }
+
     protected function _normalizePath($path)
     {
         return str_replace(array('/', '\\'), '/', $path);