[ClassLoader] Fix declared classes being computed when not needed

2026-04-29 20:13:14 +02:00 · 2016-07-06 10:59:52 +02:00
1 changed files with 12 additions and 6 deletions
@@ -43,12 +43,12 @@ class ClassCollectionLoader

        self::$loaded[$name] = true;

-        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
-        if (function_exists('get_declared_traits')) {
-            $declared = array_merge($declared, get_declared_traits());
-        }
-
        if ($adaptive) {
+            $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+            if (function_exists('get_declared_traits')) {
+                $declared = array_merge($declared, get_declared_traits());
+            }
+
            // don't include already declared classes
            $classes = array_diff($classes, $declared);

@@ -87,11 +87,17 @@ class ClassCollectionLoader
            }
        }

-        if (!$reload && is_file($cache)) {
+        if (!$reload && file_exists($cache)) {
            require_once $cache;

            return;
        }
+        if (!$adaptive) {
+            $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+            if (function_exists('get_declared_traits')) {
+                $declared = array_merge($declared, get_declared_traits());
+            }
+        }

        $files = array();
        $content = '';