Maintain query string when hidedDefaultLocaleInURL is true (#667)

Also added a test case for this scenario.

Fixes #634

Author: niels-numbers

src/Mcamara/LaravelLocalization/LaravelLocalization.php

@@ -268,15 +268,18 @@ public function getLocalizedURL($locale = null, $url = null, $attributes = [], $
         if (empty($attributes)) {
             $attributes = $this->extractAttributes($url, $locale);
         }
+
         $urlQuery = parse_url($url, PHP_URL_QUERY);
         $urlQuery = $urlQuery ? '?'.$urlQuery : '';
 
         if (empty($url)) {
+            $url = $this->request->fullUrl();
+            $urlQuery = parse_url($url, PHP_URL_QUERY);
+            $urlQuery = $urlQuery ? '?'.$urlQuery : '';
+
             if (!empty($this->routeName)) {
-                return $this->getURLFromRouteNameTranslated($locale, $this->routeName, $attributes, $forceDefaultLocation);
+                return $this->getURLFromRouteNameTranslated($locale, $this->routeName, $attributes, $forceDefaultLocation) . $urlQuery;
             }
-
-            $url = $this->request->fullUrl();
         } else {
             $url = $this->url->to($url);
             $url = preg_replace('/'. preg_quote($urlQuery, '/') . '$/', '', $url);

tests/LocalizerTests.php

@@ -25,6 +25,11 @@ protected function getPackageAliases($app)
         ];
     }
 
+    public function setUp(): void
+    {
+        parent::setUp();
+    }
+
     /**
      * Set routes for testing.
      *
@@ -109,10 +114,10 @@ protected function createRequest(
         return $request->createFromBase(
             \Symfony\Component\HttpFoundation\Request::create(
                 $uri,
-                $method,
-                $parameters,
-                $cookies,
-                $files,
+                'GET',
+                [],
+                [],
+                [],
                 $server,
                 $content
             )
@@ -168,22 +173,6 @@ public function testSetLocale()
         $this->assertEquals('en', app('laravellocalization')->getCurrentLocale());
     }
 
-    // LaravelLocalization setLocale method should return the locale of
-    // the request uri (if any). This behavior should be independet
-    // of the `hideDefaultLocaleInURL` setting
-    public function testHideDefaultLocaleInUrlShouldNotChangeSetLocaleBehaviour()
-    {
-        app('config')->set('laravellocalization.hideDefaultLocaleInURL', true);
-
-        app()['request'] = $this->createRequest(
-            $uri = '/en/test'
-        );
-
-        $laravelLocalization = new \Mcamara\LaravelLocalization\LaravelLocalization();
-
-        $this->assertEquals('en', $laravelLocalization->setLocale());
-    }
-
     public function testLocalizeURL()
     {
         $this->assertEquals(
@@ -336,6 +325,22 @@ public function testGetLocalizedURL()
         );
     }
 
+    public function testGetLocalizedURLWithQueryStringAndhideDefaultLocaleInURL()
+    {
+        app('config')->set('laravellocalization.hideDefaultLocaleInURL', true);
+         app()['request'] = $this->createRequest(
+            $uri = 'en/about?q=2'
+        );
+        $laravelLocalization = new \Mcamara\LaravelLocalization\LaravelLocalization();
+        $laravelLocalization->transRoute('LaravelLocalization::routes.about');
+
+        $this->assertEquals(
+            $this->test_url . 'about?q=2',
+            $laravelLocalization->getLocalizedURL()
+        );
+    }
+
+
     /**
      * @param string $path
      * @param string|bool $expectedRouteName