Merge pull request #3470 from acrobat/translator-sf7-forward-compat

[TranslatorBundle] Add Symfony 7 forward compatibility
Kunstmaan · Nov 11, 2024 · 8f1601b · 8f1601b
2 parents 0760eea + c74f9c5
commit 8f1601b
Showing 1 changed file with 30 additions and 4 deletions.
diff --git a/src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php b/src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php
@@ -4,8 +4,37 @@
 
 use Symfony\Bundle\FrameworkBundle\Translation\Translator as SymfonyTranslator;
 
+if (class_exists(\Symfony\Component\Routing\Loader\AnnotationClassLoader::class)) {
+    /**
+     * @internal
+     */
+    trait WarmupTrait
+    {
+        /**
+         * @param string|null $buildDir
+         */
+        public function warmUp(string $cacheDir/*, string $buildDir = null*/): array
+        {
+            return $this->doWarmup($cacheDir);
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait WarmupTrait
+    {
+        public function warmUp(string $cacheDir, string $buildDir = null): array
+        {
+            return $this->doWarmup($cacheDir, $buildDir);
+        }
+    }
+}
+
 class Translator extends SymfonyTranslator
 {
+    use WarmupTrait;
+
     private $translationRepository;
 
     /**
@@ -32,10 +61,7 @@ public function addDatabaseResources()
         }
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    private function doWarmUp(string $cacheDir, string $buildDir = null): array
     {
         return [];
     }