Fix AsyncAws integration

Author: tgalopin

.github/workflows/test.yaml

@@ -32,7 +32,6 @@ jobs:
               run: |
                   composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
                   composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
-                  composer remove  --no-update --dev async-aws/flysystem-s3
                   composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
                   php vendor/bin/phpunit
 

composer.json

@@ -28,8 +28,8 @@
         "symfony/options-resolver": "^4.2|^5.0"
     },
     "require-dev": {
-        "async-aws/flysystem-s3": "^0.3",
         "league/flysystem-aws-s3-v3": "^2.0",
+        "league/flysystem-async-aws-s3": "^2.0",
         "league/flysystem-ftp": "^2.0",
         "league/flysystem-google-cloud-storage": "^2.0",
         "league/flysystem-memory": "^2.0",
@@ -41,7 +41,6 @@
         "symfony/yaml": "^4.2|^5.0"
     },
     "conflict": {
-        "league/flysystem-aws-s3-v3": "<1.0.22",
         "league/flysystem-cached-adapter": "<1.0.9"
     },
     "config": {

src/Adapter/Builder/AsyncAwsAdapterDefinitionBuilder.php

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

tests/Adapter/AdapterDefinitionFactoryTest.php

@@ -11,7 +11,6 @@
 
 namespace Tests\League\FlysystemBundle\Adapter;
 
-use AsyncAws\Flysystem\S3\S3FilesystemV2;
 use League\FlysystemBundle\Adapter\AdapterDefinitionFactory;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Definition;
@@ -24,10 +23,6 @@ public function provideConfigOptions()
         $config = Yaml::parseFile(__DIR__.'/options.yaml');
 
         foreach ($config as $fs) {
-            if ('asyncaws' === $fs['adapter'] && !class_exists(S3FilesystemV2::class)) {
-                continue;
-            }
-
             yield $fs['adapter'] => [$fs['adapter'], $fs['options'] ?? []];
         }
     }

tests/Adapter/Builder/AsyncAwsAdapterDefinitionBuilderTest.php

@@ -11,9 +11,10 @@
 
 namespace Tests\League\FlysystemBundle\Adapter\Builder;
 
-use AsyncAws\Flysystem\S3\S3FilesystemV2;
+use League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter;
 use League\FlysystemBundle\Adapter\Builder\AsyncAwsAdapterDefinitionBuilder;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * @requires PHP 7.2
@@ -44,10 +45,10 @@ public function provideValidOptions()
      */
     public function testCreateDefinition($options)
     {
-        if (!class_exists(S3FilesystemV2::class)) {
-            $this->markTestSkipped();
-        }
-
-        $this->assertSame(S3FilesystemV2::class, $this->createBuilder()->createDefinition($options)->getClass());
+        $definition = $this->createBuilder()->createDefinition($options);
+        $this->assertSame(AsyncAwsS3Adapter::class, $definition->getClass());
+        $this->assertInstanceOf(Reference::class, $definition->getArgument(0));
+        $this->assertSame('my_client', (string) $definition->getArgument(0));
+        $this->assertSame('bucket', $definition->getArgument(1));
     }
 }