Fixed PHAR support with new composer autoloader support (ref #1259)

move-elevator · Jan 25, 2017 · 890832b · 890832b
1 parent b03ae89
commit 890832b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/autoload.php b/autoload.php
@@ -57,7 +57,9 @@ public static function load($class)
         // as we need to include all files so we can figure out what
         // the class/interface/trait name is.
         if (self::$composerAutoloader === null) {
-            if (file_exists(__DIR__.'/../../autoload.php') === true) {
+            if (strpos(__DIR__, 'phar://') !== 0
+                && file_exists(__DIR__.'/../../autoload.php') === true
+            ) {
                 self::$composerAutoloader = include_once __DIR__.'/../../autoload.php';
                 self::$composerAutoloader->unregister();
             } else {
@@ -107,9 +109,11 @@ public static function load($class)
      */
     public static function loadFile($path)
     {
-        $path = realpath($path);
-        if ($path === false) {
-            return false;
+        if (strpos(__DIR__, 'phar://') !== 0) {
+            $path = realpath($path);
+            if ($path === false) {
+                return false;
+            }
         }
 
         if (isset(self::$loadedClasses[$path]) === true) {