Просмотр исходного кода

ZF-11439
Zend_Tool
Convert module names to CamelCase before generating controller class names


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24120 44c647ce-9c0f-0410-b52a-842ac1e357ba

adamlundrigan 14 лет назад
Родитель
Сommit
c880d75ef5

+ 3 - 1
library/Zend/Tool/Project/Context/Zf/ControllerFile.php

@@ -100,7 +100,9 @@ class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Cont
      */
     public function getContents()
     {
-        $className = ($this->_moduleName) ? ucfirst($this->_moduleName) . '_' : '';
+        $filter = new Zend_Filter_Word_DashToCamelCase();
+        
+        $className = ($this->_moduleName) ? $filter->filter(ucfirst($this->_moduleName)) . '_' : '';
         $className .= ucfirst($this->_controllerName) . 'Controller';
 
         $codeGenFile = new Zend_CodeGenerator_Php_File(array(

+ 1 - 1
library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php

@@ -103,7 +103,7 @@ class Zend_Tool_Project_Context_Zf_TestApplicationControllerFile extends Zend_To
         /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */
         $controllerDirectoryResource = $this->_resource->getParentResource();
         if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') {
-            $className = ucfirst($controllerDirectoryResource->getParentResource()->getForModuleName())
+            $className = $filter->filter(ucfirst($controllerDirectoryResource->getParentResource()->getForModuleName()))
                 . '_' . $className;
         }