Detach cell parent when flushing cache to save memory

SpartnerNL · Feb 19, 2024 · e1f0930 · e1f0930
1 parent 763fe03
commit e1f0930
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/Cache/BatchCache.php b/src/Cache/BatchCache.php
@@ -3,6 +3,7 @@
 namespace Maatwebsite\Excel\Cache;
 
 use Illuminate\Support\Facades\Cache;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use Psr\SimpleCache\CacheInterface;
 
 class BatchCache implements CacheInterface

diff --git a/src/Cache/MemoryCache.php b/src/Cache/MemoryCache.php
@@ -2,6 +2,7 @@
 
 namespace Maatwebsite\Excel\Cache;
 
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use Psr\SimpleCache\CacheInterface;
 
 class MemoryCache implements CacheInterface
@@ -17,7 +18,7 @@ class MemoryCache implements CacheInterface
     protected $cache = [];
 
     /**
-     * @param  int|null  $memoryLimit
+     * @param int|null $memoryLimit
      */
     public function __construct(int $memoryLimit = null)
     {
@@ -131,6 +132,12 @@ public function flush(): array
     {
         $memory = $this->cache;
 
+        foreach ($memory as $cell) {
+            if ($cell instanceof Cell) {
+                $cell->detach();
+            }
+        }
+
         $this->clear();
 
         return $memory;

diff --git a/tests/QueuedImportTest.php b/tests/QueuedImportTest.php
@@ -63,6 +63,7 @@ public function test_can_queue_an_import_with_batch_cache_and_file_store()
         config()->set('queue.default', 'sync');
         config()->set('excel.cache.driver', 'batch');
         config()->set('excel.cache.illuminate.store', 'file');
+        config()->set('excel.cache.batch.memory_limit', 80);
 
         // Reset the cache settings
         $this->app->make(SettingsProvider::class)->provide();

diff --git a/tests/QueuedQueryExportTest.php b/tests/QueuedQueryExportTest.php
@@ -45,6 +45,7 @@ public function test_can_queue_an_export_with_batch_cache_and_file_store()
         config()->set('queue.default', 'sync');
         config()->set('excel.cache.driver', 'batch');
         config()->set('excel.cache.illuminate.store', 'file');
+        config()->set('excel.cache.batch.memory_limit', 80);
 
         // Reset the cache settings
         $this->app->make(SettingsProvider::class)->provide();