Merge pull request thephpleague#66 from thephpleague/prepare-2-0

Prepare 2.0 release

Author: tgalopin

README.md

@@ -12,9 +12,12 @@ library into Symfony applications.
 It provides an efficient abstraction for the filesystem in order to change the storage backend depending
 on the execution environment (local files in development, cloud storage in production and memory in tests).
 
+> Note: you are reading the documentation for flysystem-bundle 2.0, which relies on Flysystem 2.X.
+> If you use Flysystem 1.X, use [flysystem-bundle 1.X](https://github.com/thephpleague/flysystem-bundle/tree/1.x).
+
 ## Installation
 
-flysystem-bundle requires PHP 7.1+ and Symfony 4.2+.
+flysystem-bundle requires PHP 7.2+ and Symfony 4.2+.
 
 You can install the bundle using Symfony Flex:
 
@@ -93,14 +96,16 @@ to interact with your storage.
 
 ## Full documentation
 
-1. [Getting started](https://flysystem.thephpleague.com/v2/docs/getting-started/)
+1. [Getting started](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/1-getting-started.md)
 2. Cloud storage providers:
    [AsyncAws S3](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#asyncaws-s3),
-   [AWS S3](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#aws-s3),
-   [Google Cloud Storage](https://flysystem.thephpleague.com/v2/docs/adapter/gcs/),
+   [AWS SDK S3](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#aws-sdk-s3),
+   [Google Cloud Storage](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#google-cloud-storage),
+   [DigitalOcean Spaces](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#digitalocean-spaces),
+   [Scaleway Object Storage](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#scaleway-object-storage)
 3. [Interacting with FTP and SFTP servers](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/3-interacting-with-ftp-and-sftp-servers.md)
-4. [Using a lazy adapter to switch storage backend using an environment variable](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/5-using-lazy-adapter-to-switch-at-runtime.md)
-5. [Creating a custom adapter](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/6-creating-a-custom-adapter.md)
+4. [Using a lazy adapter to switch storage backend using an environment variable](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/4-using-lazy-adapter-to-switch-at-runtime.md)
+5. [Creating a custom adapter](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/5-creating-a-custom-adapter.md)
 
 * [Security issue disclosure procedure](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/A-security-disclosure-procedure.md)
 * [Configuration reference](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/B-configuration-reference.md)

UPGRADE.md

@@ -0,0 +1,17 @@
+# Upgrading from 1.0 to 2.0
+
+flysystem-bundle 2.0 introduces Backward Compatibility breaks, meaning you will need to update
+the code of your projects to upgrade.
+
+flysystem-bundle 2.0 relies on Flysystem 2.0, which introduced most of the backward incompatible
+changes. You should read
+[Flysystem 2.0 upgrade guide](https://flysystem.thephpleague.com/v2/docs/advanced/upgrade-to-2.0.0/).
+
+In addition to the library updates, the bundle also changed a bit:
+
+* Following the drop of support for several Cloud providers in Flysystem itself, the bundle no longer
+  natively supports Azure, Dropbox, Rackspace and WebDAV. If the need arise for community adapters to be
+  ported to Flysystem 2 and flysystem-bundle 2, we could add them again.
+* Following their removal from the main library, null, cache, zip and replicate adapters were removed 
+  from the bundle as well.
+* Following the drop of support for plugins in the main library, the bundle does not support them anymore.

docs/2-cloud-storage-providers.md

@@ -33,7 +33,7 @@ flysystem:
                 prefix: 'optional/path/prefix'
 ```
 
-## AWS S3
+## AWS SDK S3
 
 ### Installation
 

docs/3-interacting-with-ftp-and-sftp-servers.md

@@ -64,4 +64,4 @@ flysystem:
 
 ## Next
 
-[Using a lazy adapter to switch storage backend using an environment variable](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/5-using-lazy-adapter-to-switch-at-runtime.md)
+[Using a lazy adapter to switch storage backend using an environment variable](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/4-using-lazy-adapter-to-switch-at-runtime.md)

…ing-lazy-adapter-to-switch-at-runtime.md …ing-lazy-adapter-to-switch-at-runtime.mddocs/5-using-lazy-adapter-to-switch-at-runtime.md renamed to docs/4-using-lazy-adapter-to-switch-at-runtime.md docs/5-using-lazy-adapter-to-switch-at-runtime.md renamed to docs/4-using-lazy-adapter-to-switch-at-runtime.md

@@ -110,4 +110,4 @@ same way as any other storage:
 
 ## Next
 
-[Creating a custom adapter](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/6-creating-a-custom-adapter.md)
+[Creating a custom adapter](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/5-creating-a-custom-adapter.md)

docs/6-creating-a-custom-adapter.md docs/5-creating-a-custom-adapter.mddocs/6-creating-a-custom-adapter.md renamed to docs/5-creating-a-custom-adapter.md

@@ -18,7 +18,6 @@
 use League\Flysystem\FilesystemOperator;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Dotenv\Dotenv;
-use Symfony\Component\HttpKernel\Kernel;
 use Tests\League\FlysystemBundle\Kernel\FlysystemAppKernel;
 
 class FlysystemExtensionTest extends TestCase
@@ -27,8 +26,10 @@ public function provideFilesystems()
     {
         $fsNames = [
             'fs_aws',
+            'fs_custom',
             'fs_ftp',
             'fs_gcloud',
+            'fs_lazy',
             'fs_local',
             'fs_sftp',
         ];
@@ -95,14 +96,9 @@ private function getClientMocks()
         $gcloud = $this->createMock(StorageClient::class);
         $gcloud->method('bucket')->willReturn($this->createMock(Bucket::class));
 
-        $asyncAws = null;
-        if (Kernel::VERSION_ID > 50200 && class_exists(AsyncS3Client::class)) {
-            $asyncAws = $this->createMock(AsyncS3Client::class);
-        }
-
         return [
             'aws_client_service' => $this->createMock(S3Client::class),
-            'asyncaws_client_service' => $asyncAws,
+            'asyncaws_client_service' => $this->createMock(AsyncS3Client::class),
             'gcloud_client_service' => $gcloud,
         ];
     }

tests/DependencyInjection/FlysystemExtensionTest.php

@@ -1,12 +1,22 @@
 flysystem:
     storages:
+        fs_asyncaws:
+            adapter: 'asyncaws'
+            options:
+                client: 'asyncaws_client_service'
+                bucket: '%env(AWS_BUCKET)%'
+                prefix: 'optional/path/prefix'
+
         fs_aws:
             adapter: 'aws'
             options:
                 client: 'aws_client_service'
                 bucket: '%env(AWS_BUCKET)%'
                 prefix: 'optional/path/prefix'
 
+        fs_custom:
+            adapter: 'custom_adapter'
+
         fs_ftp:
             adapter: 'ftp'
             options:

tests/Kernel/config/flysystem.yaml

@@ -3,12 +3,15 @@ services:
         public: true
 
     custom_adapter:
-        class: 'League\Flysystem\Adapter\NullAdapter'
+        class: 'League\Flysystem\InMemory\InMemoryFilesystemAdapter'
 
     # Aliases used to test the services construction
+    flysystem.test.fs_asyncaws: { alias: 'fs_asyncaws' }
     flysystem.test.fs_aws: { alias: 'fs_aws' }
+    flysystem.test.fs_custom: { alias: 'fs_custom' }
     flysystem.test.fs_ftp: { alias: 'fs_ftp' }
     flysystem.test.fs_gcloud: { alias: 'fs_gcloud' }
+    flysystem.test.fs_lazy: { alias: 'fs_lazy' }
     flysystem.test.fs_local: { alias: 'fs_local' }
     flysystem.test.fs_memory: { alias: 'fs_memory' }
     flysystem.test.fs_sftp: { alias: 'fs_sftp' }