removed $Filesystem proprerty. Commands use static Filesystem::instance()

Author: mirko-pagliai

src/Command/DeleteAllCommand.php

@@ -20,6 +20,7 @@
 use Cake\Console\ConsoleOptionParser;
 use DatabaseBackup\Console\Command;
 use DatabaseBackup\Utility\BackupManager;
+use Tools\Filesystem;
 
 /**
  * Deletes all backup files
@@ -56,7 +57,7 @@ public function execute(Arguments $args, ConsoleIo $io): void
         }
 
         foreach ($files as $file) {
-            $io->verbose(__d('database_backup', 'Backup `{0}` has been deleted', $this->Filesystem->rtr($file)));
+            $io->verbose(__d('database_backup', 'Backup `{0}` has been deleted', Filesystem::instance()->rtr($file)));
         }
 
         $io->success(__d('database_backup', 'Deleted backup files: {0}', count($files)));

src/Command/ExportCommand.php

@@ -23,6 +23,7 @@
 use DatabaseBackup\Console\Command;
 use DatabaseBackup\Utility\BackupExport;
 use Exception;
+use Tools\Filesystem;
 
 /**
  * Exports a database backup
@@ -94,7 +95,7 @@ public function execute(Arguments $args, ConsoleIo $io): void
 
             //Exports
             $file = $instance->export();
-            $io->success(__d('database_backup', 'Backup `{0}` has been exported', $this->Filesystem->rtr($file)));
+            $io->success(__d('database_backup', 'Backup `{0}` has been exported', Filesystem::instance()->rtr($file)));
             $verbose = $args->getOption('verbose');
             $quiet = $args->getOption('quiet');
 

src/Command/ImportCommand.php

@@ -21,6 +21,7 @@
 use DatabaseBackup\Console\Command;
 use DatabaseBackup\Utility\BackupImport;
 use Exception;
+use Tools\Filesystem;
 
 /**
  * Imports a database backup
@@ -57,7 +58,7 @@ public function execute(Arguments $args, ConsoleIo $io): void
 
         try {
             $file = (new BackupImport())->filename($args->getArgument('filename'))->import();
-            $io->success(__d('database_backup', 'Backup `{0}` has been imported', $this->Filesystem->rtr($file)));
+            $io->success(__d('database_backup', 'Backup `{0}` has been imported', Filesystem::instance()->rtr($file)));
         } catch (Exception $e) {
             $io->error($e->getMessage());
             $this->abort();

src/Command/SendCommand.php

@@ -21,6 +21,7 @@
 use DatabaseBackup\Console\Command;
 use DatabaseBackup\Utility\BackupManager;
 use Exception;
+use Tools\Filesystem;
 
 /**
  * Sends a backup file via email
@@ -62,7 +63,7 @@ public function execute(Arguments $args, ConsoleIo $io): void
 
         try {
             (new BackupManager())->send($args->getArgument('filename'), $args->getArgument('recipient'));
-            $io->success(__d('database_backup', 'Backup `{0}` was sent via mail', $this->Filesystem->rtr($args->getArgument('filename'))));
+            $io->success(__d('database_backup', 'Backup `{0}` was sent via mail', Filesystem::instance()->rtr($args->getArgument('filename'))));
         } catch (Exception $e) {
             $io->error($e->getMessage());
             $this->abort();

src/Console/Command.php

@@ -19,7 +19,6 @@
 use Cake\Console\BaseCommand;
 use Cake\Console\ConsoleIo;
 use DatabaseBackup\BackupTrait;
-use Tools\Filesystem;
 
 /**
  * Base class for console commands
@@ -28,19 +27,6 @@ class Command extends BaseCommand
 {
     use BackupTrait;
 
-    /**
-     * @var \Tools\Filesystem
-     */
-    protected $Filesystem;
-
-    /**
-     * Construct
-     */
-    public function __construct()
-    {
-        $this->Filesystem = $this->Filesystem ?: new Filesystem();
-    }
-
     /**
      * Implement this method with your command's logic
      * @param \Cake\Console\Arguments $args The command arguments