Start working on v2

Author: tgalopin

composer.json

@@ -21,26 +21,19 @@
     },
     "require": {
         "php": ">=7.1",
-        "league/flysystem": "^1.0.40",
+        "league/flysystem": "^2.0.0@dev",
         "symfony/config": "^4.2|^5.0",
         "symfony/http-kernel": "^4.2|^5.0",
         "symfony/dependency-injection": "^4.2|^5.0",
         "symfony/options-resolver": "^4.2|^5.0"
     },
     "require-dev": {
         "async-aws/flysystem-s3": "^1.0",
-        "league/flysystem-aws-s3-v3": "^1.0.22",
-        "league/flysystem-azure-blob-storage": "^0.1.5",
-        "league/flysystem-cached-adapter": "^1.0.9",
-        "league/flysystem-memory": "^1.0",
-        "league/flysystem-rackspace": "^1.0",
-        "league/flysystem-replicate-adapter": "^1.0",
-        "league/flysystem-sftp": "^1.0",
-        "league/flysystem-webdav": "^1.0",
-        "league/flysystem-ziparchive": "^1.0",
+        "league/flysystem-aws-s3-v3": "^2.0.0@dev",
+        "league/flysystem-ftp": "^2.0.0@dev",
+        "league/flysystem-memory": "^2.0.0@dev",
+        "league/flysystem-sftp": "^2.0.0@dev",
         "phpunit/phpunit": "^7.4",
-        "spatie/flysystem-dropbox": "^1.0",
-        "superbalist/flysystem-google-storage": "^7.2",
         "symfony/dotenv": "^4.2|^5.0",
         "symfony/framework-bundle": "^4.2|^5.0",
         "symfony/var-dumper": "^4.1|^5.0",

src/Adapter/AdapterDefinitionFactory.php

@@ -31,19 +31,10 @@ public function __construct()
         $this->builders = [
             new Builder\AsyncAwsAdapterDefinitionBuilder(),
             new Builder\AwsAdapterDefinitionBuilder(),
-            new Builder\AzureAdapterDefinitionBuilder(),
-            new Builder\CacheAdapterDefinitionBuilder(),
-            new Builder\DropboxAdapterDefinitionBuilder(),
             new Builder\FtpAdapterDefinitionBuilder(),
-            new Builder\GcloudAdapterDefinitionBuilder(),
             new Builder\LocalAdapterDefinitionBuilder(),
             new Builder\MemoryAdapterDefinitionBuilder(),
-            new Builder\NullAdapterDefinitionBuilder(),
-            new Builder\RackspaceAdapterDefinitionBuilder(),
-            new Builder\ReplicateAdapterDefinitionBuilder(),
             new Builder\SftpAdapterDefinitionBuilder(),
-            new Builder\WebdavAdapterDefinitionBuilder(),
-            new Builder\ZipAdapterDefinitionBuilder(),
         ];
     }
 

src/Adapter/Builder/AsyncAwsAdapterDefinitionBuilder.php

@@ -46,9 +46,6 @@ protected function configureOptions(OptionsResolver $resolver)
 
         $resolver->setDefault('prefix', '');
         $resolver->setAllowedTypes('prefix', 'string');
-
-        $resolver->setDefault('options', []);
-        $resolver->setAllowedTypes('options', 'array');
     }
 
     protected function configureDefinition(Definition $definition, array $options)
@@ -57,6 +54,5 @@ protected function configureDefinition(Definition $definition, array $options)
         $definition->setArgument(0, new Reference($options['client']));
         $definition->setArgument(1, $options['bucket']);
         $definition->setArgument(2, $options['prefix']);
-        $definition->setArgument(3, $options['options']);
     }
 }

src/Adapter/Builder/AwsAdapterDefinitionBuilder.php

@@ -11,7 +11,7 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\AwsS3v3\AwsS3Adapter;
+use League\Flysystem\AwsS3V3\AwsS3V3Filesystem;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -31,7 +31,7 @@ public function getName(): string
     protected function getRequiredPackages(): array
     {
         return [
-            AwsS3Adapter::class => 'league/flysystem-aws-s3-v3',
+            AwsS3V3Filesystem::class => 'league/flysystem-aws-s3-v3',
         ];
     }
 
@@ -45,17 +45,13 @@ protected function configureOptions(OptionsResolver $resolver)
 
         $resolver->setDefault('prefix', '');
         $resolver->setAllowedTypes('prefix', 'string');
-
-        $resolver->setDefault('options', []);
-        $resolver->setAllowedTypes('options', 'array');
     }
 
     protected function configureDefinition(Definition $definition, array $options)
     {
-        $definition->setClass(AwsS3Adapter::class);
+        $definition->setClass(AwsS3V3Filesystem::class);
         $definition->setArgument(0, new Reference($options['client']));
         $definition->setArgument(1, $options['bucket']);
         $definition->setArgument(2, $options['prefix']);
-        $definition->setArgument(3, $options['options']);
     }
 }

src/Adapter/Builder/AzureAdapterDefinitionBuilder.php

@@ -11,7 +11,7 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\Adapter\Ftp;
+use League\Flysystem\FTP\FtpAdapter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,9 @@ public function getName(): string
 
     protected function getRequiredPackages(): array
     {
-        return [];
+        return [
+            FtpAdapter::class => 'league/flysystem-ftp',
+        ];
     }
 
     protected function configureOptions(OptionsResolver $resolver)
@@ -70,7 +72,7 @@ protected function configureDefinition(Definition $definition, array $options)
         $options['ignorePassiveAddress'] = $options['ignore_passive_address'];
         unset($options['ignore_passive_address']);
 
-        $definition->setClass(Ftp::class);
+        $definition->setClass(FtpAdapter::class);
         $definition->setArgument(0, $options);
     }
 }

src/Adapter/Builder/CacheAdapterDefinitionBuilder.php

@@ -11,7 +11,7 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\Adapter\Local;
+use League\Flysystem\Local\LocalFilesystemAdapter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -64,10 +64,10 @@ protected function configureOptions(OptionsResolver $resolver)
 
     protected function configureDefinition(Definition $definition, array $options)
     {
-        $definition->setClass(Local::class);
+        $definition->setClass(LocalFilesystemAdapter::class);
         $definition->setArgument(0, $options['directory']);
         $definition->setArgument(1, $options['lock']);
-        $definition->setArgument(2, $options['skip_links'] ? Local::SKIP_LINKS : Local::DISALLOW_LINKS);
+        $definition->setArgument(2, $options['skip_links'] ? LocalFilesystemAdapter::SKIP_LINKS : LocalFilesystemAdapter::DISALLOW_LINKS);
         $definition->setArgument(3, $options['permissions']);
     }
 }