Integrate with oneup/flysystem-bundle

Author: hason

BMBackupManagerBundle.php

@@ -2,6 +2,8 @@
 
 namespace BM\BackupManagerBundle;
 
+use BM\BackupManagerBundle\DependencyInjection\Compiler\FlysystemFilesystemPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -11,4 +13,8 @@
  */
 class BMBackupManagerBundle extends Bundle
 {
+    public function build(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new FlysystemFilesystemPass());
+    }
 }

DependencyInjection/BMBackupManagerExtension.php

@@ -6,6 +6,7 @@
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use League\Flysystem\Dropbox\DropboxAdapter;
+use League\Flysystem\FilesystemInterface;
 use Mhetreramesh\Flysystem\BackblazeAdapter;
 use Srmklive\Dropbox\Adapter\DropboxAdapter as Dropbox2Adapter;
 use League\Flysystem\Rackspace\RackspaceAdapter;
@@ -41,6 +42,7 @@ public function load(array $configs, ContainerBuilder $container)
             'DropboxV2' => 'backup_manager.filesystems.dropbox_v2_filesystem',
             'Ftp' => 'backup_manager.filesystems.ftp_filesystem',
             'Sftp' => 'backup_manager.filesystems.sftp_filesystem',
+            'Flysystem' => 'backup_manager.filesystems.flysystem_filesystem',
         ];
 
         $filesystemDef = $container->getDefinition('backup_manager.filesystems');
@@ -75,6 +77,7 @@ private function validateStorage(array $config)
             'DropboxV2' => ['package'=>'srmklive/flysystem-dropbox-v2:^1.0', 'test'=>Dropbox2Adapter::class],
             'Ftp' => ['package'=>'league/flysystem:^1.0', 'test'=>Ftp::class],
             'Sftp' => ['package'=>'league/flysystem-sftp:^1.0', 'test'=>SftpAdapter::class],
+            'Flysystem' => ['package'=>'league/flysystem:^1.0', 'test'=> FilesystemInterface::class],
         ];
 
         foreach ($config as $key => $storageConfig) {

DependencyInjection/Compiler/FlysystemFilesystemPass.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace BM\BackupManagerBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class FlysystemFilesystemPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        $definition = $container->getDefinition('backup_manager.filesystems.flysystem_filesystem');
+
+        if (!empty($definition->getArguments())) {
+            return;
+        }
+
+        $filesystems = [];
+        foreach ($container->findTaggedServiceIds('oneup_flysystem.filesystem') as $id => $attributes) {
+            foreach ($attributes as $attribute) {
+                if (!isset($attribute['key'])) {
+                    continue;
+                }
+
+                $name = $attribute['key'];
+                $filesystems[$name] = new Reference($id);
+            }
+        }
+
+        $arguments = [$filesystems];
+        if ($container->hasDefinition('oneup_flysystem.mount_manager')) {
+            $arguments[] = new Reference('oneup_flysystem.mount_manager');
+        }
+
+        $definition->setArguments($arguments);
+    }
+}

DependencyInjection/Configuration.php

@@ -57,8 +57,11 @@ public function getConfigTreeBuilder()
                                     case 'Sftp':
                                         $this->validateAuthenticationType(['host', 'username', 'password', 'root', 'port', 'timeout', 'privateKey'], $config, 'Sftp');
                                         break;
+                                    case 'Flysystem':
+                                        $this->validateAuthenticationType(['name', 'prefix'], $config, 'Flysystem');
+                                        break;
                                     default:
-                                        $validTypes = ['Local', 'AwsS3', 'B2', 'Rackspace', 'Dropbox', 'DropboxV2', 'Ftp', 'Sftp'];
+                                        $validTypes = ['Local', 'AwsS3', 'B2', 'Rackspace', 'Dropbox', 'DropboxV2', 'Ftp', 'Sftp', 'Flysystem'];
                                         throw new InvalidConfigurationException(sprintf('Type must be one of "%s", got "%s"', implode(', ', $validTypes), $config['type']));
                                 }
                             }

Resources/config/services.yml

@@ -50,6 +50,11 @@ services:
         class:  BackupManager\Filesystems\SftpFilesystem
         public: false
 
+    backup_manager.filesystems.flysystem_filesystem:
+        class:  BackupManager\Filesystems\FlysystemFilesystem
+        arguments: [] # in compiler pass
+        public: false
+
     backup_manager.filesystems:
         class:  BackupManager\Filesystems\FilesystemProvider
         public: false

composer.json

@@ -26,14 +26,16 @@
         "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3",
         "matthiasnoback/symfony-config-test": "^2.2 || ^3.1",
         "nyholm/symfony-bundle-test": "^1.3.1",
+        "oneup/flysystem-bundle": "^3.0",
         "symfony/phpunit-bridge": "^3.4 || ^4.0"
     },
     "suggest": {
         "league/flysystem-aws-s3-v3": "To use AWS S3, version 3",
         "mhetreramesh/flysystem-backblaze": "To use B2",
         "srmklive/flysystem-dropbox-v2": "To use Dropbox",
         "league/flysystem-rackspace": "To use Rackspace",
-        "league/flysystem-sftp": "To use sftp"
+        "league/flysystem-sftp": "To use sftp",
+        "oneup/flysystem-bundle": "To use Flysystem bundle"
     },
     "autoload": {
         "psr-4": { "BM\\BackupManagerBundle\\": "" }