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

Updated the shell given @renansaddam pointers

Browse source
This commit is contained in:
Cees-Jan 2013-09-23 14:44:21 +02:00 committed by wyrihaximus
parent 79202ad8a0
commit 5c523a0cd5
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/Cake/Console/Command/CompletionShell.php
View file

@ -108,43 +108,41 @@ class CompletionShell extends CommandListShell {
* @return ConsoleOptionParser * @return ConsoleOptionParser
*/ */
public function getOptionParser() { public function getOptionParser() {
$translationDomain = 'bash_completion'; $parser = parent::getOptionParser();
$parser = AppShell::getOptionParser(); $parser->description(__d('cake_console', 'Used by shells like bash to autocomplete command name, options and arguments'))
$parser->description(__d($translationDomain, 'Used by bash to autocomplete command name, options and arguments'))
->addSubcommand('commands', array( ->addSubcommand('commands', array(
'help' => __d($translationDomain, 'Output a list of available commands'), 'help' => __d('cake_console', 'Output a list of available commands'),
'parser' => array( 'parser' => array(
'description' => __d($translationDomain, 'List all availables'), 'description' => __d('cake_console', 'List all availables'),
'arguments' => array( 'arguments' => array(
) )
) )
))->addSubcommand('subcommands', array( ))->addSubcommand('subcommands', array(
'help' => __d($translationDomain, 'Output a list of available subcommands'), 'help' => __d('cake_console', 'Output a list of available subcommands'),
'parser' => array( 'parser' => array(
'description' => __d($translationDomain, 'List subcommands for a command'), 'description' => __d('cake_console', 'List subcommands for a command'),
'arguments' => array( 'arguments' => array(
'command' => array( 'command' => array(
'help' => __d($translationDomain, 'The command name'), 'help' => __d('cake_console', 'The command name'),
'required' => true, 'required' => true,
) )
) )
) )
))->addSubcommand('options', array( ))->addSubcommand('options', array(
'help' => __d($translationDomain, 'Output a list of available options'), 'help' => __d('cake_console', 'Output a list of available options'),
'parser' => array( 'parser' => array(
'description' => __d($translationDomain, 'List options'), 'description' => __d('cake_console', 'List options'),
'arguments' => array( 'arguments' => array(
'command' => array( 'command' => array(
'help' => __d($translationDomain, 'The command name'), 'help' => __d('cake_console', 'The command name'),
'required' => false, 'required' => false,
) )
) )
) )
))->epilog( ))->epilog(
array( array(
'This command is not intended to be called manually', __d('cake_console', 'This command is not intended to be called manually'),
) )
); );
return $parser; return $parser;
@ -162,7 +160,7 @@ class CompletionShell extends CommandListShell {
$options = array(); $options = array();
foreach ($shellList as $type => $commands) { foreach ($shellList as $type => $commands) {
$prefix = ''; $prefix = '';
if (!in_array($type, array('app', 'core', 'APP', 'CORE'))) { if (!in_array(strtolower($type), array('app', 'core'))) {
$prefix = $type . '.'; $prefix = $type . '.';
} }
@ -187,12 +185,8 @@ class CompletionShell extends CommandListShell {
return array(); return array();
} }
$return = array();
$taskMap = TaskCollection::normalizeObjectArray((array)$Shell->tasks); $taskMap = TaskCollection::normalizeObjectArray((array)$Shell->tasks);
foreach ($taskMap as $task => $properties) { $return = array_keys($taskMap);
$return[] = $task;
}
$return = array_map('Inflector::underscore', $return); $return = array_map('Inflector::underscore', $return);
$ShellReflection = new ReflectionClass('AppShell'); $ShellReflection = new ReflectionClass('AppShell');
@ -222,11 +216,11 @@ class CompletionShell extends CommandListShell {
* @return mixed * @return mixed
*/ */
protected function _getShell($commandName) { protected function _getShell($commandName) {
list($plugin, $name) = pluginSplit($commandName, true); list($pluginDot, $name) = pluginSplit($commandName, true);
if ($plugin === 'CORE.' || $plugin === 'APP.' || $plugin === 'core.' || $plugin === 'app.') { if (in_array(strtolower($pluginDot), array('app.', 'core.'))) {
$commandName = $name; $commandName = $name;
$plugin = ''; $pluginDot = '';
} }
if (!in_array($commandName, $this->_commands())) { if (!in_array($commandName, $this->_commands())) {
@ -234,12 +228,12 @@ class CompletionShell extends CommandListShell {
} }
$name = Inflector::camelize($name); $name = Inflector::camelize($name);
$plugin = Inflector::camelize($plugin); $pluginDot = Inflector::camelize($pluginDot);
$class = $name . 'Shell'; $class = $name . 'Shell';
APP::uses($class, $plugin . 'Console/Command'); APP::uses($class, $pluginDot . 'Console/Command');
$Shell = new $class(); $Shell = new $class();
$Shell->plugin = trim($plugin, '.'); $Shell->plugin = trim($pluginDot, '.');
$Shell->initialize(); $Shell->initialize();
$Shell->loadTasks(); $Shell->loadTasks();