Redid the way the autoloader figures out what class was included due …

…to differences between PHP proper and HHVM
move-elevator · Nov 26, 2015 · 12bcb35 · 12bcb35
1 parent dcfe851
commit 12bcb35
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/autoload.php b/autoload.php
@@ -85,11 +85,23 @@ public static function loadFile($path)
 
         include $path;
 
+        $className  = null;
         $newClasses = array_diff(get_declared_classes(), $classes);
-        $className  = array_pop($newClasses);
+        foreach ($newClasses as $name) {
+            if (isset(self::$loadedFiles[$name]) === false) {
+                $className = $name;
+                break;
+            }
+        }
+
         if ($className === null) {
             $newClasses = array_diff(get_declared_interfaces(), $classes);
-            $className  = array_pop($newClasses);
+            foreach ($newClasses as $name) {
+                if (isset(self::$loadedFiles[$name]) === false) {
+                    $className = $name;
+                    break;
+                }
+            }
         }
 
         self::$loadedClasses[$path]    = $className;