always use bundled autoload in Phar file

see #658

diff --git a/composer.json b/composer.json
index 8e1c9f7..91247c4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
                "psy/psysh": "Enhanced `wp shell` functionality"
        },
        "autoload": {
-               "psr-0": { "WP_CLI": "php" }
+               "psr-0": { "WP_CLI": "php" },
+               "files": [ "php/Spyc.php" ]
        },
        "require-dev": {
                "symfony/finder": "~2.3"

diff --git a/php/utils.php b/php/utils.php
index 9c94504..7db1d12 100644 (file)
--- a/php/utils.php
+++ b/php/utils.php
@@ -8,6 +8,11 @@ use \WP_CLI\Dispatcher;
 use \WP_CLI\Iterators\Transform;
 
 function load_dependencies() {
+       if ( 0 === strpos( WP_CLI_ROOT, 'phar:' ) ) {
+               require WP_CLI_ROOT . '/vendor/autoload.php';
+               return;
+       }
+
        $vendor_paths = array(
                WP_CLI_ROOT . '/../../../vendor',  // part of a larger project / installed via Composer (preferred)
                WP_CLI_ROOT . '/vendor',           // top-level project / installed as Git clone
@@ -27,8 +32,6 @@ function load_dependencies() {
                fputs( STDERR, "Internal error: Can't find Composer autoloader.\n" );
                exit(3);
        }
-
-       include WP_CLI_ROOT . '/php/Spyc.php';
 }
 
 function load_command( $name ) {