Fix return type and implement getCatalogues() (#470)

* Fix return type and implement getCatalogues()

* Typecast the result of trans() to string

* Fix code styles

* Fix static PHPStan

* Fix code styles one more time

* Fix wrong property name - my bad

Author: bocharsky-bw

Tests/Unit/Translator/EditInPlaceTranslatorTest.php

@@ -69,9 +69,7 @@ public function testDisabled(): void
         $activator = new FakeActivator(false);
         $service = new EditInPlaceTranslator($symfonyTranslator, $activator, $requestStack);
 
-        $this->assertNull(
-            $service->trans('key', [])
-        );
+        $this->assertEmpty($service->trans('key', []));
     }
 
     public function testHtmlTranslation(): void

Translator/EditInPlaceTranslator.php

@@ -63,22 +63,34 @@ public function __construct($translator, ActivatorInterface $activator, RequestS
     }
 
     /**
-     * @see Translator::getCatalogue
+     * @see Translator::getCatalogue()
      */
     public function getCatalogue($locale = null): MessageCatalogueInterface
     {
         return $this->translator->getCatalogue($locale);
     }
 
+    /**
+     * @see Translator::getCatalogues()
+     */
+    public function getCatalogues(): array
+    {
+        if (!\method_exists($this->translator, 'getCatalogues')) {
+            throw new \Exception(\sprintf('%s method is not available! Please, upgrade to Symfony 6 in order to to use it', __METHOD__));
+        }
+
+        return $this->translator->getCatalogues();
+    }
+
     /**
      * @see Translator::trans
      */
-    public function trans($id, array $parameters = [], $domain = null, $locale = null): ?string
+    public function trans($id, array $parameters = [], $domain = null, $locale = null): string
     {
         $original = $this->translator->trans($id, $parameters, $domain, $locale);
         $request = LegacyHelper::getMainRequest($this->requestStack);
         if (!$this->activator->checkRequest($request)) {
-            return $original;
+            return (string) $original;
         }
 
         $plain = $this->translator->trans($id, [], $domain, $locale);

Translator/FallbackTranslator.php

@@ -137,6 +137,15 @@ public function getCatalogue($locale = null): MessageCatalogueInterface
         return $this->symfonyTranslator->getCatalogue($locale);
     }
 
+    public function getCatalogues(): array
+    {
+        if (!\method_exists($this->symfonyTranslator, 'getCatalogues')) {
+            throw new \Exception(\sprintf('%s method is not available! Please, upgrade to Symfony 6 in order to to use it', __METHOD__));
+        }
+
+        return $this->symfonyTranslator->getCatalogues();
+    }
+
     /**
      * Passes through all unknown calls onto the translator object.
      */