BC layer for old translator contract

Kreyu · Nov 24, 2024 · 442e9bb · 442e9bb
1 parent 7939d44
commit 442e9bb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/Column/Type/ColumnType.php b/src/Column/Type/ColumnType.php
@@ -123,7 +123,13 @@ public function buildExportHeaderView(ColumnHeaderView $view, ColumnInterface $c
 
         if ($this->translator) {
             if ($label instanceof TranslatableInterface) {
-                $label = $label->trans($this->translator, $this->translator->getLocale());
+                $locale = null;
+
+                if (method_exists(TranslatableInterface::class, 'getLocale')) {
+                    $locale = $this->translator->getLocale();
+                }
+
+                $label = $label->trans($this->translator, $locale);
             } else {
                 $translationDomain = $options['export']['header_translation_domain'];
                 $translationParameters = $options['export']['header_translation_parameters'];
@@ -161,7 +167,13 @@ public function buildExportValueView(ColumnValueView $view, ColumnInterface $col
 
         if ($this->translator && (is_string($viewData) || $viewData instanceof TranslatableInterface)) {
             if ($viewData instanceof TranslatableInterface) {
-                $viewData = $viewData->trans($this->translator, $this->translator->getLocale());
+                $locale = null;
+
+                if (method_exists(TranslatableInterface::class, 'getLocale')) {
+                    $locale = $this->translator->getLocale();
+                }
+
+                $viewData = $viewData->trans($this->translator, $locale);
             } else {
                 $translationDomain = $options['export']['value_translation_domain'];
                 $translationParameters = $options['export']['value_translation_parameters'];

diff --git a/tests/Unit/Column/Type/ColumnTypeTest.php b/tests/Unit/Column/Type/ColumnTypeTest.php
@@ -979,7 +979,13 @@ private function createValueRowView(?DataTableView $dataTableView = null, mixed
 
     protected function createTranslator(): MockObject&TranslatorInterface
     {
-        return $this->createMock(TranslatorInterface::class);
+        $translator = $this->createMock(TranslatorInterface::class);
+
+        if (method_exists(TranslatableInterface::class, 'getLocale')) {
+            $translator->method('getLocale')->willReturn('en');
+        }
+
+        return $translator;
     }
 
     protected function createTranslatable(string $value, bool $expectTranslated = true): MockObject&TranslatableInterface
@@ -989,9 +995,15 @@ protected function createTranslatable(string $value, bool $expectTranslated = tr
         if ($expectTranslated) {
             $this->translator ??= $this->createTranslator();
 
+            $locale = null;
+
+            if (method_exists(TranslatableInterface::class, 'getLocale')) {
+                $locale = 'en';
+            }
+
             $translatable->expects($this->once())
                 ->method('trans')
-                ->with($this->translator)
+                ->with($this->translator, $locale)
                 ->willReturn($value)
             ;