adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

Browse source
This commit is contained in:
Renan Gonçalves 2011-05-29 14:01:51 +02:00
commit 2878614ca4
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Console/Command/Task/TestTask.php
View file

@ -467,7 +467,7 @@ class TestTask extends BakeTask {
public function getPath() {
$path = $this->path;
if (isset($this->plugin)) {
$path = $this->_pluginPath($this->plugin) . 'tests' . DS;
$path = $this->_pluginPath($this->plugin) . 'Test' . DS;
}
return $path;
}

2
lib/Cake/Console/Shell.php
View file

@ -149,7 +149,7 @@ class Shell extends Object {
*/
function __construct($stdout = null, $stderr = null, $stdin = null) {
if ($this->name == null) {
$this->name = Inflector::underscore(str_replace(array('Shell', 'Task'), '', get_class($this)));
$this->name = Inflector::camelize(str_replace(array('Shell', 'Task'), '', get_class($this)));
}
$this->Tasks = new TaskCollection($this);

13
lib/Cake/Test/Case/Console/Command/ShellTest.php
View file

@ -800,4 +800,17 @@ TEXT;
TEXT;
$this->assertEquals($expected, $result, 'Text not wrapped.');
}
/**
* Testing camel cased naming of tasks
*
* @access public
* @return void
*/
public function testShellNaming() {
$this->Shell->tasks = array('TestApple');
$this->Shell->loadTasks();
$expected = 'TestApple';
$this->assertEqual($expected, $this->Shell->TestApple->name);
}
}