From f7bef7002e384c137dcb9583ebc10dea1fd6ebab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 25 Oct 2022 18:01:20 +0000 Subject: [PATCH 1/3] Upgrade to Symfony 6 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 99efaf3..7109118 100644 --- a/composer.json +++ b/composer.json @@ -25,9 +25,9 @@ "require": { "php": "^7.3 || ^8.0", "nikic/php-parser": "^4.10", - "symfony/console": "^5.1", - "symfony/filesystem": "^5.0", - "symfony/finder": "^5.0" + "symfony/console": "^6.0", + "symfony/filesystem": "^6.0", + "symfony/finder": "^6.0" }, "require-dev": { "vimeo/psalm": "^4.1", From d2f68068e17d3002287e7e28fe5d24ed221bb050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 25 Oct 2022 18:09:46 +0000 Subject: [PATCH 2/3] Fix version constraints --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 7109118..05f3e25 100644 --- a/composer.json +++ b/composer.json @@ -25,13 +25,13 @@ "require": { "php": "^7.3 || ^8.0", "nikic/php-parser": "^4.10", - "symfony/console": "^6.0", - "symfony/filesystem": "^6.0", - "symfony/finder": "^6.0" + "symfony/console": "^5.0 || ^6.0", + "symfony/filesystem": "^5.0 || ^6.0", + "symfony/finder": "^5.0 || ^6.0" }, "require-dev": { "vimeo/psalm": "^4.1", "phpunit/phpunit": "^9.4", - "friendsofphp/php-cs-fixer": "^2.16" + "friendsofphp/php-cs-fixer": "^3.12" } } From 14f82149c2186e9ea848906e96af8635b0dbd831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 25 Oct 2022 18:17:08 +0000 Subject: [PATCH 3/3] Fix the fix --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 05f3e25..98f674d 100644 --- a/composer.json +++ b/composer.json @@ -25,13 +25,13 @@ "require": { "php": "^7.3 || ^8.0", "nikic/php-parser": "^4.10", - "symfony/console": "^5.0 || ^6.0", + "symfony/console": "^5.1 || ^6.0", "symfony/filesystem": "^5.0 || ^6.0", "symfony/finder": "^5.0 || ^6.0" }, "require-dev": { "vimeo/psalm": "^4.1", "phpunit/phpunit": "^9.4", - "friendsofphp/php-cs-fixer": "^3.12" + "friendsofphp/php-cs-fixer": "^2.16 || ^3.12" } }