Merge pull request #118 from swlodarski-sumoheavy/10.1.x

SP-939: fix of warning: ZipArchive::close(): Failure to create temporary file: No such file or directory
bitpay · Jan 21, 2025 · 1d64708 · 1d64708
2 parents 467af6c + bbefffe
commit 1d64708
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/Model/SupportPackage.php b/Model/SupportPackage.php
@@ -130,20 +130,24 @@ public function __construct(
      */
     public function prepareDownloadArchive()
     {
-        $path = $this->directoryList->getPath(DirectoryList::TMP) . '/bitpay-support.zip';
+        $zipDir = $this->directoryList->getPath(DirectoryList::TMP) . DIRECTORY_SEPARATOR;
+        if (!$this->fileDriver->isExists($zipDir)) {
+            $this->fileDriver->createDirectory($zipDir);
+        }
+        $zipPath = $zipDir . 'bitpay-support.zip';
 
-        $this->zipArchive->open($path, \ZipArchive::CREATE);
+        $this->zipArchive->open($zipPath, ZipArchive::CREATE | ZipArchive::OVERWRITE);
         $this->zipArchive->addFromString(
             'bitpay-support.json',
             $this->jsonSerializer->serialize($this->prepareSupportDetails())
         );
-        $logPath = $this->directoryList->getPath(DirectoryList::LOG) . '/bitpay.log';
+        $logPath = $this->directoryList->getPath(DirectoryList::LOG) . DIRECTORY_SEPARATOR . 'bitpay.log';
         if ($this->fileDriver->isExists($logPath)) {
             $this->zipArchive->addFile($logPath, 'bitpay.log');
         }
         $this->zipArchive->close();
 
-        return $path;
+        return $zipPath;
     }
 
     /**

diff --git a/Test/Unit/Model/SupportPackageTest.php b/Test/Unit/Model/SupportPackageTest.php
@@ -184,9 +184,21 @@ public function testPrepareDownloadArchive()
                 [DirectoryList::LOG, '/log']
             ]));
 
-        $this->fileDriverMock->method('isExists')
-            ->with($logPath)
-            ->willReturn(true);
+        $invokedCount = $this->exactly(2);
+        $this->fileDriverMock->expects($invokedCount)
+            ->method('isExists')
+            ->willReturnCallback(function ($parameters) use ($invokedCount, $tmpPath, $logPath) {
+                if ($invokedCount->getInvocationCount() === 1) {
+                    $this->assertSame($tmpPath . '/', $parameters);
+
+                    return true;
+                }
+
+                if ($invokedCount->getInvocationCount() === 2) {
+                    $this->assertSame($logPath, $parameters);
+                    return true;
+                }
+            });
 
         $this->jsonSerializerMock->method('serialize')
             ->willReturn('{"key":"value"}');
@@ -215,7 +227,7 @@ public function testPrepareDownloadArchive()
 
         $this->zipArchiveMock->expects($this->once())
             ->method('open')
-            ->with($archivePath, \ZipArchive::CREATE)
+            ->with($archivePath, ZipArchive::CREATE | ZipArchive::OVERWRITE)
             ->willReturn(true);
         $this->zipArchiveMock->expects($this->once())
             ->method('addFromString')