From bd6ed7cc7680da5a406d83ee7daabdc415c7130c Mon Sep 17 00:00:00 2001
From: guilhermeblanco <guilhermeblanco@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 22 Dec 2009 16:17:35 +0000
Subject: [PATCH] [2.0] Fixing more glitches found with CLI refactoring

---
 lib/Doctrine/Common/Cli/Tasks/HelpTask.php         | 14 ++++----------
 lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php   |  2 +-
 .../ORM/Tools/Cli/Tasks/ClearCacheTask.php         |  2 +-
 .../ORM/Tools/Cli/Tasks/GenerateProxiesTask.php    |  2 +-
 .../ORM/Tools/Cli/Tasks/SchemaToolTask.php         |  6 +++---
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/Doctrine/Common/Cli/Tasks/HelpTask.php b/lib/Doctrine/Common/Cli/Tasks/HelpTask.php
index 6dc18b75b..0fe3116e6 100644
--- a/lib/Doctrine/Common/Cli/Tasks/HelpTask.php
+++ b/lib/Doctrine/Common/Cli/Tasks/HelpTask.php
@@ -42,7 +42,9 @@ class HelpTask extends AbstractTask
      */
     public function buildDocumentation()
     {
-        // Does nothing
+        $doc = $this->getDocumentation();
+        $doc->setName('help')
+            ->setDescription('Exposes helpful information about all available tasks.');
     }
     
     /**
@@ -53,14 +55,6 @@ class HelpTask extends AbstractTask
         $this->run();
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function basicHelp()
-    {
-        $this->run();
-    }
-
     /**
      * Exposes the available tasks
      *
@@ -74,7 +68,7 @@ class HelpTask extends AbstractTask
         
         // Switch between ALL available tasks and display the basic Help of each one
         $availableTasks = $cliController->getAvailableTasks();
-        unset($availableTasks['Core:Help']);
+        //unset($availableTasks['Core:Help']);
         
         ksort($availableTasks);
         
diff --git a/lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php b/lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php
index 47bee97e6..5b6bb7b95 100644
--- a/lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php
+++ b/lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php
@@ -110,7 +110,7 @@ class RunSqlTask extends AbstractTask
                 $resultSet = $em->getConnection()->executeUpdate($arguments['sql']);
             }
             
-            $maxDepth = isset($args['arguments']) ? $arguments['depth'] : 7;
+            $maxDepth = isset($arguments['depth']) ? $arguments['depth'] : 7;
         
             Debug::dump($resultSet, $maxDepth);
         }
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
index 3d9b594eb..b0057e4b5 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
@@ -88,7 +88,7 @@ class ClearCacheTask extends AbstractTask
         // id, regex, prefix or suffix.
         if (
             (isset($arguments['query']) || isset($arguments['metadata'])) && (isset($arguments['id']) || 
-            isset($args['regex']) || isset($args['prefix']) || isset($args['suffix']))
+            isset($arguments['regex']) || isset($arguments['prefix']) || isset($arguments['suffix']))
         ) {
             throw new CliException(
                 'When clearing the query or metadata cache do not ' .
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
index 702c6228c..19b069247 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
@@ -59,7 +59,7 @@ class GenerateProxiesTask extends AbstractTask
         
         if ($metadataDriver instanceof \Doctrine\ORM\Mapping\Driver\AnnotationDriver) {
             if (isset($arguments['class-dir'])) {
-                $metadataDriver->setClassDirectory($args['class-dir']);
+                $metadataDriver->setClassDirectory($arguments['class-dir']);
             } else {
                 throw new CliException(
                     'The supplied configuration uses the annotation metadata driver. ' .
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
index 1022c79dd..a2d95eb9b 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
@@ -131,13 +131,13 @@ class SchemaToolTask extends AbstractTask
         }
 
         if ($isCompleteUpdate && ($isCreate || $isDrop || $isUpdate)) {
-            throw new CliException('You cannot use --update with --create, --drop or --update.');
+            throw new CliException('You cannot use --complete-update with --create, --drop or --update.');
         }
 
         if ( ! ($isCreate || $isDrop || $isUpdate || $isCompleteUpdate)) {
             throw new CliException(
-                'You must specify at a minimum one of the options ' .
-                '(--create, --drop, --update, --re-create or --complete-update).'
+                'You must specify at a minimum one of the options: ' .
+                '--create, --drop, --update, --re-create or --complete-update.'
             );
         }