move 'sql' aliasing to Runner

diff --git a/php/WP_CLI/Dispatcher/RootCommand.php b/php/WP_CLI/Dispatcher/RootCommand.php
index 9fc159a..fb9b05d 100644 (file)
--- a/php/WP_CLI/Dispatcher/RootCommand.php
+++ b/php/WP_CLI/Dispatcher/RootCommand.php
@@ -91,13 +91,6 @@ EOB
        function find_subcommand( &$args ) {
                $command = array_shift( $args );
 
-               $aliases = array(
-                       'sql' => 'db'
-               );
-
-               if ( isset( $aliases[ $command ] ) )
-                       $command = $aliases[ $command ];
-
                Utils\load_command( $command );
 
                if ( !isset( $this->subcommands[ $command ] ) ) {

diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
index 621097b..6b17b49 100644 (file)
--- a/php/WP_CLI/Runner.php
+++ b/php/WP_CLI/Runner.php
@@ -223,6 +223,11 @@ class Runner {
                        unset( $assoc_args['help'] );
                }
 
+               // sql  ->  db
+               if ( count( $args ) > 0 && 'sql' == $args[0] ) {
+                       $args[0] = 'db';
+               }
+
                // {plugin|theme} update --all  ->  {plugin|theme} update-all
                if ( count( $args ) > 1 && in_array( $args[0], array( 'plugin', 'theme' ) )
                        && $args[1] == 'update' && isset( $assoc_args['all'] )