Merge pull request thephpleague#64 from thephpleague/async-aws-1-0

Rename S3FilesystemV1 to AsyncAwsS3Adapter

Author: tgalopin

composer.json

@@ -28,7 +28,7 @@
         "symfony/options-resolver": "^4.2|^5.0"
     },
     "require-dev": {
-        "async-aws/flysystem-s3": "^0.4",
+        "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",
@@ -48,6 +48,7 @@
     },
     "conflict": {
         "league/flysystem-aws-s3-v3": "<1.0.22",
+        "async-aws/flysystem-s3": "<1.0",
         "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\S3FilesystemV1;
+use AsyncAws\Flysystem\S3\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 [
-            S3FilesystemV1::class => 'async-aws/flysystem-s3',
+            AsyncAwsS3Adapter::class => 'async-aws/flysystem-s3',
         ];
     }
 
@@ -53,7 +53,7 @@ protected function configureOptions(OptionsResolver $resolver)
 
     protected function configureDefinition(Definition $definition, array $options)
     {
-        $definition->setClass(S3FilesystemV1::class);
+        $definition->setClass(AsyncAwsS3Adapter::class);
         $definition->setArgument(0, new Reference($options['client']));
         $definition->setArgument(1, $options['bucket']);
         $definition->setArgument(2, $options['prefix']);

tests/Adapter/Builder/AsyncAwsAdapterDefinitionBuilderTest.php

@@ -11,7 +11,7 @@
 
 namespace Tests\League\FlysystemBundle\Adapter\Builder;
 
-use AsyncAws\Flysystem\S3\S3FilesystemV1;
+use AsyncAws\Flysystem\S3\AsyncAwsS3Adapter;
 use League\FlysystemBundle\Adapter\Builder\AsyncAwsAdapterDefinitionBuilder;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
@@ -53,16 +53,16 @@ public function provideValidOptions()
      */
     public function testCreateDefinition($options)
     {
-        if (!class_exists(S3FilesystemV1::class)) {
+        if (!class_exists(AsyncAwsS3Adapter::class)) {
             $this->markTestSkipped();
         }
 
-        $this->assertSame(S3FilesystemV1::class, $this->createBuilder()->createDefinition($options)->getClass());
+        $this->assertSame(AsyncAwsS3Adapter::class, $this->createBuilder()->createDefinition($options)->getClass());
     }
 
     public function testOptionsBehavior()
     {
-        if (!class_exists(S3FilesystemV1::class)) {
+        if (!class_exists(AsyncAwsS3Adapter::class)) {
             $this->markTestSkipped();
         }
 
@@ -75,7 +75,7 @@ public function testOptionsBehavior()
             ],
         ]);
 
-        $this->assertSame(S3FilesystemV1::class, $definition->getClass());
+        $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));