From 7108d2ef1281d94796c362b018f5ab2a9c4409af Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Wed, 22 Nov 2023 16:31:00 +0100 Subject: [PATCH 1/2] Add support for SF7 --- .github/workflows/test.yaml | 5 +++++ composer.json | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0f8558c..aa96e45 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,6 +57,11 @@ jobs: allowed-to-fail: false symfony-require: 6.3.* variant: symfony/symfony:"6.3.*" + - php-version: '8.2' + dependencies: highest + allowed-to-fail: false + symfony-require: 7.0.* + variant: symfony/symfony:"7.0.*" steps: - name: Checkout diff --git a/composer.json b/composer.json index 435c9d4..7c2700f 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ "homepage": "https://docs.sonata-project.org/projects/twig-extensions", "require": { "php": "^8.0", - "symfony/config": "^5.4 || ^6.2", - "symfony/twig-bridge": "^5.4 || ^6.2", + "symfony/config": "^5.4 || ^6.2 || ^7.0", + "symfony/twig-bridge": "^5.4 || ^6.2 || ^7.0", "twig/twig": "^3.0" }, "require-dev": { @@ -39,14 +39,14 @@ "psalm/plugin-phpunit": "^0.18", "psalm/plugin-symfony": "^5.0", "rector/rector": "^0.18", - "symfony/browser-kit": "^5.4 || ^6.2", - "symfony/dependency-injection": "^5.4 || ^6.2", - "symfony/framework-bundle": "^5.4 || ^6.2", - "symfony/http-foundation": "^5.4 || ^6.2", - "symfony/http-kernel": "^5.4 || ^6.2", - "symfony/phpunit-bridge": "^6.2", - "symfony/translation": "^5.4 || ^6.2", - "symfony/twig-bundle": "^5.4 || ^6.2", + "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0", + "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0", + "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0", + "symfony/phpunit-bridge": "^6.2 || ^7.0", + "symfony/translation": "^5.4 || ^6.2 || ^7.0", + "symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0", "vimeo/psalm": "^5.0" }, "minimum-stability": "dev", From 9008177a6d0340128710fa323fe21958d772fba6 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Wed, 22 Nov 2023 18:02:26 +0100 Subject: [PATCH 2/2] Bump deps --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7c2700f..28d50f3 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", - "matthiasnoback/symfony-config-test": "^4.2", - "matthiasnoback/symfony-dependency-injection-test": "^4.0", + "matthiasnoback/symfony-config-test": "^4.2 || ^5.1", + "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", "phpstan/phpstan-phpunit": "^1.0",