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

Grabbing the first available config defined in connection manager as a default for baking. Fixing a couple of failing test cases

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-10-03 11:54:40 -04:30
parent 84f805419d
commit d08f916179
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Console/Command/Task/DbConfigTask.php
View file

@ -355,14 +355,14 @@ class DbConfigTask extends Shell {
App::uses('ConnectionManager', 'Model');
$configs = ConnectionManager::enumConnectionObjects();
$useDbConfig = 'default';
$useDbConfig = current($configs);
if (!is_array($configs) || empty($configs)) {
return $this->execute();
}
$connections = array_keys($configs);
if (count($connections) > 1) {
$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, 'default');
$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, $useDbConfig);
}
return $useDbConfig;
}

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

@ -190,15 +190,10 @@ class TestTask extends BakeTask {
* @return string Class name the user chose.
*/
public function getClassName($objectType) {
$type = strtolower($objectType);
$type = ucfirst(strtolower($objectType));
$typeLength = strlen($type);
$type = $this->classTypes[$type];
if ($this->plugin) {
if ($type === 'helper') {
$type = 'View/Helper';
} elseif ($type === 'component') {
$type = 'Controller/Component';
} elseif ($type === 'behavior') {
$type = 'Model/Behavior';
}
$plugin = $this->plugin . '.';
$options = App::objects($plugin . $type);
} else {
@ -212,7 +207,10 @@ class TestTask extends BakeTask {
}
$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
if (isset($options[$selection - 1])) {
return $options[$selection - 1];
$selection = $options[$selection - 1];
}
if ($type !== 'Model') {
$selection = substr($selection, 0, $typeLength * - 1);
}
return $selection;
}

2
lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
View file

@ -543,7 +543,7 @@ class TestTaskTest extends CakeTestCase {
CakePlugin::load('TestPlugin');
$this->Task->plugin = 'TestPlugin';
$path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperHelperTest.php';
$path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperTest.php';
$this->Task->expects($this->any())
->method('in')
->will($this->onConsecutiveCalls(