From d96f2981d0fc8a6f41a102702d2351d345491fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20G=C3=BCthler?= Date: Fri, 27 Feb 2026 10:25:58 +0000 Subject: [PATCH 1/3] Allow Symfony 6 components. Disallow Symfony Components < 5. Disallow PHP < 8.1 --- .github/workflows/tests.yml | 2 -- composer.json | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b5c8f20..5b12797 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,8 +16,6 @@ jobs: fail-fast: false matrix: include: - - { php-version: 7.4, symfony-locked-version: none, dependency-version: prefer-lowest } - - { php-version: 7.4, symfony-locked-version: none, dependency-version: prefer-stable } - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-stable } name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }}) steps: diff --git a/composer.json b/composer.json index 480a82c..5878c0a 100644 --- a/composer.json +++ b/composer.json @@ -20,17 +20,17 @@ } ], "require": { - "php": "^7.4 | 8.0.* | 8.1.*", + "php": "8.1.*", "ext-intl": "*", "lib-icu": ">=4.8", "jms/parser-lib": "^1.0.0", "psr/log": "^1.0", - "symfony/config": "^4.3|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/finder": "^3.4.31|^4.0|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/translation": "^4.2|^5.0", + "symfony/config": "^5.0|^6.0", + "symfony/dependency-injection": "^5.0|^6.0", + "symfony/finder": "^5.0|^6.0", + "symfony/framework-bundle": "^5.0|^6.0", + "symfony/http-kernel": "^5.0|^6.0", + "symfony/translation": "^5.0|^6.0", "symfony/translation-contracts": "^2.0|^3.0", "twig/twig": "^1.42|^2.0|^3.0" }, From 16b7400a320b8f1768e60a326cb28a51c156f9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20G=C3=BCthler?= Date: Fri, 27 Feb 2026 11:45:34 +0100 Subject: [PATCH 2/3] Remove deprecated service definitions and rely on autowiring --- src/Resources/config/services.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index 592260d..43dc2f1 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -9,18 +9,10 @@ services: Webfactory\IcuTranslationBundle\Twig\: resource: '../../Twig' - webfactory_icu_translation.formatter.intl_formatter: - alias: Webfactory\IcuTranslationBundle\Translator\Formatting\IntlFormatter - deprecated: ~ - Webfactory\IcuTranslationBundle\Translator\Formatting\DefaultParameterDecorator: arguments: - '@Webfactory\IcuTranslationBundle\Translator\Formatting\IntlFormatter' - webfactory_icu_translation.formatter.default_parameters: - alias: Webfactory\IcuTranslationBundle\Translator\Formatting\DefaultParameterDecorator - deprecated: ~ - Webfactory\IcuTranslationBundle\Translator\Formatting\MissingParameterWarningDecorator: arguments: - '@Webfactory\IcuTranslationBundle\Translator\Formatting\DefaultParameterDecorator' @@ -28,18 +20,10 @@ services: tags: - { name: monolog.logger, channel: webfactory_icu_translation } - webfactory_icu_translation.formatter.missing_parameters: - alias: Webfactory\IcuTranslationBundle\Translator\Formatting\MissingParameterWarningDecorator - deprecated: ~ - Webfactory\IcuTranslationBundle\Translator\Formatting\TwigParameterNormalizer: arguments: - '@Webfactory\IcuTranslationBundle\Translator\Formatting\MissingParameterWarningDecorator' - webfactory_icu_translation.formatter.twig_parameter_normalizer: - alias: Webfactory\IcuTranslationBundle\Translator\Formatting\TwigParameterNormalizer - deprecated: ~ - Webfactory\IcuTranslationBundle\Translator\Formatting\GracefulExceptionsDecorator: class: Webfactory\IcuTranslationBundle\Translator\Formatting\GracefulExceptionsDecorator arguments: @@ -48,10 +32,6 @@ services: tags: - { name: monolog.logger, channel: webfactory_icu_translation } - webfactory_icu_translation.formatter.graceful_exceptions: - alias: Webfactory\IcuTranslationBundle\Translator\Formatting\GracefulExceptionsDecorator - deprecated: ~ - Webfactory\IcuTranslationBundle\Translator\FormatterDecorator: decorates: translator arguments: @@ -65,7 +45,3 @@ services: # The top end of the Formatter stack set up by this bundle: Webfactory\IcuTranslationBundle\Translator\Formatting\FormatterInterface: alias: Webfactory\IcuTranslationBundle\Translator\Formatting\GracefulExceptionsDecorator - - webfactory_icu_translation.formatter: - alias: Webfactory\IcuTranslationBundle\Translator\Formatting\FormatterInterface - deprecated: ~ From 6552e86560acef796a77acf991e944287339a333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20G=C3=BCthler?= Date: Fri, 27 Feb 2026 10:57:34 +0000 Subject: [PATCH 3/3] Test for Symfony 5 and 6 --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5b12797..271c396 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,8 @@ jobs: fail-fast: false matrix: include: - - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-stable } + - { php-version: 8.1, symfony-locked-version: 5.4.*, dependency-version: prefer-stable } + - { php-version: 8.1, symfony-locked-version: 6.4.*, dependency-version: prefer-stable } name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }}) steps: - uses: actions/checkout@v4