|
|
@@ -33,13 +33,13 @@ require_once 'Zend/Tool/Project/Provider/Abstract.php';
|
|
|
*/
|
|
|
class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstract
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* createResource()
|
|
|
*
|
|
|
* @param Zend_Tool_Project_Profile $profile
|
|
|
- * @param string $controllerName
|
|
|
* @param string $actionName
|
|
|
+ * @param string $controllerName
|
|
|
* @param string $moduleName
|
|
|
* @return Zend_Tool_Project_Profile_Resource
|
|
|
*/
|
|
|
@@ -49,21 +49,21 @@ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstrac
|
|
|
require_once 'Zend/Tool/Project/Provider/Exception.php';
|
|
|
throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createResource() expects \"actionName\" is the name of a controller resource to create.');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!is_string($controllerName)) {
|
|
|
require_once 'Zend/Tool/Project/Provider/Exception.php';
|
|
|
throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createResource() expects \"controllerName\" is the name of a controller resource to create.');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$profileSearchParams = array();
|
|
|
-
|
|
|
+
|
|
|
if ($moduleName) {
|
|
|
$profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
|
|
|
$noModuleSearch = null;
|
|
|
} else {
|
|
|
$noModuleSearch = array('ModulesDirectory');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$profileSearchParams[] = 'viewsDirectory';
|
|
|
$profileSearchParams[] = 'viewScriptsDirectory';
|
|
|
|
|
|
@@ -71,14 +71,14 @@ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstrac
|
|
|
require_once 'Zend/Tool/Project/Provider/Exception.php';
|
|
|
throw new Zend_Tool_Project_Provider_Exception('This project does not have a viewScriptsDirectory resource.');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$profileSearchParams['viewControllerScriptsDirectory'] = array('forControllerName' => $controllerName);
|
|
|
-
|
|
|
+
|
|
|
// XXXXXXXXX below is failing b/c of above search params
|
|
|
if (($viewControllerScriptsDirectory = $viewScriptsDirectory->search($profileSearchParams)) === false) {
|
|
|
$viewControllerScriptsDirectory = $viewScriptsDirectory->createResource('viewControllerScriptsDirectory', array('forControllerName' => $controllerName));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$newViewScriptFile = $viewControllerScriptsDirectory->createResource('ViewScriptFile', array('forActionName' => $actionName));
|
|
|
|
|
|
return $newViewScriptFile;
|
|
|
@@ -92,23 +92,23 @@ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstrac
|
|
|
*/
|
|
|
public function create($controllerName, $actionNameOrSimpleName)
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
if ($controllerName == '' || $actionNameOrSimpleName == '') {
|
|
|
require_once 'Zend/Tool/Project/Provider/Exception.php';
|
|
|
throw new Zend_Tool_Project_Provider_Exception('ControllerName and/or ActionName are empty.');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$profile = $this->_loadProfile();
|
|
|
-
|
|
|
- $view = self::createResource($profile, $controllerName, $actionNameOrSimpleName);
|
|
|
-
|
|
|
+
|
|
|
+ $view = self::createResource($profile, $actionNameOrSimpleName, $controllerName);
|
|
|
+
|
|
|
if ($this->_registry->getRequest()->isPretend()) {
|
|
|
$this->_registry->getResponse(
|
|
|
'Would create a view script in location ' . $view->getContext()->getPath()
|
|
|
);
|
|
|
} else {
|
|
|
$this->_registry->getResponse(
|
|
|
- 'Creating a view script in location ' . $view->getContext()->getPath()
|
|
|
+ 'Creating a view script in location ' . $view->getContext()->getPath()
|
|
|
);
|
|
|
$view->create();
|
|
|
$this->_storeProfile();
|