From a554e919fd5f5def03fbb60e192f6a89d8070a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 4 Dec 2023 10:37:09 +0100 Subject: [PATCH 1/3] Add support for Symfony 7 and php 8.3 --- .github/workflows/ci.yml | 8 ++------ composer.json | 27 +++++++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5561e9..389c086 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,8 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0', '8.1'] - symfony: ['4.4.*', '5.4.*', '6.0.*'] - exclude: - - - php: '7.4' - symfony: '6.0.*' + php: ['8.1', '8.2', '8.3'] + symfony: ['5.4.*', '6.4.*', '7.0.*'] steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 1d8d333..4436529 100644 --- a/composer.json +++ b/composer.json @@ -16,15 +16,15 @@ } }, "require": { - "php": "^7.4 || ^8.0", + "php": "^8.1", "erusev/parsedown": "^1.7", "erusev/parsedown-extra": "^0.8.1", - "symfony/asset": "^4.4 || ^5.3 || ^6.0", - "symfony/expression-language": "^4.4 || ^5.3 || ^6.0", - "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0", - "symfony/routing": "^4.4 || ^5.3 || ^6.0", - "symfony/twig-bundle": "^4.4 || ^5.3 || ^6.0", + "symfony/asset": "^5.4 || ^6.4 || ^7.0", + "symfony/expression-language": "^5.4 || ^6.4 || ^7.0", + "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0", + "symfony/routing": "^5.4 || ^6.4 || ^7.0", + "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0", "twig/extra-bundle": "^2.12|^3.0", "twig/markdown-extra": "^3.0", "twig/twig": "^2.12|^3.0", @@ -37,16 +37,19 @@ "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.0", "phpstan/phpstan-webmozart-assert": "^1.0", - "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0", - "symfony/css-selector": "^4.4 || ^5.3 || ^6.0", - "symfony/dotenv": "^4.4 || ^5.3 || ^6.0", - "symfony/phpunit-bridge": "^4.4 || ^5.3 || ^6.0", + "symfony/browser-kit": "^5.4 || ^6.4 || ^7.0", + "symfony/css-selector": "^5.4 || ^6.4 || ^7.0", + "symfony/dotenv": "^5.4 || ^6.4 || ^7.0", + "symfony/phpunit-bridge": "^5.4 || ^6.4 || ^7.0", "symplify/easy-coding-standard": "^9.0", "vimeo/psalm": "^4.7" }, "config": { "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "phpstan/extension-installer": true + } }, "scripts": { "analyse": [ From 89ecb4d544dba409cff7bdf8416d21a7fa9f4d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 4 Dec 2023 11:38:06 +0100 Subject: [PATCH 2/3] Allow flex on composer --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 389c086..707cfb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,7 @@ jobs: name: Restrict Symfony version if: matrix.symfony != '' run: | + composer global config --no-plugins allow-plugins.symfony/flex true composer global require --no-progress --no-scripts --no-plugins "symfony/flex" composer config extra.symfony.require "${{ matrix.symfony }}" composer config minimum-stability "dev" From 505814092bd3915cc82e58afa5302f9324c5c040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 4 Dec 2023 11:43:36 +0100 Subject: [PATCH 3/3] Upgrade matthiasnoback/symfony-dependency-injection-test --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4436529..7a6ea83 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "webmozart/assert": "^1.9" }, "require-dev": { - "matthiasnoback/symfony-dependency-injection-test": "^4.2", + "matthiasnoback/symfony-dependency-injection-test": "^5.0", "mobizel/coding-standard": "^1.0", "phpspec/phpspec": "^7.2", "phpstan/extension-installer": "^1.1",