From 7983aa94338e8a83fc5d9416888583c9c3a5a1c7 Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Wed, 5 Nov 2025 21:01:31 +0100 Subject: [PATCH 1/3] [CI] Tests over Symfony 7.4.0-beta1 and 8.0.0-beta1 --- .github/workflows/unit-tests.yaml | 8 ++++---- composer.json | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 3967810fcfe..677460f5530 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -34,7 +34,6 @@ jobs: minimum-stability: ['stable'] os: [''] include: - # dev packages (probably not needed to have multiple such jobs) - minimum-stability: 'dev' php-version: '8.5' # lowest deps @@ -48,10 +47,11 @@ jobs: os: 'windows-latest' # Explicit Symfony versions - php-version: '8.2' - symfony-version: '7.4.x-dev' # TODO: change to '7.4' when Symfony 7.4 is released + symfony-version: '^7.4.0-BETA1' # TODO: change to '7.4.*' when Symfony 7.4 is released + minimum-stability: 'beta' # TODO: remove when Symfony 8.0 is released as stable - php-version: '8.5' - symfony-version: '8.0.x-dev' # TODO: change to '8.0' when Symfony 8.0 is released - minimum-stability: 'dev' # TODO: remove when Symfony 8.0 is released + symfony-version: '^8.0.0-BETA1' # TODO: change to '8.0.*' when Symfony 8.0 is released + minimum-stability: 'beta' # TODO: remove when Symfony 8.0 is released as stable env: SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=5.4' }} # TODO: To change to '>=6.4' in 3.x diff --git a/composer.json b/composer.json index 4a24cfc1386..c4ded4af239 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,7 @@ "keywords": [ "dev" ], + "minimum-stability": "dev", "require-dev": { "php": ">=8.1", "symfony/filesystem": "^6.4|^7.0", From d4793dcd140afd13006f894c254ce6133fcdbb5a Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Wed, 5 Nov 2025 22:43:14 +0100 Subject: [PATCH 2/3] Add compatibility with doctrine/doctrine-bundle:^3.0.0 --- src/Autocomplete/composer.json | 2 +- src/LiveComponent/composer.json | 2 +- src/Turbo/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Autocomplete/composer.json b/src/Autocomplete/composer.json index e1c906c40bd..70607dbcb61 100644 --- a/src/Autocomplete/composer.json +++ b/src/Autocomplete/composer.json @@ -33,7 +33,7 @@ }, "require-dev": { "doctrine/collections": "^1.6.8|^2.0", - "doctrine/doctrine-bundle": "^2.4.3", + "doctrine/doctrine-bundle": "^2.4.3|^3.0.0", "doctrine/orm": "^2.9.4|^3.0", "fakerphp/faker": "^1.22", "mtdowling/jmespath.php": "^2.6", diff --git a/src/LiveComponent/composer.json b/src/LiveComponent/composer.json index 6b48567e415..dae4043ade1 100644 --- a/src/LiveComponent/composer.json +++ b/src/LiveComponent/composer.json @@ -37,7 +37,7 @@ "require-dev": { "doctrine/annotations": "^1.0|^2.0", "doctrine/collections": "^1.6.8|^2.0", - "doctrine/doctrine-bundle": "^2.4.3", + "doctrine/doctrine-bundle": "^2.4.3|^3.0.0", "doctrine/orm": "^2.9.4|^3.0", "doctrine/persistence": "^2.5.2|^3.0", "phpdocumentor/reflection-docblock": "5.x-dev", diff --git a/src/Turbo/composer.json b/src/Turbo/composer.json index 8c2cd971bd0..744de91e48f 100644 --- a/src/Turbo/composer.json +++ b/src/Turbo/composer.json @@ -38,7 +38,7 @@ "symfony/stimulus-bundle": "^2.9.1" }, "require-dev": { - "doctrine/doctrine-bundle": "^2.4.3", + "doctrine/doctrine-bundle": "^2.4.3|^3.0.0", "doctrine/orm": "^2.8|^3.0", "phpstan/phpstan": "^2.1.17", "symfony/asset-mapper": "^6.4|^7.0|^8.0", From 9014df5c9ba732f21e9d71829350a7d09dfb2ff7 Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Fri, 14 Nov 2025 23:55:18 +0100 Subject: [PATCH 3/3] Update spatie/phpunit-snapshot-assertions version constraint to support ^5.2.3 --- src/Map/composer.json | 2 +- src/Map/src/Bridge/Google/composer.json | 2 +- src/Map/src/Bridge/Leaflet/composer.json | 2 +- src/Toolkit/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Map/composer.json b/src/Map/composer.json index 635ac9638ff..aeb19e5730a 100644 --- a/src/Map/composer.json +++ b/src/Map/composer.json @@ -42,7 +42,7 @@ "symfony/twig-bundle": "^6.4|^7.0|^8.0", "symfony/ux-twig-component": "^2.18|^8.0", "symfony/ux-icons": "^2.18", - "spatie/phpunit-snapshot-assertions": "^4.2.17", + "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3", "phpunit/phpunit": "^9.6.22" }, "conflict": { diff --git a/src/Map/src/Bridge/Google/composer.json b/src/Map/src/Bridge/Google/composer.json index a6fd6d1b71d..6c0135a18ec 100644 --- a/src/Map/src/Bridge/Google/composer.json +++ b/src/Map/src/Bridge/Google/composer.json @@ -23,7 +23,7 @@ "require-dev": { "symfony/phpunit-bridge": "^7.2|^8.0", "symfony/ux-icons": "^2.18", - "spatie/phpunit-snapshot-assertions": "^4.2.17", + "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3", "phpunit/phpunit": "^9.6.22" }, "autoload": { diff --git a/src/Map/src/Bridge/Leaflet/composer.json b/src/Map/src/Bridge/Leaflet/composer.json index 7b7bba54c5c..cb9ca02e52e 100644 --- a/src/Map/src/Bridge/Leaflet/composer.json +++ b/src/Map/src/Bridge/Leaflet/composer.json @@ -23,7 +23,7 @@ "require-dev": { "symfony/phpunit-bridge": "^7.2|^8.0", "symfony/ux-icons": "^2.18", - "spatie/phpunit-snapshot-assertions": "^4.2.17", + "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3", "phpunit/phpunit": "^9.6.22" }, "autoload": { diff --git a/src/Toolkit/composer.json b/src/Toolkit/composer.json index 7c8678f400a..d1fd4782f3f 100644 --- a/src/Toolkit/composer.json +++ b/src/Toolkit/composer.json @@ -48,7 +48,7 @@ "symfony/stopwatch": "^6.4|^7.0|^8.0", "symfony/phpunit-bridge": "^7.2|^8.0", "vincentlanglet/twig-cs-fixer": "^3.9", - "spatie/phpunit-snapshot-assertions": "^4.2.17", + "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3", "phpunit/phpunit": "^9.6.22", "symfony/ux-icons": "^2.18", "tales-from-a-dev/twig-tailwind-extra": "^0.4.0"