Merge branch 'master' of github.com:php-translation/symfony-bundle in…

…to patch-6 # Please enter a commit message to explain why this

merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored,
and an empty message aborts # the commit.

.github/workflows/ci.yml

@@ -10,11 +10,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2']
+        php: ['8.1', '8.2', '8.3', '8.4']
         strategy: [ 'highest' ]
         sf_version: ['']
         include:
-            - php: 8.0
+            - php: 8.1
               strategy: 'lowest'
 
     steps:

Command/CheckMissingCommand.php

@@ -136,7 +136,7 @@ private function countEmptyTranslations(MessageCatalogueInterface $catalogue): i
         foreach ($catalogue->getDomains() as $domain) {
             $emptyTranslations = array_filter(
                 $catalogue->all($domain),
-                function (string $message = null): bool {
+                function (?string $message = null): bool {
                     return null === $message || '' === $message;
                 }
             );

Controller/SymfonyProfilerController.php

@@ -95,7 +95,7 @@ public function syncAction(Request $request, string $token): Response
     }
 
     /**
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
+     * @return RedirectResponse|Response
      */
     public function syncAllAction(Request $request, string $token): Response
     {

Controller/WebUIController.php

@@ -76,7 +76,7 @@ public function __construct(
     /**
      * Show a dashboard for the configuration.
      */
-    public function indexAction(string $configName = null): Response
+    public function indexAction(?string $configName = null): Response
     {
         if (!$this->isWebUIEnabled) {
             return new Response('You are not allowed here. Check your config.', Response::HTTP_BAD_REQUEST);

EditInPlace/Activator.php

@@ -81,7 +81,7 @@ public function deactivate(): void
         }
     }
 
-    public function checkRequest(Request $request = null): bool
+    public function checkRequest(?Request $request = null): bool
     {
         if (null === $this->getSession() || !$this->getSession()->has(self::KEY)) {
             return false;

EditInPlace/ActivatorInterface.php

@@ -21,5 +21,5 @@ interface ActivatorInterface
     /**
      * Tells if the Edit In Place mode is enabled for this request.
      */
-    public function checkRequest(Request $request = null): bool;
+    public function checkRequest(?Request $request = null): bool;
 }

EventListener/AutoAddMissingTranslations.php

@@ -31,7 +31,7 @@ final class AutoAddMissingTranslations
      */
     private $storage;
 
-    public function __construct(StorageService $storage, DataCollectorTranslator $translator = null)
+    public function __construct(StorageService $storage, ?DataCollectorTranslator $translator = null)
     {
         $this->dataCollector = $translator;
         $this->storage = $storage;

Service/CacheClearer.php

@@ -58,7 +58,7 @@ public function __construct(string $kernelCacheDir, $translator, Filesystem $fil
      *
      * @param string|null $locale optional filter to clear only one locale
      */
-    public function clearAndWarmUp(string $locale = null): void
+    public function clearAndWarmUp(?string $locale = null): void
     {
         $translationDir = sprintf('%s/translations', $this->kernelCacheDir);
 

Tests/Unit/Translator/EditInPlaceTranslatorTest.php

@@ -113,7 +113,7 @@ public function __construct(bool $enabled = true)
         $this->enabled = $enabled;
     }
 
-    public function checkRequest(Request $request = null): bool
+    public function checkRequest(?Request $request = null): bool
     {
         return $this->enabled;
     }

Twig/TranslationExtension.php

@@ -71,7 +71,7 @@ public function getNodeVisitors(): array
         return $visitors;
     }
 
-    public function transchoiceWithDefault(string $message, string $defaultMessage, int $count, array $arguments = [], string $domain = null, string $locale = null): string
+    public function transchoiceWithDefault(string $message, string $defaultMessage, int $count, array $arguments = [], ?string $domain = null, ?string $locale = null): string
     {
         if (null === $domain) {
             $domain = 'messages';