adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating ControllerTask to use ProjectTask.

Browse source
This commit is contained in:
mark_story 2009-06-30 20:49:58 -04:00
parent da99aa1c6a
commit ddc341e4de
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/console/libs/tasks/controller.php
View file

@ -44,7 +44,7 @@ class ControllerTask extends Shell {
* @var array * @var array
* @access public * @access public
*/ */
var $tasks = array('Model', 'Test', 'Template', 'DbConfig'); var $tasks = array('Model', 'Test', 'Template', 'DbConfig', 'Project');
/** /**
* path to CONTROLLERS directory * path to CONTROLLERS directory
* *
@ -86,7 +86,7 @@ class ControllerTask extends Shell {
$actions = 'scaffold'; $actions = 'scaffold';
} }
if ((isset($this->args[1]) && $this->args[1] == 'admin') || (isset($this->args[2]) && $this->args[2] == 'admin')) { if ((isset($this->args[1]) && $this->args[1] == 'admin') || (isset($this->args[2]) && $this->args[2] == 'admin')) {
if ($admin = $this->getAdmin()) { if ($admin = $this->Project->getAdmin()) {
$this->out('Adding ' . Configure::read('Routing.admin') .' methods'); $this->out('Adding ' . Configure::read('Routing.admin') .' methods');
if ($actions == 'scaffold') { if ($actions == 'scaffold') {
$actions = $this->bakeActions($controller, $admin); $actions = $this->bakeActions($controller, $admin);

10
cake/tests/cases/console/libs/tasks/controller.test.php
View file

@ -31,12 +31,12 @@ if (!class_exists('ShellDispatcher')) {
ob_end_clean(); ob_end_clean();
} }
require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'project.php';
require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'controller.php'; require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'model.php'; require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'model.php';
require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'template.php'; require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'template.php';
require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'test.php'; require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'test.php';
Mock::generatePartial( Mock::generatePartial(
'ShellDispatcher', 'TestControllerTaskMockShellDispatcher', 'ShellDispatcher', 'TestControllerTaskMockShellDispatcher',
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment') array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
@ -52,6 +52,11 @@ Mock::generatePartial(
array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest') array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
); );
Mock::generatePartial(
'ProjectTask', 'ControllerMockProjectTask',
array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest', 'getAdmin')
);
Mock::generate('TestTask', 'ControllerMockTestTask'); Mock::generate('TestTask', 'ControllerMockTestTask');
$imported = App::import('Model', 'Article'); $imported = App::import('Model', 'Article');
@ -97,6 +102,7 @@ class ControllerTaskTest extends CakeTestCase {
$this->Task->Dispatch->shellPaths = Configure::read('shellPaths'); $this->Task->Dispatch->shellPaths = Configure::read('shellPaths');
$this->Task->Template =& new TemplateTask($this->Task->Dispatch); $this->Task->Template =& new TemplateTask($this->Task->Dispatch);
$this->Task->Model =& new ControllerMockModelTask($this->Task->Dispatch); $this->Task->Model =& new ControllerMockModelTask($this->Task->Dispatch);
$this->Task->Project =& new ControllerMockProjectTask($this->Task->Dispatch);
} }
/** /**
@ -449,7 +455,7 @@ class ControllerTaskTest extends CakeTestCase {
if ($skip) { if ($skip) {
return; return;
} }
Configure::write('Routing.admin', 'admin'); $this->Task->Project->setReturnValue('getAdmin', 'admin_');
$this->Task->connection = 'test_suite'; $this->Task->connection = 'test_suite';
$this->Task->path = '/my/path/'; $this->Task->path = '/my/path/';
$this->Task->args = array('Articles', 'scaffold', 'admin'); $this->Task->args = array('Articles', 'scaffold', 'admin');