Merge pull request #608 from deguif/review-translation-loader-bc

Review bc layer for symfony translation loader

Author: goetas

Translation/Loader/Symfony/XliffLoader.php

@@ -24,7 +24,6 @@
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Translation\Loader\LoaderInterface;
 use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\TranslatorBagInterface;
 
 /**
  * XLIFF loader.
@@ -36,9 +35,9 @@
  * @author Johannes M. Schmitt <[email protected]>
  */
 // phpcs:ignore
-class XliffLoaderInternal
+class XliffLoader implements LoaderInterface
 {
-    protected function loadInternal($resource, $locale, $domain = 'messages')
+    public function load($resource, string $locale, string $domain = 'messages'): MessageCatalogue
     {
         $previous = libxml_use_internal_errors(true);
         if (false === $xml = simplexml_load_file((string) $resource)) {
@@ -65,25 +64,3 @@ protected function loadInternal($resource, $locale, $domain = 'messages')
         return $catalogue;
     }
 }
-
-$isSf6 = method_exists(TranslatorBagInterface::class, 'getCatalogues');
-
-if ($isSf6) {
-    // phpcs:ignore
-    class XliffLoader extends XliffLoaderInternal implements LoaderInterface
-    {
-        public function load(mixed $resource, string $locale, string $domain = 'messages'): MessageCatalogue
-        {
-            return $this->loadInternal($resource, $locale, $domain);
-        }
-    }
-} else {
-    // phpcs:ignore
-    class XliffLoader extends XliffLoaderInternal implements LoaderInterface
-    {
-        public function load($resource, $locale, $domain = 'messages')
-        {
-            return $this->loadInternal($resource, $locale, $domain);
-        }
-    }
-}

Translation/Loader/SymfonyLoaderAdapter.php

@@ -33,10 +33,7 @@
  */
 class SymfonyLoaderAdapter implements LoaderInterface
 {
-    /**
-     * @var SymfonyLoader
-     */
-    private $loader;
+    private SymfonyLoader $loader;
 
     public function __construct(SymfonyLoader $loader)
     {