fix #40;

clear buffers & remove tmp files
aVadim483 · Oct 8, 2023 · eabfda8 · eabfda8
1 parent 2a33503
commit eabfda8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/FastExcelWriter/Writer.php b/src/FastExcelWriter/Writer.php
@@ -168,15 +168,14 @@ class Writer
     . '|sort'
     . ')\s*\(/mui';
 
+    protected static array $buffers = [];
+
     /** @var Excel */
     protected $excel;
 
     /** @var array */
     protected array $tempFiles = [];
 
-    /** @var array */
-    protected array $tempXlsx = [];
-
     /** @var string */
     protected $tempDir = '';
 
@@ -211,11 +210,10 @@ public function __construct(?array $options = [])
      */
     public function __destruct()
     {
-        if (!empty($this->tempFiles['zip'])) {
-            foreach ($this->tempFiles['zip'] as $tempFile) {
-                if (is_file($tempFile)) {
-                    @unlink($tempFile);
-                }
+        foreach (self::$buffers as $name => $buffer) {
+            if ($buffer) {
+                $buffer->close();
+                self::$buffers[$name] = null;
             }
         }
         if (!empty($this->tempFiles['tmp'])) {
@@ -235,9 +233,14 @@ public function __destruct()
      *
      * @return WriterBuffer
      */
-    public static function makeWriteBuffer(string $fileName)
+    public static function makeWriteBuffer(string $fileName): WriterBuffer
     {
-        return new WriterBuffer($fileName);
+        if (isset(self::$buffers[$fileName])) {
+            self::$buffers[$fileName] = null;
+        }
+        self::$buffers[$fileName] = new WriterBuffer($fileName);
+
+        return self::$buffers[$fileName];
     }
 
     /**
@@ -276,9 +279,7 @@ public function tempFilename($localName = null)
             if ($localName) {
                 $this->tempFiles['zip'][$localName] = $filename;
             }
-            else {
-                $this->tempFiles['tmp'][] = $filename;
-            }
+            $this->tempFiles['tmp'][] = $filename;
         }
 
         return $filename;

diff --git a/src/FastExcelWriter/WriterBuffer.php b/src/FastExcelWriter/WriterBuffer.php
@@ -40,7 +40,7 @@ public function __construct(string $filename, ?string $openFlags = 'wb', ?bool $
     /**
      * @return string
      */
-    public function getFileName()
+    public function getFileName(): string
     {
         return $this->fileName;
     }