From da8697fba48d998a65df9d30f237acbaacab6786 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Sun, 16 Nov 2025 19:24:14 -0500 Subject: [PATCH 1/4] support Symfony 8.0 --- .github/workflows/ci.yaml | 10 +++++++--- composer.json | 18 +++++++++++------- tests/IntegrationTest.php | 1 - 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b67a347..77dcf9f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - main + - main pull_request: release: @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [ 8.1, 8.2, 8.3 ] + php: [ 8.1, 8.2, 8.3, 8.4 ] deps: [ highest ] - symfony: [ 5.4.*, 6.3.*, 6.4.* ] + symfony: [ 5.4.*, 6.3.*, 6.4.*, 7.3.*, 8.0.* ] include: - php: 8.1 deps: lowest @@ -24,6 +24,10 @@ jobs: symfony: '7.0.*' - php: 8.3 symfony: '7.1.*' + - php: 8.4 + symfony: '7.3.*' + - php: 8.4 + symfony: '8.0.*' steps: - uses: zenstruck/.github@php-test-symfony with: diff --git a/composer.json b/composer.json index 10736ae..ae936d4 100644 --- a/composer.json +++ b/composer.json @@ -19,15 +19,16 @@ "require": { "php": ">=8.1", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/translation": "^5.4|^6.0|^7.0", - "symfony/config": "^5.4|^6.0|^7.0" + "symfony/dependency-injection": "^5.4|^6.0|^7.0|^8.0", + "symfony/translation": "^5.4|^6.0|^7.0|^8.0", + "symfony/config": "^5.4|^6.0|^7.0|^8.0" }, "require-dev": { - "symfony/framework-bundle": "^5.4|^6.0|^7.0", - "symfony/phpunit-bridge": "^5.4|^6.0|^7.0", - "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "roave/security-advisories": "dev-latest", + "symfony/framework-bundle": "^5.4|^6.0|^7.0|^8.0", + "symfony/phpunit-bridge": "^5.4|^6.0|^7.0|^8.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0|^8.0", "phpstan/phpstan": "^1.11", "phpunit/phpunit": "^9.6" }, @@ -51,10 +52,13 @@ } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { + "symfony": { + "require": "^8.0" + }, "branch-alias": { "dev-master": "2.x-dev" } diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php index 5c6313b..3904535 100644 --- a/tests/IntegrationTest.php +++ b/tests/IntegrationTest.php @@ -100,7 +100,6 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa __DIR__.'/fixtures' => 'integration_test', ], 'strict_variables' => true, - 'exception_controller' => null, ]); // avoid logging request logs $container->register('logger', Logger::class) From e8c36b71d15b22c88cd18453c6b48c2f2e0fb45c Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Sun, 16 Nov 2025 19:27:46 -0500 Subject: [PATCH 2/4] run cs-fixer --- src/DateTimeFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DateTimeFormatter.php b/src/DateTimeFormatter.php index aa4687a..9d16cd9 100644 --- a/src/DateTimeFormatter.php +++ b/src/DateTimeFormatter.php @@ -19,7 +19,7 @@ public function __construct(private TranslatorInterface $translator) public function formatDiff( int|string|\DateTimeInterface $from, int|string|\DateTimeInterface|null $to = null, - ?string $locale = null + ?string $locale = null, ): string { $from = self::formatDateTime($from); $to = self::formatDateTime($to); @@ -95,7 +95,7 @@ public function formatDuration(float $seconds, ?string $locale = null): string public function formatAge( int|string|\DateTimeInterface $from, int|string|\DateTimeInterface|null $to = null, - ?string $locale = null + ?string $locale = null, ): string { $from = self::formatDateTime($from); $to = self::formatDateTime($to); From 50f28483d206aa5b5960c0bcc8b8d5a017f3b7e5 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Sun, 16 Nov 2025 19:58:40 -0500 Subject: [PATCH 3/4] tweak matrix --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 77dcf9f..69421e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: matrix: php: [ 8.1, 8.2, 8.3, 8.4 ] deps: [ highest ] - symfony: [ 5.4.*, 6.3.*, 6.4.*, 7.3.*, 8.0.* ] + symfony: [ 5.4.*, 6.4.* ] include: - php: 8.1 deps: lowest From bf1496389599a52b537eb87aadf8f1190403a5c6 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Mon, 1 Dec 2025 12:26:47 -0500 Subject: [PATCH 4/4] remove erroneous symfony require --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index ae936d4..dcdef9d 100644 --- a/composer.json +++ b/composer.json @@ -52,13 +52,9 @@ } }, - "minimum-stability": "RC", "prefer-stable": true, "extra": { - "symfony": { - "require": "^8.0" - }, "branch-alias": { "dev-master": "2.x-dev" }