Fixing RouteTranslator

src/Utilities/RouteTranslator.php

@@ -165,7 +165,7 @@ public function getTranslatedRoute(
     public function getRouteNameFromPath($uri, $locale)
     {
         $attributes = Url::extractAttributes($uri);
-        $uri        = str_replace([url(), "/$locale/"], ['', ''], $uri);
+        $uri        = str_replace([url(), "/$locale/"], '', $uri);
         $uri        = trim($uri, '/');
 
         foreach ($this->translatedRoutes as $route) {
@@ -245,9 +245,16 @@ private function translate($key, $locale = null)
         }
 
         $translation = $this->translator->trans($key, [], '', $locale);
-        $this->checkTranslation($key, $locale, $translation);
 
-        return $translation;
+        // @codeCoverageIgnoreStart
+        if ( ! is_string($translation)) {
+            throw new InvalidTranslationException(
+                "The translation key [$key] for locale [$locale] should return a string value."
+            );
+        }
+        // @codeCoverageIgnoreEnd
+
+        return (string) $translation;
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -276,24 +283,4 @@ public function hasTranslation($key, $locale = null)
     {
         return $this->translator->has($key, $locale);
     }
-
-    /**
-     * Check the translation.
-     *
-     * @param  string  $key
-     * @param  string  $locale
-     * @param  mixed   $translation
-     *
-     * @throws InvalidTranslationException
-     */
-    private function checkTranslation($key, $locale, $translation)
-    {
-        // @codeCoverageIgnoreStart
-        if ( ! is_string($translation)) {
-            throw new InvalidTranslationException(
-                "The translation key [$key] for locale [$locale] should return a string value."
-            );
-        }
-        // @codeCoverageIgnoreEnd
-    }
 }