From 2fbc766de75c1e61a4f659a2c4d8c154ac76e8d3 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 1 Nov 2009 17:58:56 +0000
Subject: [PATCH] [2.0][DDC-82] Fixed CLI problems introduced by changeset
 6582.

---
 lib/Doctrine/ORM/Tools/Cli.php                           | 6 +++---
 lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php      | 4 ----
 lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php  | 4 ----
 lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php | 4 ----
 lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php          | 4 ----
 lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php          | 4 ----
 lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php      | 4 ----
 7 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Cli.php b/lib/Doctrine/ORM/Tools/Cli.php
index b62eac970..639d281e6 100644
--- a/lib/Doctrine/ORM/Tools/Cli.php
+++ b/lib/Doctrine/ORM/Tools/Cli.php
@@ -167,7 +167,7 @@ class Cli
                 // Check if task exists
                 if (isset($this->_tasks[$taskName]) && class_exists($this->_tasks[$taskName], true)) {
                     // Initializing EntityManager
-                    $em = $this->_initializeEntityManager($processedArgs);
+                    $em = $this->_initializeEntityManager($processedArgs, $taskArguments);
                 
                     // Instantiate and execute the task
                     $task = new $this->_tasks[$taskName]();
@@ -322,7 +322,7 @@ class Cli
      * @param array CLI Task arguments
      * @return EntityManager
      */
-    private function _initializeEntityManager(& $args)
+    private function _initializeEntityManager(array $args, array &$taskArgs)
     {
         // Initialize EntityManager
         $configFile = ( ! isset($args['config'])) ? './cli-config.php' : $args['config'];
@@ -341,7 +341,7 @@ class Cli
             // Check for gloal argument options here
             if (isset($globalArguments)) {
                 // Merge arguments. Values specified via the CLI take preference.
-                $args = array_merge($globalArguments, $args);
+                $taskArgs = array_merge($globalArguments, $taskArgs);
             }
             
             return $em;
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
index 106f88bd2..59eddea0b 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
@@ -79,10 +79,6 @@ class ClearCacheTask extends AbstractTask
 
     public function validate()
     {
-        if ( ! parent::validate()) {
-            return false;
-        }
-
         $printer = $this->getPrinter();
         $args = $this->getArguments();
 
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
index da556798c..62b8455a8 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
@@ -90,10 +90,6 @@ class ConvertMappingTask extends AbstractTask
      */    
     public function validate()
     {
-        if ( ! parent::validate()) {
-            return false;
-        }
-        
         $args = $this->getArguments();
         $printer = $this->getPrinter();
 
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
index d36a2f15a..1af46c099 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
@@ -52,10 +52,6 @@ class GenerateProxiesTask extends AbstractTask
      */
     public function validate()
     {
-        if ( ! parent::validate()) {
-            return false;
-        }
-        
         $args = $this->getArguments();
         $printer = $this->getPrinter();
         
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php
index b39b9037e..59718571e 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php
@@ -77,10 +77,6 @@ class RunDqlTask extends AbstractTask
      */
     public function validate()
     {
-        if ( ! parent::validate()) {
-            return false;
-        }
-        
         $args = $this->getArguments();
         $printer = $this->getPrinter();
         
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php
index 5dd511772..c1df9987e 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php
@@ -83,10 +83,6 @@ class RunSqlTask extends AbstractTask
      */
     public function validate()
     {
-        if ( ! parent::validate()) {
-            return false;
-        }
-        
         $args = $this->getArguments();
         $printer = $this->getPrinter();
         
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
index 46404f1ee..13fea81f3 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
@@ -99,10 +99,6 @@ class SchemaToolTask extends AbstractTask
      */
     public function validate()
     {
-        if ( ! parent::validate()) {
-            return false;
-        }
-        
         $args = $this->getArguments();
         $printer = $this->getPrinter();