Update bundle to support Flysystem v2

.github/workflows/test.yaml

@@ -23,7 +23,7 @@ jobs:
             - uses: actions/checkout@master
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.1'
+                  php-version: '7.2'
             - name: PHPUnit
               run: |
                   composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION

README.md

@@ -47,19 +47,19 @@ creates a named alias for each of these services.
 
 This means you have two way of using the defined storages:
 
-* either using autowiring, by typehinting against the `FilesystemInterface` and using the
+* either using autowiring, by typehinting against the `FilesystemOperator` and using the
   variable name matching one of your storages:
 
     ```php
-    use League\Flysystem\FilesystemInterface;
+    use League\Flysystem\FilesystemOperator;
 
     class MyService
     {
         private $storage;
 
         // The variable name $defaultStorage matters: it needs to be the camelized version
         // of the name of your storage. 
-        public function __construct(FilesystemInterface $defaultStorage)
+        public function __construct(FilesystemOperator $defaultStorage)
         {
             $this->storage = $defaultStorage;
         }
@@ -71,13 +71,13 @@ This means you have two way of using the defined storages:
   The same goes for controllers:
 
     ```php
-    use League\Flysystem\FilesystemInterface;
+    use League\Flysystem\FilesystemOperator;
 
     class MyController
     {
         // The variable name $defaultStorage matters: it needs to be the camelized version
         // of the name of your storage. 
-        public function index(FilesystemInterface $defaultStorage)
+        public function index(FilesystemOperator $defaultStorage)
         {
             // ...
         }
@@ -87,26 +87,20 @@ This means you have two way of using the defined storages:
 * or using manual injection, by injecting the service named `default.storage` inside 
   your services.
 
-Once you have a FilesystemInterface, you can call methods from the
-[Filesystem API](https://flysystem.thephpleague.com/docs/usage/filesystem-api/)
+Once you have a FilesystemOperator, you can call methods from the
+[Filesystem API](https://flysystem.thephpleague.com/v2/docs/usage/filesystem-api/)
 to interact with your storage.
 
 ## Full documentation
 
-1. [Getting started](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/1-getting-started.md)
+1. [Getting started](https://flysystem.thephpleague.com/v2/docs/getting-started/)
 2. Cloud storage providers:
-   [Azure](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#azure),
    [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),
-   [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),
-   [Google Cloud Storage](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#google-cloud-storage),
-   [Rackspace](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#rackspace),
-   [WebDAV](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/2-cloud-storage-providers.md#webdav)
+   [Google Cloud Storage](https://flysystem.thephpleague.com/v2/docs/adapter/gcs/),
 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. [Caching metadata in Symfony cache](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/4-caching-metadata-in-symfony-cache.md)
-5. [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)
-6. [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/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)
 
 * [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)

composer.json

@@ -20,35 +20,28 @@
         }
     },
     "require": {
-        "php": ">=7.1",
-        "league/flysystem": "^1.0.40",
+        "php": ">=7.2",
+        "league/flysystem": "^2.0",
         "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",
+        "async-aws/flysystem-s3": "^0.3",
+        "league/flysystem-aws-s3-v3": "^2.0",
+        "league/flysystem-ftp": "^2.0",
+        "league/flysystem-google-cloud-storage": "^2.0",
+        "league/flysystem-memory": "^2.0",
+        "league/flysystem-sftp": "^2.0",
         "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",
         "symfony/yaml": "^4.2|^5.0"
     },
     "conflict": {
         "league/flysystem-aws-s3-v3": "<1.0.22",
-        "async-aws/flysystem-s3": "<1.0",
         "league/flysystem-cached-adapter": "<1.0.9"
     },
     "config": {

docs/1-getting-started.md

@@ -40,19 +40,19 @@ creates a named alias for each of these services.
 
 This means you have two way of using the defined storages:
 
-* either using autowiring, by typehinting against the `FilesystemInterface` and using the
+* either using autowiring, by typehinting against the `FilesystemOperator` and using the
   variable name matching one of your storages:
 
     ```php
-    use League\Flysystem\FilesystemInterface;
+    use League\Flysystem\FilesystemOperator;
 
     class MyService
     {
         private $storage;
 
         // The variable name $defaultStorage matters: it needs to be the camelized version
         // of the name of your storage. 
-        public function __construct(FilesystemInterface $defaultStorage)
+        public function __construct(FilesystemOperator $defaultStorage)
         {
             $this->storage = $defaultStorage;
         }
@@ -64,13 +64,13 @@ This means you have two way of using the defined storages:
   The same goes for controllers:
 
     ```php
-    use League\Flysystem\FilesystemInterface;
+    use League\Flysystem\FilesystemOperator;
 
     class MyController
     {
         // The variable name $defaultStorage matters: it needs to be the camelized version
         // of the name of your storage. 
-        public function index(FilesystemInterface $defaultStorage)
+        public function index(FilesystemOperator $defaultStorage)
         {
             // ...
         }
@@ -80,8 +80,8 @@ This means you have two way of using the defined storages:
 * or using manual injection, by injecting the service named `default.storage` inside 
   your services.
 
-Once you have a FilesystemInterface, you can call methods from the
-[Filesystem API](https://flysystem.thephpleague.com/docs/usage/filesystem-api/)
+Once you have a FilesystemOperator, you can call methods from the
+[Filesystem API](https://flysystem.thephpleague.com/v2/docs/usage/filesystem-api/)
 to interact with your storage.
 
 
@@ -111,14 +111,14 @@ flysystem:
 ``` 
 
 ```php
-use League\Flysystem\FilesystemInterface;
+use League\Flysystem\FilesystemOperator;
 
 class MyService
 {
     private $usersStorage;
     private $projectsStorage;
 
-    public function __construct(FilesystemInterface $usersStorage, FilesystemInterface $projectsStorage)
+    public function __construct(FilesystemOperator $usersStorage, FilesystemOperator $projectsStorage)
     {
         $this->usersStorage = $usersStorage;
         $this->projectsStorage = $projectsStorage;
@@ -160,7 +160,7 @@ flysystem:
 ```
 
 This configuration will swap every reference to the `users.storage` service (or to the
-`FilesystemInterface $usersStorage` typehint) from a local adapter to a memory one during tests.
+`FilesystemOperator $usersStorage` typehint) from a local adapter to a memory one during tests.
 
 ## Next
 

docs/2-cloud-storage-providers.md

@@ -4,37 +4,11 @@ One of the core feature of Flysystem is its ability to interact easily with remo
 including many cloud storage providers. This bundle provides the same level of support for these
 cloud providers by providing corresponding adapters in the configuration.
 
-* [Azure](#azure)
 * [AsyncAws S3](#asyncaws-s3)
 * [AWS S3](#aws-s3)
 * [DigitalOcean Spaces](#digitalocean-spaces)
 * [Scaleway Object Storage](#scaleway-object-storage)
 * [Google Cloud Storage](#google-cloud-storage)
-* [Rackspace](#rackspace)
-* [WebDAV](#webdav)
-
-## Azure
-
-### Installation
-
-```
-composer require league/flysystem-azure-blob-storage
-```
-
-### Usage
-
-```yaml
-# config/packages/flysystem.yaml
-
-flysystem:
-    storages:
-        users.storage:
-            adapter: 'azure'
-            options:
-                client: 'azure_client_service' # The service ID of the MicrosoftAzure\Storage\Blob\BlobRestProxy instance
-                container: 'container_name'
-                prefix: 'optional/path/prefix'
-```
 
 ## AsyncAws S3
 
@@ -93,34 +67,12 @@ as for a AWS storage.
 The Scaleway Object Storage is compatible with the AWS S3 API, meaning that you can use the same configuration
 as for a AWS storage.
 
-## Dropbox
-
-### Installation
-
-```
-composer require spatie/flysystem-dropbox
-```
-
-### Usage
-
-```yaml
-# config/packages/flysystem.yaml
-
-flysystem:
-    storages:
-        users.storage:
-            adapter: 'dropbox'
-            options:
-                client: 'dropbox_client_service' # The service ID of the Spatie\Dropbox\Client instance
-                prefix: 'optional/path/prefix'
-```
-
 ## Google Cloud Storage
 
 ### Installation
 
 ```
-composer require superbalist/flysystem-google-storage
+composer require league/flysystem-google-cloud-storage
 ```
 
 ### Usage
@@ -136,52 +88,6 @@ flysystem:
                 client: 'gcloud_client_service' # The service ID of the Google\Cloud\Storage\StorageClient instance
                 bucket: 'bucket_name'
                 prefix: 'optional/path/prefix'
-                api_url: 'https://storage.googleapis.com'
-```
-
-## Rackspace
-
-### Installation
-
-```
-composer require league/flysystem-rackspace
-```
-
-### Usage
-
-```yaml
-# config/packages/flysystem.yaml
-
-flysystem:
-    storages:
-        users.storage:
-            adapter: 'rackspace'
-            options:
-                container: 'rackspace_container_service' # The service ID of the OpenCloud\ObjectStore\Resource\Container instance
-                prefix: 'optional/path/prefix'
-```
-
-## WebDAV
-
-### Installation
-
-```
-composer require league/flysystem-webdav
-```
-
-### Usage
-
-```yaml
-# config/packages/flysystem.yaml
-
-flysystem:
-    storages:
-        users.storage:
-            adapter: 'webdav'
-            options:
-                client: 'webdav_client_service' # The service ID of the Sabre\DAV\Client instance
-                prefix: 'optional/path/prefix'
-                use_stream_copy: false
 ```
 
 ## Next

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

@@ -1,6 +1,6 @@
 # Interacting with FTP and SFTP servers
 
-Flysystem is able to interact with FTP and SFTP servers using the same FilesystemInterface.
+Flysystem is able to interact with FTP and SFTP servers using the same FilesystemOperator.
 To configure this bundle for such usage, you can rely on adapters in the same way you would
 for other storages.
 
@@ -64,4 +64,4 @@ flysystem:
 
 ## Next
 
-[Caching metadata in Symfony cache](https://github.com/thephpleague/flysystem-bundle/blob/master/docs/4-caching-metadata-in-symfony-cache.md)
+[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)