[5.x] Normalize query string when creating nocache session (#11545)

Co-authored-by: Jason Varga <[email protected]>

Author: duncanmcclean

src/StaticCaching/ServiceProvider.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
+use Illuminate\Support\Str;
 use Statamic\Facades\Cascade;
 use Statamic\StaticCaching\NoCache\DatabaseSession;
 use Statamic\StaticCaching\NoCache\Session;
@@ -42,6 +43,10 @@ public function register()
                 $uri = explode('?', $uri)[0];
             }
 
+            if (Str::contains($uri, '?')) {
+                $uri = Str::before($uri, '?').'?'.Request::normalizeQueryString(Str::after($uri, '?'));
+            }
+
             return match ($driver = config('statamic.static_caching.nocache', 'cache')) {
                 'cache' => new Session($uri),
                 'database' => new DatabaseSession($uri),

tests/StaticCaching/NoCacheSessionTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Cache;
 use Mockery;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\NoCache\Session;
 use Statamic\StaticCaching\NoCache\StringRegion;
 use Tests\FakesContent;
@@ -171,6 +172,23 @@ public function it_ignores_the_query_string()
         $this->assertEquals('http://localhost/test', $session->url());
     }
 
+    #[Test]
+    public function it_normalizes_query_string()
+    {
+        // Mock the Cacher to return a non-normalized URL.
+        // In tests, it always returns the current URL, so we have to mock it.
+        $cacher = Mockery::mock(Cacher::class);
+        $cacher->shouldReceive('getUrl')
+            ->andReturn('http://localhost/test?utm_source=linkedin.com&utm_medium=referral&utm_campaign=foo');
+
+        $this->app->instance(Cacher::class, $cacher);
+
+        $session = $this->app->make(Session::class);
+
+        $this->assertInstanceOf(Session::class, $session);
+        $this->assertEquals('http://localhost/test?utm_campaign=foo&utm_medium=referral&utm_source=linkedin.com', $session->url());
+    }
+
     #[Test]
     public function it_writes_session_if_a_nocache_tag_is_used()
     {