add support for PsySH in `wp shell`

also, replace Boris as suggested package

diff --git a/bin/ci/install_dependencies.sh b/bin/ci/install_dependencies.sh
index 6fbef59..1b2e572 100755 (executable)
--- a/bin/ci/install_dependencies.sh
+++ b/bin/ci/install_dependencies.sh
@@ -9,7 +9,6 @@ curl http://behat.org/downloads/behat.phar > behat.phar
 
 # install dependencies
 composer install --no-interaction --prefer-source
-composer require d11wtq/boris=dev-master --no-interaction --prefer-source
 
 # set up WP install
 ./bin/wp core download --version=$WP_VERSION --path=/tmp/wp-cli-test-core-download-cache/

diff --git a/composer.json b/composer.json
index a572e0a..0e5aa54 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
                "rmccue/requests": "dev-master"
        },
        "suggest": {
-               "d11wtq/boris": "Enhanced `wp shell` functionality"
+               "psy/psysh": "Enhanced `wp shell` functionality"
        },
        "autoload": {
                "psr-0": { "WP_CLI": "php" }

diff --git a/php/commands/shell.php b/php/commands/shell.php
index ef0869e..ee95860 100644 (file)
--- a/php/commands/shell.php
+++ b/php/commands/shell.php
@@ -18,20 +18,27 @@ class Shell_Command extends \WP_CLI_Command {
         */
        public function __invoke( $_, $assoc_args ) {
                $implementations = array(
+                       '\\Psy\\Shell',
                        '\\Boris\\Boris',
                        '\\WP_CLI\\REPL',
                );
 
                if ( isset( $assoc_args['basic'] ) ) {
-                       unset( $implementations[0] );
+                       $class = '\\WP_CLI\\REPL';
+               } else {
+                       foreach ( $implementations as $candidate ) {
+                               if ( class_exists( $candidate ) ) {
+                                       $class = $candidate;
+                                       break;
+                               }
+                       }
                }
 
-               foreach ( $implementations as $class ) {
-                       if ( class_exists( $class ) ) {
-                               $repl = new $class( 'wp> ' );
-                               $repl->start();
-                               break;
-                       }
+               if ( '\\Psy\\Shell' == $class ) {
+                       \Psy\Shell::debug();
+               } else {
+                       $repl = new $class( 'wp> ' );
+                       $repl->start();
                }
        }
 }