Only use cached class path in constructor if really an array

dwoo-project · Apr 18, 2018 · d87f96c · d87f96c
1 parent 751beca
commit d87f96c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/Dwoo/Loader.php b/lib/Dwoo/Loader.php
@@ -66,10 +66,19 @@ public function __construct($cacheDir)
 
         // include class paths or rebuild paths if the cache file isn't there
         $cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
+
+        $chachedClassPath = null;
+
         if (file_exists($cacheFile)) {
-            $classpath       = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
-        } else {
+
+            $chachedClassPath = unserialize(file_get_contents($cacheFile));
+
+            if (is_array($chachedClassPath)) {
+                $this->classPath = $chachedClassPath + $this->classPath;
+            }
+        }
+
+        if (!is_array($chachedClassPath)) {
             $this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
         }
     }