From c97013ef86bb96cce551704e437580a10e0d9e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 30 May 2022 12:19:00 +0200 Subject: [PATCH 1/3] Add support for Symfony 6 --- .github/workflows/build.yml | 6 +++--- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa2574e..e9e0418 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,8 @@ jobs: strategy: fail-fast: false matrix: - php: [7.4, 8.0] - symfony: [^4.4, ^5.2] + php: ["8.0"] + symfony: ["^5.4", "^6.0"] steps: - uses: actions/checkout@v2 @@ -51,7 +51,7 @@ jobs: - name: Restrict Symfony version if: matrix.symfony != '' run: | - composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10" + composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.17" composer config extra.symfony.require "${{ matrix.symfony }}" - name: Install dependencies diff --git a/composer.json b/composer.json index a05c523..0a3d3a3 100644 --- a/composer.json +++ b/composer.json @@ -10,11 +10,11 @@ } ], "require": { - "php": "^7.3 || ^8.0", + "php": "^8.0", "doctrine/doctrine-migrations-bundle": "^3.0", "doctrine/migrations": "^3.0", "marcj/topsort": "^1.1", - "symfony/framework-bundle": "^4.4 || ^5.2" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "require-dev": { "infection/infection": "^0.21.0", From 7ccd23ef87d4111eb228cc4a789bf378005c653c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 30 May 2022 12:33:30 +0200 Subject: [PATCH 2/3] Bump Infection and Psalm versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0a3d3a3..c9a85e9 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ "symfony/framework-bundle": "^5.4 || ^6.0" }, "require-dev": { - "infection/infection": "^0.21.0", + "infection/infection": "^0.26", "matthiasnoback/symfony-config-test": "^4.2", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "4.4.1" + "vimeo/psalm": "^4.23" }, "autoload": { "psr-4": { From e9de04d41988c400e165291885cf7450ad9cc532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 30 May 2022 12:35:48 +0200 Subject: [PATCH 3/3] Fix Psalm configuration --- psalm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psalm.xml b/psalm.xml index 991d35e..3bb02f9 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,7 +1,7 @@