Merge branch 'master' of github.com:bushbaby/BsbFlysystemMysqlBackup

# Conflicts:
#	composer.json

README.md

@@ -94,6 +94,8 @@ return [
 
             /*
              * Container service name of the Flysystem filesystem used to persisted dumps
+             *
+             * @since 0.2.0 this may also be the name of a filesystem as it has been registered to the BsbFlysystem Manager
              */
             // 'filesystem'      => 'Container/Name/Of/FilesystemService',
 

composer.json

@@ -18,8 +18,9 @@
     "zendframework/zend-stdlib":       "^2.7 || ^3.0",
     "zendframework/zend-stratigility": "^1.0"
   },
-  "suggest":      {
-    "bushbaby/doctrine-managerregistry-servicemanager": ""
+  "suggest": {
+    "bushbaby/flysystem": "Zend Framework 2 module bridge for flysystem filesystem",
+    "bushbaby/doctrine-managerregistry-servicemanager": "An implementation of Doctrine's ManagerRegistry for the ZendFramework ServiceManager"
   },
   "require-dev":  {
     "plhw/hf-cs-fixer-config": "^1.0"

src/Container/MysqlBackupServiceFactory.php

@@ -4,6 +4,7 @@
 
 namespace BsbFlysystemMysqlBackup\Container;
 
+use BsbFlysystem\Service\FilesystemManager;
 use BsbFlysystemMysqlBackup\Option\MysqlDumperOptions;
 use BsbFlysystemMysqlBackup\Option\StorageOptions;
 use BsbFlysystemMysqlBackup\Service\MysqlBackupService;
@@ -26,7 +27,11 @@ public function __invoke(ContainerInterface $container): MysqlBackupService
         $dumperOptions = $container->get(MysqlDumperOptions::class);
 
         /** @var Filesystem $filesystem */
-        $filesystem = $container->get($storageOptions->getFilesystem());
+        if ($container->has(FilesystemManager::class)) {
+            $filesystem = $container->get(FilesystemManager::class)->get($storageOptions->getFilesystem());
+        } else {
+            $filesystem = $container->get($storageOptions->getFilesystem());
+        }
 
         return new MysqlBackupService($dumper, $filesystem, $storageOptions, $dumperOptions);
     }

src/Service/MysqlBackupService.php

@@ -57,7 +57,7 @@ public function __construct(
     public function doBackup()
     {
         $date     = date('YmdHisO');
-        $dumpName = $this->options->getPath() . $date . '.sql';
+        $dumpName = trim($this->options->getPath() . $date . '.sql', '/');
 
         switch ($this->dumperOptions->getCompress()) {
             case Mysqldump::GZIP:
@@ -68,7 +68,7 @@ public function doBackup()
                 break;
         }
 
-        $tmpFile    = tempnam(sys_get_temp_dir(), 'bsb-offsite-mysql-backup-');
+        $tmpFile    = tempnam(sys_get_temp_dir(), 'bsb-flysystem-mysql-backup-');
         $fileStream = fopen($tmpFile, 'rb');
 
         try {