From 3ec23c727236f0948d416b8424d8c7aacd4ccbbb Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Wed, 6 Jan 2010 17:35:37 +0000 Subject: [PATCH] [2.0][DDC-223] Enhanced CLI re-importing the Global Arguments functionality --- lib/Doctrine/Common/Cli/CliController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Doctrine/Common/Cli/CliController.php b/lib/Doctrine/Common/Cli/CliController.php index 848bd0429..f6532411e 100644 --- a/lib/Doctrine/Common/Cli/CliController.php +++ b/lib/Doctrine/Common/Cli/CliController.php @@ -161,6 +161,11 @@ class CliController extends AbstractNamespace // Find the correct namespace where the task is defined $taskName = array_pop($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); }