Autoloader: fix cache handling (#4506)

redaxo · Feb 27, 2021 · 4ad304d · 4ad304d
1 parent e430740
commit 4ad304d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/redaxo/src/core/functions/function_rex_other.php b/redaxo/src/core/functions/function_rex_other.php
@@ -23,6 +23,7 @@ function rex_delete_cache()
         ->ignoreSystemStuff(false);
     rex_dir::deleteIterator($finder);
 
+    rex_autoload::removeCache();
     rex_clang::reset();
 
     if (function_exists('opcache_reset')) {

diff --git a/redaxo/src/core/lib/autoload.php b/redaxo/src/core/lib/autoload.php
@@ -29,6 +29,10 @@ class rex_autoload
      * @var bool
      */
     protected static $cacheChanged = false;
+    /**
+     * @var bool remember the cache was deleted, to make sure we don't generate a stale cache file
+     */
+    protected static $cacheDeleted = false;
     /**
      * @var bool
      */
@@ -162,7 +166,7 @@ private static function loadCache()
      */
     public static function saveCache()
     {
-        if (!self::$cacheChanged) {
+        if (!self::$cacheChanged || self::$cacheDeleted) {
             return;
         }
 
@@ -209,6 +213,7 @@ public static function reload($force = false)
     public static function removeCache()
     {
         rex_file::delete(self::$cacheFile);
+        self::$cacheDeleted = true;
     }
 
     /**
@@ -226,7 +231,6 @@ public static function addDirectory($dir)
         self::$addedDirs[] = $dir;
         if (!isset(self::$dirs[$dir])) {
             self::_addDirectory($dir);
-            self::$cacheChanged = true;
         }
     }
 
@@ -253,6 +257,7 @@ private static function _addDirectory($dir)
 
         if (!isset(self::$dirs[$dir])) {
             self::$dirs[$dir] = [];
+            self::$cacheChanged = true;
         }
         $files = self::$dirs[$dir];
         $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dirPath, RecursiveDirectoryIterator::SKIP_DOTS));