Merge pull request #183 from alprs/fix-autoloader

Ensure compatibility with multiple composer autoloaders
nikic · Mar 14, 2015 · 68defc2 · 68defc2
2 parents 251e689 + d225555
commit 68defc2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/PhpParser/Autoloader.php b/lib/PhpParser/Autoloader.php
@@ -7,14 +7,25 @@
  */
 class Autoloader
 {
+    /**
+     * Whether the autoloader has been registered.
+     *
+     * @var boolean
+     */
+    protected static $registered = false;
+
     /**
      * Registers PhpParser\Autoloader as an SPL autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader instead of appending
      */
     static public function register($prepend = false) {
+        if (static::$registered === true) {
+            return;
+        }
         ini_set('unserialize_callback_func', 'spl_autoload_call');
         spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        static::$registered = true;
     }
 
     /**

diff --git a/lib/bootstrap.php b/lib/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
 
-require __DIR__ . '/PhpParser/Autoloader.php';
-PhpParser\Autoloader::register();
+if (!class_exists('PhpParser\Autoloader')) {
+    require __DIR__ . '/PhpParser/Autoloader.php';
+}
+PhpParser\Autoloader::register();