Revert potential BC break in protected method

Signed-off-by: George Steel <[email protected]>
laminas · May 30, 2023 · 2e7b60d · 2e7b60d
1 parent 375dad3
commit 2e7b60d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -798,11 +798,14 @@
     </MixedAssignment>
     <MixedInferredReturnType>
       <code>bool</code>
+      <code>string</code>
     </MixedInferredReturnType>
     <MixedOperand>
       <code>$label</code>
     </MixedOperand>
     <MixedReturnStatement>
+      <code>$message</code>
+      <code>$message</code>
       <code><![CDATA[$results->last()]]></code>
     </MixedReturnStatement>
     <ParamNameMismatch>

diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php
@@ -434,7 +434,7 @@ public function htmlify(AbstractPage $page)
     protected function translate($message, $textDomain = null)
     {
         if (! is_string($message) || empty($message)) {
-            return '';
+            return $message;
         }
 
         if (! $this->isTranslatorEnabled() || ! $this->hasTranslator()) {