diff --git a/.gitignore b/.gitignore index 3028208..59c655f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ vendor composer.lock -.php_cs.cache +.php-cs-fixer.cache .phpunit.result.cache diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index e301196..7071c03 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -1,10 +1,12 @@ in(__DIR__); -$config = new PhpCsFixer\Config(); - -return $config->setRules([ +return (new PhpCsFixer\Config()) + ->setRules([ '@Symfony' => true, 'phpdoc_annotation_without_dot' => false, ]) - ->setFinder($finder); + ->setFinder( + PhpCsFixer\Finder::create() + ->in(__DIR__) + ) +; diff --git a/README.md b/README.md index 281df4b..1c1a72d 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ [![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) -[![SymfonyInsight](https://insight.symfony.com/projects/525fdfa3-d482-4218-b4b9-3c2efc305fac/big.svg)](https://insight.symfony.com/projects/525fdfa3-d482-4218-b4b9-3c2efc305fac) - flysystem-bundle is a Symfony bundle integrating the [Flysystem](https://flysystem.thephpleague.com) library into Symfony applications. @@ -12,13 +10,17 @@ It provides an efficient abstraction for the filesystem in order to change the s 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 3.0, which relies on Flysystem 3. -> If you use Flysystem 1.X, use [flysystem-bundle 1.X](https://github.com/thephpleague/flysystem-bundle/tree/1.x). -> If you use Flysystem 2.X, use [flysystem-bundle 2.X](https://github.com/thephpleague/flysystem-bundle/tree/2.3.0). +> If you use Flysystem 1.x, use [flysystem-bundle 1.x](https://github.com/thephpleague/flysystem-bundle/tree/1.x). +> If you use Flysystem 2.x, use [flysystem-bundle 2.x](https://github.com/thephpleague/flysystem-bundle/tree/2.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 8.0+ and Symfony 5.4+. +flysystem-bundle 3.x requires PHP 8.0+ and Symfony 5.4+. + +> If you need support for a lower PHP/Symfony version, consider using +> [flysystem-bundle 2.x](https://github.com/thephpleague/flysystem-bundle/tree/2.x) which support Flysystem 3.x +> and older PHP/Symfony versions. You can install the bundle using Symfony Flex: diff --git a/UPGRADE.md b/UPGRADE.md index 8a160f0..34849b4 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,3 +1,18 @@ +# Upgrading from 2.0 to 3.0 + +flysystem-bundle 3.0 dropped support for End-Of-Life versions of PHP, Symfony and Flysystem. + +No backward incompatible code change have been directly introduced by this bundle version. +You should read the [Flysystem 3.x changelog](https://github.com/thephpleague/flysystem/blob/3.x/CHANGELOG.md) +for any indirect change that may affect you. + +The list of changes is the following: + +* Dropped support for PHP 7.x ; +* Dropped support for Symfony 4.2 to 5.3 ; +* Dropped support of Flysystem 2.x ; +* Added support for Azure Blob Storage (`league/flysystem-azure-blob-storage ^3.1`) + # Upgrading from 1.0 to 2.0 flysystem-bundle 2.0 introduces backward incompatible changes, meaning you will need to update @@ -9,26 +24,9 @@ changes. You should read In addition to the library updates, the bundle also changed a bit: -* Add official support for PHP 8 ; +* Add official support for PHP 8.x ; * 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 ; - -# Upgrading from 2.0 to 3.0 - -flysystem-bundle 3.0 relies on Flysystem 3.0, PHP 8.0+ and Flysystem adapters 3.1+. - -The changes in this version focus on dropping support for EOL versions of PHP and Symfony and -adding support for Azure Blob Storage. -No new backwards incompatible code changes have been directly introduced by this new bundle version. -You should read the [Flysystem 3.x Change Log](https://github.com/thephpleague/flysystem/blob/3.x/CHANGELOG.md) -for any changes that may effect you. - -These changes are; - -* Added support for Azure Blob Storage (`league/flysystem-azure-blob-storage ^3.1`) -* Dropped support for PHP 7 -* Dropped support of `league/flysystem ^2.0` and older Flysystem adapters `league/flysystem-* ^2.0|3.0.*` -* Dropped support for Symfony 4.2 to 5.3 diff --git a/composer.json b/composer.json index dd5c857..232f94b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "league/flysystem-bundle", - "description": "Symfony bundle integrating Flysystem into Symfony 4.4+ applications", + "description": "Symfony bundle integrating Flysystem into Symfony 5.4+ applications", "type": "symfony-bundle", "license": "MIT", "authors": [ @@ -42,9 +42,6 @@ "symfony/var-dumper": "^5.4|^6.0", "symfony/yaml": "^5.4|^6.0" }, - "conflict": { - "league/flysystem-cached-adapter": "<1.0.9" - }, "config": { "preferred-install": { "*": "dist"