[console] Load command aliases. (#3413)

hechoendrupal · Jul 9, 2017 · d4acb53 · d4acb53
1 parent 030bdbe
commit d4acb53
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -151,18 +151,11 @@ private function registerCommands()
                 ->get('console.annotation_validator');
         }
 
-//        $aliases = $this->container->get('console.configuration_manager')
-//            ->getConfiguration()
-//            ->get('application.commands.aliases')?:[];
+        $aliases = $this->container->get('console.configuration_manager')
+            ->getConfiguration()
+            ->get('application.commands.aliases')?:[];
 
         foreach ($consoleCommands as $name) {
-            AnnotationRegistry::reset();
-            AnnotationRegistry::registerLoader(
-                [
-                    $this->container->get('class_loader'),
-                    "loadClass"
-                ]
-            );
 
             if (!$this->container->has($name)) {
                 continue;
@@ -212,13 +205,16 @@ private function registerCommands()
                 );
             }
 
-//            if (array_key_exists($command->getName(), $aliases)) {
-//                $commandAliases = $aliases[$command->getName()];
-//                if (!is_array($commandAliases)) {
-//                    $commandAliases = [$commandAliases];
-//                }
-//                $command->setAliases($commandAliases);
-//            }
+            if (array_key_exists($command->getName(), $aliases)) {
+                $commandAliases = array_merge(
+                    $command->getAliases(),
+                    $aliases[$command->getName()]
+                );
+                if (!is_array($commandAliases)) {
+                    $commandAliases = [$commandAliases];
+                }
+                $command->setAliases($commandAliases);
+            }
 
             $this->add($command);
         }

diff --git a/src/Command/Debug/ContainerCommand.php b/src/Command/Debug/ContainerCommand.php
@@ -52,7 +52,7 @@ protected function configure()
                 InputArgument::OPTIONAL,
                 $this->trans('commands.debug.container.arguments.arguments')
             )
-            ->setAliases(['cod']);
+            ->setAliases(['dco']);
     }
 
     /**