RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-07 15:59:27 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-223] Enhanced CLI re-importing the Global Arguments functionality

Browse Source
This commit is contained in:
guilhermeblanco 2010-01-06 17:55:55 +00:00
parent 3ec23c7272
commit d2b59d7a72
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/Common/Cli/CliController.php
View File

@ -162,11 +162,6 @@ class CliController extends AbstractNamespace
$taskName = array_pop($taskPath); $taskName = array_pop($taskPath);
$taskNamespace = $this->_retrieveTaskNamespace($taskPath); $taskNamespace = $this->_retrieveTaskNamespace($taskPath);
// Merge global configuration if it exists
if (($globalArgs = $this->getConfiguration()->getAttribute('globalArguments')) !== null) {
$args = array_merge($globalArgs, $args);
}
$taskNamespace->runTask($taskName, $args); $taskNamespace->runTask($taskName, $args);
} }

6
lib/Doctrine/Common/Cli/TaskNamespace.php
View File

@ -213,6 +213,12 @@ class TaskNamespace extends AbstractNamespace
{ {
try { try {
$task = $this->getTask($name); $task = $this->getTask($name);
// Merge global configuration if it exists
if (($globalArgs = $this->getConfiguration()->getAttribute('globalArguments')) !== null) {
$arguments = array_merge($globalArgs, $arguments);
}
$task->setArguments($arguments); $task->setArguments($arguments);
if ((isset($arguments['help']) && $arguments['help']) || (isset($arguments['h']) && $arguments['h'])) { if ((isset($arguments['help']) && $arguments['help']) || (isset($arguments['h']) && $arguments['h'])) {