Remove contract and adapter

spatie · Jan 13, 2025 · b56beaa · b56beaa
1 parent 1608698
commit b56beaa
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 34 deletions.
diff --git a/src/Adapters/TemporaryDirectoryAdapter.php b/src/Adapters/TemporaryDirectoryAdapter.php
diff --git a/src/BackupServiceProvider.php b/src/BackupServiceProvider.php
@@ -5,13 +5,11 @@
 use Illuminate\Notifications\ChannelManager;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Notification;
-use Spatie\Backup\Adapters\TemporaryDirectoryAdapter;
 use Spatie\Backup\Commands\BackupCommand;
 use Spatie\Backup\Commands\CleanupCommand;
 use Spatie\Backup\Commands\ListCommand;
 use Spatie\Backup\Commands\MonitorCommand;
 use Spatie\Backup\Config\Config;
-use Spatie\Backup\Contracts\TemporaryDirectory as TemporaryDirectoryContract;
 use Spatie\Backup\Events\BackupZipWasCreated;
 use Spatie\Backup\Helpers\ConsoleOutput;
 use Spatie\Backup\Listeners\EncryptBackupArchive;
@@ -52,7 +50,7 @@ public function packageRegistered(): void
         $this->app->singleton(ConsoleOutput::class);
 
         $this->app->bind(CleanupStrategy::class, config('backup.cleanup.strategy'));
-        $this->app->bind(TemporaryDirectoryContract::class, fn() => new TemporaryDirectoryAdapter(config('backup.temporary_directory') ?? storage_path('app/backup-temp')));
+        $this->app->bind('backup-temporary-project', fn () => new TemporaryDirectory(config('backup.temporary_directory') ?? storage_path('app/backup-temp')));
 
         $this->registerDiscordChannel();
 

diff --git a/src/Commands/BackupCommand.php b/src/Commands/BackupCommand.php
@@ -5,7 +5,6 @@
 use Exception;
 use Illuminate\Contracts\Console\Isolatable;
 use Spatie\Backup\Config\Config;
-use Spatie\Backup\Contracts\TemporaryDirectory;
 use Spatie\Backup\Events\BackupHasFailed;
 use Spatie\Backup\Exceptions\BackupFailed;
 use Spatie\Backup\Exceptions\InvalidCommand;
@@ -20,7 +19,7 @@ class BackupCommand extends BaseCommand implements Isolatable
 
     protected $description = 'Run the backup.';
 
-    public function __construct(protected Config $config, protected TemporaryDirectory $temporaryDirectory)
+    public function __construct(protected Config $config)
     {
         parent::__construct();
     }
@@ -38,7 +37,7 @@ public function handle(): int
         try {
             $this->guardAgainstInvalidOptions();
 
-            $backupJob = BackupJobFactory::createFromConfig($this->config, $this->temporaryDirectory);
+            $backupJob = BackupJobFactory::createFromConfig($this->config);
 
             if ($this->option('only-db')) {
                 $backupJob->dontBackupFilesystem();

diff --git a/src/Contracts/TemporaryDirectory.php b/src/Contracts/TemporaryDirectory.php
diff --git a/src/Tasks/Backup/BackupJob.php b/src/Tasks/Backup/BackupJob.php
@@ -6,10 +6,10 @@
 use Exception;
 use Generator;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
 use Spatie\Backup\BackupDestination\BackupDestination;
 use Spatie\Backup\Config\Config;
-use Spatie\Backup\Contracts\TemporaryDirectory;
 use Spatie\Backup\Events\BackupManifestWasCreated;
 use Spatie\Backup\Events\BackupWasSuccessful;
 use Spatie\Backup\Events\BackupZipWasCreated;
@@ -21,13 +21,16 @@
 use Spatie\DbDumper\Databases\Sqlite;
 use Spatie\DbDumper\DbDumper;
 use Spatie\SignalAwareCommand\Facades\Signal;
+use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class BackupJob
 {
     public const FILENAME_FORMAT = 'Y-m-d-H-i-s.\z\i\p';
 
     protected FileSelection $fileSelection;
 
+    protected TemporaryDirectory $temporaryDirectory;
+
     /** @var Collection<string, DbDumper> */
     protected Collection $dbDumpers;
 
@@ -40,14 +43,18 @@ class BackupJob
 
     protected bool $signals = true;
 
-    public function __construct(protected Config $config, protected TemporaryDirectory $temporaryDirectory)
+    /**
+     * @throws BindingResolutionException
+     */
+    public function __construct(protected Config $config)
     {
         $this
             ->dontBackupFilesystem()
             ->dontBackupDatabases()
             ->setDefaultFilename();
 
         $this->backupDestinations = new Collection;
+        $this->temporaryDirectory = app()->make('backup-temporary-project');
     }
 
     public function dontBackupFilesystem(): self

diff --git a/src/Tasks/Backup/BackupJobFactory.php b/src/Tasks/Backup/BackupJobFactory.php
@@ -6,14 +6,13 @@
 use Spatie\Backup\BackupDestination\BackupDestinationFactory;
 use Spatie\Backup\Config\Config;
 use Spatie\Backup\Config\SourceFilesConfig;
-use Spatie\Backup\Contracts\TemporaryDirectory;
 use Spatie\DbDumper\DbDumper;
 
 class BackupJobFactory
 {
-    public static function createFromConfig(Config $config, TemporaryDirectory $temporaryDirectory): BackupJob
+    public static function createFromConfig(Config $config): BackupJob
     {
-        return (new BackupJob($config, $temporaryDirectory))
+        return (new BackupJob($config))
             ->setFileSelection(static::createFileSelection($config->backup->source->files))
             ->setDbDumpers(static::createDbDumpers($config->backup->source->databases))
             ->setBackupDestinations(BackupDestinationFactory::createFromArray($config));