Merge branch 'master' into stream_reads

Author: JohnstonCode

.github/workflows/test.yaml

@@ -0,0 +1,68 @@
+name: flysystem-bundle
+
+on:
+    pull_request: ~
+    push:
+        branches:
+            - master
+
+jobs:
+    coding-style:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@master
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+            - name: php-cs-fixer
+              run: |
+                  wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.4/php-cs-fixer.phar -q
+                  php php-cs-fixer.phar fix --dry-run --diff
+
+    tests-php-7-2-symfony-4-2:
+        runs-on: ubuntu-latest
+        env:
+            SYMFONY_VERSION: 4.2.*
+        steps:
+            - uses: actions/checkout@master
+            - uses: shivammathur/setup-php@v2
+              with:
+                  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
+                  composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
+                  composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
+                  php vendor/bin/simple-phpunit
+
+    tests-php-7-4-symfony-5-0:
+        runs-on: ubuntu-latest
+        env:
+            SYMFONY_VERSION: 5.0.*
+        steps:
+            - uses: actions/checkout@master
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.3'
+            - 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
+                  composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
+                  composer update --prefer-dist --no-interaction --no-ansi --no-progress
+                  php vendor/bin/simple-phpunit
+
+    tests-php-8-0-symfony-5-2:
+        runs-on: ubuntu-latest
+        env:
+            SYMFONY_VERSION: 5.2.*
+        steps:
+            - uses: actions/checkout@master
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.0'
+            - 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
+                  composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
+                  composer update --prefer-dist --no-interaction --no-ansi --no-progress
+                  php vendor/bin/simple-phpunit

.gitignore

@@ -1,3 +1,4 @@
 vendor
 composer.lock
 .php_cs.cache
+.phpunit.result.cache

.travis.yml

@@ -1,6 +1,5 @@
 # flysystem-bundle
 
-[![Build Status](https://travis-ci.org/thephpleague/flysystem-bundle.svg?branch=master)](https://travis-ci.org/thephpleague/flysystem-bundle)
 [![Packagist Version](https://img.shields.io/packagist/v/league/flysystem-bundle.svg?style=flat-square)](https://packagist.org/packages/league/flysystem-bundle)
 [![Software license](https://img.shields.io/github/license/thephpleague/flysystem-bundle.svg?style=flat-square)](https://github.com/thephpleague/flysystem-bundle/blob/master/LICENSE)
 
@@ -12,9 +11,13 @@ 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).
+> Read the [Upgrade guide](https://github.com/thephpleague/flysystem-bundle/blob/master/UPGRADE.md) to learn how to upgrade.
+
 ## 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:
 
@@ -47,19 +50,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 +74,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 +90,22 @@ 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)
 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),
+   [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),
-   [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)
+   [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. [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/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)

README.md

@@ -0,0 +1,17 @@
+# Upgrading from 1.0 to 2.0
+
+flysystem-bundle 2.0 introduces backward incompatible changes, 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:
+
+* Add official support for PHP 8 ;
+* Migration to AsyncAWS 1.0 ;
+* Drop support for PHP 7.1 ;
+* Drop support for Azure, Dropbox, Rackspace and WebDAV adapters (following the main library) ;
+* Drop support for null, cache, zip and replicate adapters (following the main library) ;
+* Drop support for plugins ;

UPGRADE.md

@@ -20,34 +20,27 @@
         }
     },
     "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": "^0.3",
-        "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",
-        "phpunit/phpunit": "^7.4",
-        "spatie/flysystem-dropbox": "^1.0",
-        "superbalist/flysystem-google-storage": "^7.2",
+        "league/flysystem-async-aws-s3": "^2.0",
+        "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",
         "symfony/dotenv": "^4.2|^5.0",
         "symfony/framework-bundle": "^4.2|^5.0",
+        "symfony/phpunit-bridge": "^5.2",
         "symfony/var-dumper": "^4.1|^5.0",
         "symfony/yaml": "^4.2|^5.0"
     },
     "conflict": {
-        "league/flysystem-aws-s3-v3": "<1.0.22",
         "league/flysystem-cached-adapter": "<1.0.9"
     },
     "config": {

composer.json

@@ -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