Allow Symfony 5.x components to be used (#31)

Author: mpdude

.github/workflows/tests.yml

@@ -16,8 +16,8 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - { php-version: 7.2, symfony-locked-version: none, dependency-version: prefer-lowest }
-                    - { php-version: 7.4, symfony-locked-version: 4.4.*, dependency-version: prefer-stable }
+                    - { 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:

composer.json

@@ -20,26 +20,26 @@
         }
     ],
     "require": {
-        "php": "^7.2 | 8.0.* | 8.1.*",
+        "php": "^7.4 | 8.0.* | 8.1.*",
         "ext-intl": "*",
         "lib-icu": ">=4.8",
         "jms/parser-lib": "^1.0.0",
         "psr/log": "^1.0",
-        "symfony/config": "^3.4.31|^4.0",
-        "symfony/dependency-injection": "^3.4.31|^4.0",
-        "symfony/finder": "^3.4.31|^4.0",
-        "symfony/framework-bundle": "^4.4",
-        "symfony/http-kernel": "^3.4.31|^4.0",
-        "symfony/translation": "^4.2",
-        "symfony/translation-contracts": "^1.0.2|^2.0|^3.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/translation-contracts": "^2.0|^3.0",
         "twig/twig": "^1.42|^2.0|^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 | ^9.0",
-        "symfony/monolog-bundle": "^3.4.31|^4.0",
-        "symfony/phpunit-bridge": "> 5.0",
-        "symfony/twig-bundle": "^3.4.31|^4.0",
-        "symfony/yaml": "^4.4"
+        "symfony/monolog-bundle": "^3.4.31",
+        "symfony/phpunit-bridge": ">= 5.0",
+        "symfony/twig-bundle": "^3.4.31|^4.0|^5.0",
+        "symfony/yaml": "^4.4|^5.0"
     },
     "autoload": {
         "psr-4": {

src/Translator/FormatterDecorator.php

@@ -5,7 +5,6 @@
 use Symfony\Contracts\Translation\LocaleAwareInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\IcuTranslationBundle\Translator\Formatting\FormatterInterface;
-use Webfactory\IcuTranslationBundle\Translator\Formatting\IntlFormatter;
 
 /**
  * Decorates a Symfony translator and adds support for message formatting.
@@ -15,16 +14,14 @@ class FormatterDecorator implements TranslatorInterface, LocaleAwareInterface
     /**
      * The inner translator.
      *
-     * @var TranslatorInterface
+     * @var TranslatorInterface&LocaleAwareInterface
      */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     /**
      * The formatter that is used to apply message transformations.
-     *
-     * @var IntlFormatter
      */
-    protected $formatter;
+    protected FormatterInterface $formatter;
 
     public function __construct(TranslatorInterface $translator, FormatterInterface $formatter)
     {
@@ -36,27 +33,14 @@ public function __construct(TranslatorInterface $translator, FormatterInterface
         $this->formatter = $formatter;
     }
 
-    /**
-     * Translates the given message.
-     *
-     * @param string $id         The message id
-     * @param array  $parameters An array of parameters for the message
-     * @param string $domain     The domain for the message
-     * @param string $locale     The locale
-     */
-    public function trans($id, array $parameters = [], $domain = null, $locale = null): string
+    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string
     {
         $message = $this->translator->trans($id, $parameters, $domain, $locale);
 
         return $this->handleFormatting($id, $message, $parameters, $locale);
     }
 
-    /**
-     * Sets the current locale.
-     *
-     * @param string $locale The locale
-     */
-    public function setLocale($locale)
+    public function setLocale(string $locale): void
     {
         $this->translator->setLocale($locale);
     }