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

Moving code from BakeShell to BakeTask.

Browse source 
Adding a base execute method to contain common code shared amongst all the bake tasks.
Updating test cases as $name attributes value has changed.
This commit is contained in:
mark_story 2010-10-18 23:09:23 -04:00
parent bd156bb601
commit 6900f470ad
11 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/console/shells/bake.php
View file

@ -50,15 +50,6 @@ class BakeShell extends Shell {
if (isset($this->params['connection'])) {
$this->{$task}->connection = $this->params['connection'];
}
foreach($this->args as $i => $arg) {
if (strpos($arg, '.')) {
list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
break;
}
}
if (isset($this->params['plugin'])) {
$this->{$task}->plugin = $this->params['plugin'];
}
}
}

22
cake/console/shells/tasks/bake.php
View file

@ -51,9 +51,27 @@ class BakeTask extends Shell {
public function getPath() {
$path = $this->path;
if (isset($this->plugin)) {
$name = substr($this->name, 0, strlen($this->name) - 4);
$path = $this->_pluginPath($this->plugin) . Inflector::pluralize(Inflector::underscore($name)) . DS;
$path = $this->_pluginPath($this->plugin) . Inflector::pluralize(Inflector::underscore($this->name)) . DS;
}
return $path;
}
/**
* Base execute method parses some parameters and sets some properties on the bake tasks.
* call when overriding execute()
*
* @return void
*/
public function execute() {
foreach($this->args as $i => $arg) {
if (strpos($arg, '.')) {
list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
break;
}
}
if (isset($this->params['plugin'])) {
$this->plugin = $this->params['plugin'];
}
}
}

1
cake/console/shells/tasks/controller.php
View file

@ -56,6 +56,7 @@ class ControllerTask extends BakeTask {
*
*/
public function execute() {
parent::execute();
if (empty($this->args)) {
return $this->_interactive();
}

1
cake/console/shells/tasks/fixture.php
View file

@ -95,6 +95,7 @@ class FixtureTask extends BakeTask {
* @return void
*/
public function execute() {
parent::execute();
if (empty($this->args)) {
$this->_interactive();
}

1
cake/console/shells/tasks/model.php
View file

@ -74,6 +74,7 @@ class ModelTask extends BakeTask {
*/
public function execute() {
App::import('Model', 'Model', false);
parent::execute();
if (empty($this->args)) {
$this->_interactive();

1
cake/console/shells/tasks/test.php
View file

@ -65,6 +65,7 @@ class TestTask extends BakeTask {
*
*/
public function execute() {
parent::execute();
if (empty($this->args)) {
$this->_interactive();
}

1
cake/console/shells/tasks/view.php
View file

@ -97,6 +97,7 @@ class ViewTask extends BakeTask {
*
*/
public function execute() {
parent::execute();
if (empty($this->args)) {
$this->_interactive();
}

2
cake/tests/cases/console/shells/tasks/controller.test.php
View file

@ -75,7 +75,7 @@ class ControllerTaskTest extends CakeTestCase {
array('in', 'out', 'err', 'hr', 'createFile', '_stop', '_checkUnitTest'),
array(&$this->Dispatcher, $out, $out, $in)
);
$this->Task->name = 'ControllerTask';
$this->Task->name = 'Controller';
$this->Task->Template = new TemplateTask($this->Dispatcher, $out, $out, $in);
$this->Task->Template->params['theme'] = 'default';

2
cake/tests/cases/console/shells/tasks/model.test.php
View file

@ -91,7 +91,7 @@ class ModelTaskTest extends CakeTestCase {
$this->Task->Test = $this->getMock('FixtureTask', array(), array(&$this->Dispatcher, $out, $out, $in));
$this->Task->Template = new TemplateTask($this->Task->Dispatch, $out, $out, $in);
$this->Task->name = 'ModelTask';
$this->Task->name = 'Model';
$this->Task->interactive = true;
}

2
cake/tests/cases/console/shells/tasks/test.test.php
View file

@ -250,7 +250,7 @@ class TestTaskTest extends CakeTestCase {
array('in', 'err', 'createFile', '_stop', 'isLoadableClass'),
array(&$this->Dispatcher, $out, $out, $in)
);
$this->Task->name = 'TestTask';
$this->Task->name = 'Test';
$this->Task->Template = new TemplateTask($this->Dispatcher, $out, $out, $in);
}

2
cake/tests/cases/console/shells/tasks/view.test.php
View file

@ -394,7 +394,7 @@ class ViewTaskTest extends CakeTestCase {
$this->Task->controllerName = 'ViewTaskComments';
$this->Task->controllerPath = 'view_task_comments';
$this->Task->plugin = 'TestTest';
$this->Task->name = 'ViewTask';
$this->Task->name = 'View';
$path = APP . 'plugins' . DS . 'test_test' . DS . 'views' . DS . 'view_task_comments' . DS . 'view.ctp';
$this->Task->expects($this->once())->method('createFile')