Fix class definition in tests and requirement checks

Author: Lustmored

composer.json

@@ -30,9 +30,7 @@
     "require-dev": {
         "async-aws/flysystem-s3": "^1.0",
         "league/flysystem-aws-s3-v3": "^2.0",
-        "league/flysystem-ftp": "^2.0",
         "league/flysystem-memory": "^2.0",
-        "league/flysystem-sftp": "^2.0",
         "phpunit/phpunit": "^7.4",
         "symfony/dotenv": "^4.2|^5.0",
         "symfony/framework-bundle": "^4.2|^5.0",

src/Adapter/Builder/AwsAdapterDefinitionBuilder.php

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

src/Adapter/Builder/FtpAdapterDefinitionBuilder.php

@@ -11,7 +11,7 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\FTP\FtpAdapter;
+use League\Flysystem\Ftp\FtpAdapter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

src/Adapter/Builder/SftpAdapterDefinitionBuilder.php

@@ -11,7 +11,7 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\PHPSecLibV2\SftpAdapter;
+use League\Flysystem\PhpseclibV2\SftpAdapter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

tests/Adapter/Builder/FtpAdapterDefinitionBuilderTest.php

@@ -11,7 +11,7 @@
 
 namespace Tests\League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\Adapter\Ftp;
+use League\Flysystem\Ftp\FtpAdapter;
 use League\FlysystemBundle\Adapter\Builder\FtpAdapterDefinitionBuilder;
 use PHPUnit\Framework\TestCase;
 
@@ -49,7 +49,7 @@ public function provideValidOptions()
      */
     public function testCreateDefinition($options)
     {
-        $this->assertSame(Ftp::class, $this->createBuilder()->createDefinition($options)->getClass());
+        $this->assertSame(FtpAdapter::class, $this->createBuilder()->createDefinition($options)->getClass());
     }
 
     public function testOptionsBehavior()
@@ -80,7 +80,7 @@ public function testOptionsBehavior()
             'ignorePassiveAddress' => true,
         ];
 
-        $this->assertSame(Ftp::class, $definition->getClass());
+        $this->assertSame(FtpAdapter::class, $definition->getClass());
         $this->assertSame($expected, $definition->getArgument(0));
     }
 }

tests/Adapter/Builder/SftpAdapterDefinitionBuilderTest.php

@@ -11,7 +11,7 @@
 
 namespace Tests\League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\Sftp\SftpAdapter;
+use League\Flysystem\PhpseclibV2\SftpAdapter;
 use League\FlysystemBundle\Adapter\Builder\SftpAdapterDefinitionBuilder;
 use PHPUnit\Framework\TestCase;
 

tests/Adapter/options.yaml

@@ -12,24 +12,24 @@ fs_aws:
         bucket: 'bucket_name'
         prefix: 'optional/path/prefix'
 
-fs_azure:
-    adapter: 'azure'
-    options:
-        client: 'azure_client_service'
-        container: 'container_name'
-        prefix: 'optional/path/prefix'
+#fs_azure:
+#    adapter: 'azure'
+#    options:
+#        client: 'azure_client_service'
+#        container: 'container_name'
+#        prefix: 'optional/path/prefix'
 
-fs_cache:
-    adapter: 'cache'
-    options:
-        store: 'memory'
-        source: 'fs_local'
+#fs_cache:
+#    adapter: 'cache'
+#    options:
+#        store: 'memory'
+#        source: 'fs_local'
 
-fs_dropbox:
-    adapter: 'dropbox'
-    options:
-        client: 'dropbox_client_service'
-        prefix: 'optional/path/prefix'
+#fs_dropbox:
+#    adapter: 'dropbox'
+#    options:
+#        client: 'dropbox_client_service'
+#        prefix: 'optional/path/prefix'
 
 fs_ftp:
     adapter: 'ftp'
@@ -44,13 +44,13 @@ fs_ftp:
         timeout: 30
         ignore_passive_address: true
 
-fs_gcloud:
-    adapter: 'gcloud'
-    options:
-        client: 'gcloud_client_service'
-        bucket: 'bucket_name'
-        prefix: 'optional/path/prefix'
-        api_url: 'https://storage.googleapis.com'
+#fs_gcloud:
+#    adapter: 'gcloud'
+#    options:
+#        client: 'gcloud_client_service'
+#        bucket: 'bucket_name'
+#        prefix: 'optional/path/prefix'
+#        api_url: 'https://storage.googleapis.com'
 
 fs_local:
     adapter: 'local'
@@ -69,20 +69,20 @@ fs_local:
 fs_memory:
     adapter: 'memory'
 
-fs_null:
-    adapter: 'null'
+#fs_null:
+#    adapter: 'null'
 
-fs_rackspace:
-    adapter: 'rackspace'
-    options:
-        container: 'rackspace_container_service'
-        prefix: 'optional/path/prefix'
+#fs_rackspace:
+#    adapter: 'rackspace'
+#    options:
+#        container: 'rackspace_container_service'
+#        prefix: 'optional/path/prefix'
 
-fs_replicate:
-    adapter: 'replicate'
-    options:
-        source: 'fs_aws'
-        replica: 'fs_local'
+#fs_replicate:
+#    adapter: 'replicate'
+#    options:
+#        source: 'fs_aws'
+#        replica: 'fs_local'
 
 fs_sftp:
     adapter: 'sftp'
@@ -95,14 +95,14 @@ fs_sftp:
         root: '/path/to/root'
         timeout: 10
 
-fs_webdav:
-    adapter: 'webdav'
-    options:
-        client: 'webdav_client_service'
-        prefix: 'optional/path/prefix'
-        use_stream_copy: false
+#fs_webdav:
+#    adapter: 'webdav'
+#    options:
+#        client: 'webdav_client_service'
+#        prefix: 'optional/path/prefix'
+#        use_stream_copy: false
 
-fs_zip:
-    adapter: 'zip'
-    options:
-        path: '%kernel.project_dir%/archive.zip'
+#fs_zip:
+#    adapter: 'zip'
+#    options:
+#        path: '%kernel.project_dir%/archive.zip'