Do not load config from empty cache file

This change solves a fatal error that I've been encountering, whenever the cache file is present, but empty: Uncaught TypeError: Cannot assign int to property Laminas\ConfigAggregator\ConfigAggregator::$config of type array So, this change returns false if the config file is present but empty. Signed-off-by: Matthew Setter <[email protected]>
laminas · Jun 19, 2024 · 3d200e8 · 3d200e8
1 parent 49df885
commit 3d200e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/ConfigAggregator.php b/src/ConfigAggregator.php
@@ -17,6 +17,7 @@
 use function class_exists;
 use function date;
 use function file_exists;
+use function filesize;
 use function gettype;
 use function is_array;
 use function is_callable;
@@ -257,6 +258,10 @@ private function loadConfigFromCache(null|string $cachedConfigFile): bool
             return false;
         }
 
+        if (filesize($cachedConfigFile) === 0) {
+            return false;
+        }
+
         $this->config = require $cachedConfigFile;
         return true;
     }

diff --git a/test/ConfigAggregatorTest.php b/test/ConfigAggregatorTest.php
@@ -230,6 +230,14 @@ public function testConfigAggregatorSetsHandlesUnwritableCache(): void
         self::assertFileDoesNotExist($this->cacheFile);
     }
 
+    public function testConfigAggregatorDoesNotLoadConfigFromCacheIfCacheFileIsEmpty(): void
+    {
+        file_put_contents($this->cacheFile, '');
+        $aggregator = new ConfigAggregator([], $this->cacheFile);
+
+        self::assertEmpty($aggregator->getMergedConfig());
+    }
+
     public function testConfigAggregatorCanLoadConfigFromCache(): void
     {
         $expected = [