From 8416e9bf004efa5f57652860970a2d1aaaddd365 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 21 Jul 2016 18:06:18 +0200
Subject: psysh: import from Fedora

---
 psysh-bin-autoload.patch | 119 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 psysh-bin-autoload.patch

(limited to 'psysh-bin-autoload.patch')

diff --git a/psysh-bin-autoload.patch b/psysh-bin-autoload.patch
new file mode 100644
index 0000000..a9e670a
--- /dev/null
+++ b/psysh-bin-autoload.patch
@@ -0,0 +1,119 @@
+diff --git a/bin/psysh b/bin/psysh
+index 4fbd223..ef7b940 100755
+--- a/bin/psysh
++++ b/bin/psysh
+@@ -10,91 +10,7 @@
+  * file that was distributed with this source code.
+  */
+ 
+-// Try to find an autoloader for a local psysh version.
+-// We'll wrap this whole mess in a Closure so it doesn't leak any globals.
+-call_user_func(function () {
+-    $cwd = null;
+-
+-    // Find the cwd arg (if present)
+-    $argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
+-    foreach ($argv as $i => $arg) {
+-        if ($arg === '--cwd') {
+-            if ($i >= count($argv) - 1) {
+-                echo 'Missing --cwd argument.' . PHP_EOL;
+-                exit(1);
+-            }
+-            $cwd = $argv[$i + 1];
+-            break;
+-        }
+-
+-        if (preg_match('/^--cwd=/', $arg)) {
+-            $cwd = substr($arg, 6);
+-            break;
+-        }
+-    }
+-
+-    // Or fall back to the actual cwd
+-    if (!isset($cwd)) {
+-        $cwd = getcwd();
+-    }
+-
+-    $cwd = str_replace('\\', '/', $cwd);
+-
+-    $chunks = explode('/', $cwd);
+-    while (!empty($chunks)) {
+-        $path = implode('/', $chunks);
+-
+-        // Find composer.json
+-        if (is_file($path . '/composer.json')) {
+-            if ($cfg = json_decode(file_get_contents($path . '/composer.json'), true)) {
+-                if (isset($cfg['name']) && $cfg['name'] === 'psy/psysh') {
+-                    // We're inside the psysh project. Let's use the local
+-                    // Composer autoload.
+-                    if (is_file($path . '/vendor/autoload.php')) {
+-                        require $path . '/vendor/autoload.php';
+-                    }
+-
+-                    return;
+-                }
+-            }
+-        }
+-
+-        // Or a composer.lock
+-        if (is_file($path . '/composer.lock')) {
+-            if ($cfg = json_decode(file_get_contents($path . '/composer.lock'), true)) {
+-                foreach (array_merge($cfg['packages'], $cfg['packages-dev']) as $pkg) {
+-                    if (isset($pkg['name']) && $pkg['name'] === 'psy/psysh') {
+-                        // We're inside a project which requires psysh. We'll
+-                        // use the local Composer autoload.
+-                        if (is_file($path . '/vendor/autoload.php')) {
+-                            require $path . '/vendor/autoload.php';
+-                        }
+-
+-                        return;
+-                    }
+-                }
+-            }
+-        }
+-
+-        array_pop($chunks);
+-    }
+-});
+-
+-// We didn't find an autoloader for a local version, so use the autoloader that
+-// came with this script.
+-if (!class_exists('Psy\Shell')) {
+-/* <<< */
+-    if (is_file(__DIR__ . '/../vendor/autoload.php')) {
+-        require __DIR__ . '/../vendor/autoload.php';
+-    } elseif (is_file(__DIR__ . '/../../../autoload.php')) {
+-        require __DIR__ . '/../../../autoload.php';
+-    } else {
+-        echo 'PsySH dependencies not found, be sure to run `composer install`.' . PHP_EOL;
+-        echo 'See https://getcomposer.org to get Composer.' . PHP_EOL;
+-        exit(1);
+-    }
+-/* >>> */
+-}
++require_once '__PHPDIR__/Psy/autoload.php';
+ 
+ // If the psysh binary was included directly, assume they just wanted an
+ // autoloader and bail early.
+@@ -115,21 +31,5 @@ if (Psy\Shell::isIncluded($trace)) {
+ // Clean up after ourselves.
+ unset($trace);
+ 
+-// If the local version is too old, we can't do this
+-if (!function_exists('Psy\bin')) {
+-    $argv = $_SERVER['argv'];
+-    $first = array_shift($argv);
+-    if (preg_match('/php(\.exe)?$/', $first)) {
+-        array_shift($argv);
+-    }
+-    array_unshift($argv, 'vendor/bin/psysh');
+-
+-    echo 'A local PsySH dependency was found, but it cannot be loaded. Please update to' . PHP_EOL;
+-    echo 'the latest version, or run the local copy directly, e.g.:' . PHP_EOL;
+-    echo PHP_EOL;
+-    echo '    ' . implode(' ', $argv) . PHP_EOL;
+-    exit(1);
+-}
+-
+ // And go!
+ call_user_func(Psy\bin());
-- 
cgit