From d1e9afc5607ea03a0e91846d7fb5cb415fe9c897 Mon Sep 17 00:00:00 2001 From: Trent Steel Date: Thu, 30 Nov 2023 13:32:08 +1000 Subject: [PATCH 1/2] Add Symfony 7 support --- .github/workflows/test-application.yaml | 4 ++++ composer.json | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 000a0a3f..c8b957c3 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -27,6 +27,10 @@ jobs: symfony-version: '6.0.*' - php-version: '8.1' symfony-version: '6.0.*' + - php-version: '8.0' + symfony-version: '7.0.*' + - php-version: '8.1' + symfony-version: '7.0.*' steps: - name: Checkout project diff --git a/composer.json b/composer.json index 83ebce9a..908ba3a2 100644 --- a/composer.json +++ b/composer.json @@ -17,26 +17,26 @@ "require": { "php": "^8.0", "symfony-cmf/routing": "^3.0", - "symfony/framework-bundle": "^6.0" + "symfony/framework-bundle": "^6.0 || ^7.0" }, "require-dev": { "jackalope/jackalope-doctrine-dbal": "^1.3", "doctrine/phpcr-odm": "^1.4|^2.0", - "symfony/phpunit-bridge": "^6.0", + "symfony/phpunit-bridge": "^6.0 || ^7.0", "matthiasnoback/symfony-dependency-injection-test": "^4.1.0", "matthiasnoback/symfony-config-test": "^4.1.0", "doctrine/orm": "^2.9", "symfony-cmf/testing": "dev-master as 4.2.0", "doctrine/data-fixtures": "^1.0.0", - "symfony/form": "^6.0", - "symfony/translation": "^6.0", - "symfony/validator": "^6.0", - "symfony/security-bundle": "^6.0", + "symfony/form": "^6.0 || ^7.0", + "symfony/translation": "^6.0 || ^7.0", + "symfony/validator": "^6.0 || ^7.0", + "symfony/security-bundle": "^6.0 || ^7.0", "doctrine/doctrine-bundle": "^2.0", - "symfony/twig-bundle": "^6.0", + "symfony/twig-bundle": "^6.0 || ^7.0", "symfony/monolog-bundle": "^3.5", "doctrine/phpcr-bundle": "^2.3", - "symfony/serializer": "^6.0", + "symfony/serializer": "^6.0 || ^7.0", "twig/twig": "^2.4.4 || ^3.0" }, "suggest": { From 9dc31596ec708d85131ebdf3ee35e2b33738947c Mon Sep 17 00:00:00 2001 From: Trent Steel Date: Thu, 30 Nov 2023 13:38:26 +1000 Subject: [PATCH 2/2] Symfony 7 requires php 8.2 --- .github/workflows/test-application.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index c8b957c3..2affe1c8 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -27,9 +27,7 @@ jobs: symfony-version: '6.0.*' - php-version: '8.1' symfony-version: '6.0.*' - - php-version: '8.0' - symfony-version: '7.0.*' - - php-version: '8.1' + - php-version: '8.2' symfony-version: '7.0.*' steps: