Fezfez patch 1 (#36)

* Update Restore.php * fix ci * fix ci * merge master
fezfez · Jan 6, 2023 · 09dd831 · 09dd831
1 parent 1576807
commit 09dd831
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/src/BackupManager.php b/src/BackupManager.php
@@ -38,10 +38,9 @@ public function backup(
         LocalFilesystemAdapter $localFileSystem,
         Database $database,
         array $destinations,
-        string $localTmpPath,
         Compressor ...$compression,
     ): void {
-        $this->backupProcedure->__invoke($localFileSystem, $database, $destinations, $localTmpPath, ...$compression);
+        $this->backupProcedure->__invoke($localFileSystem, $database, $destinations, ...$compression);
     }
 
     public function restore(

diff --git a/src/BackupManagerContract.php b/src/BackupManagerContract.php
@@ -17,7 +17,6 @@ public function backup(
         LocalFilesystemAdapter $localFileSystem,
         Database $database,
         array $destinations,
-        string $localTmpPath,
         Compressor ...$compression,
     ): void;
 

diff --git a/src/Procedures/Backup.php b/src/Procedures/Backup.php
@@ -29,10 +29,9 @@ public function __invoke(
         LocalFilesystemAdapter $localFileSystem,
         Database $database,
         array $destinations,
-        string $localTmpPath,
         Compressor ...$compressorList,
     ): void {
-        $tmpPath = sprintf('%s/%s', $localTmpPath, uniqid());
+        $tmpPath = sprintf('%s/%s', $localFileSystem->getRootPath(), uniqid());
 
         $this->shellProcessor->__invoke(Process::fromShellCommandline($database->getDumpCommandLine($tmpPath)));
 

diff --git a/src/Procedures/BackupProcedure.php b/src/Procedures/BackupProcedure.php
@@ -16,7 +16,6 @@ public function __invoke(
         LocalFilesystemAdapter $localFileSystem,
         Database $database,
         array $destinations,
-        string $localTmpPath,
         Compressor ...$compressor,
     ): void;
 }
diff --git a/src/Procedures/Restore.php b/src/Procedures/Restore.php
@@ -32,7 +32,7 @@ public function __invoke(
         Compressor ...$compressorList,
     ): void {
         // begin the life of a new working file
-        $workingFile = sprintf('%s/%s', basename($sourcePath), uniqid());
+        $workingFile = sprintf('%s/%s', $localFileSystem->getRootPath(), uniqid()) . '.gz';
 
         // download or retrieve the archived backup file
 

diff --git a/tests/BackupManagerTest.php b/tests/BackupManagerTest.php
@@ -28,10 +28,10 @@ public function testCreateABackupProcedure(): void
 
         $sUT = new BackupManager($backupProcedure, $restoreProcedure);
 
-        $backupProcedure->expects(self::once())->method('__invoke')->with($local, $database, [$destination], 'tutu', $compressor);
+        $backupProcedure->expects(self::once())->method('__invoke')->with($local, $database, [$destination], $compressor);
         $restoreProcedure->expects(self::once())->method('__invoke')->with($local, $to, 'toto', $database, $compressor);
 
-        $sUT->backup($local, $database, [$destination], 'tutu', $compressor);
+        $sUT->backup($local, $database, [$destination], $compressor);
         $sUT->restore($local, $to, 'toto', $database, $compressor);
     }
 }
diff --git a/tests/Procedures/BackupTest.php b/tests/Procedures/BackupTest.php
@@ -40,6 +40,6 @@ public function testOk(): void
         $local->expects(self::once())->method('readStream')->with('my compressd path')->willReturn($ressource);
         $local->expects(self::once())->method('delete')->with('my compressd path');
 
-        $sUT->__invoke($local, $database, [$destination], 'my tmp path', $compressor);
+        $sUT->__invoke($local, $database, [$destination], $compressor);
     }
 }