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

…to bump-to-php81
php-translation · Apr 11, 2024 · bad00c2 · bad00c2
2 parents 22a98b6 + 2b80944
commit bad00c2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/Command/CheckMissingCommand.php b/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;
                 }
             );

diff --git a/Controller/SymfonyProfilerController.php b/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
     {

diff --git a/Controller/WebUIController.php b/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);

diff --git a/EditInPlace/Activator.php b/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;

diff --git a/EditInPlace/ActivatorInterface.php b/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;
 }
diff --git a/EventListener/AutoAddMissingTranslations.php b/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;

diff --git a/Service/CacheClearer.php b/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);
 

diff --git a/Tests/Unit/Translator/EditInPlaceTranslatorTest.php b/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;
     }

diff --git a/Twig/TranslationExtension.php b/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';