Paginated homepage /?page=2 is canonical

pradoslaw · Jan 24, 2024 · 91fdaf2 · 91fdaf2
1 parent 9cab745
commit 91fdaf2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/Http/Middleware/RedirectToCanonicalUrl.php b/app/Http/Middleware/RedirectToCanonicalUrl.php
@@ -20,10 +20,11 @@ public function handle(Request $request, callable $next): HttpFoundation\Respons
 
     private function hasTrailingSlash(Request $request): bool
     {
-        if ($request->getRequestUri() === '/') {
+        $uri = $request->getPathInfo();
+        if ($uri === '/') {
             return false;
         }
-        return \str_ends_with($request->getPathInfo(), '/');
+        return \str_ends_with($uri, '/');
     }
 
     private function hasTrailingQuerySeparator(Request $request): bool

diff --git a/tests/Unit/Canonical/TrailingSlash/Test.php b/tests/Unit/Canonical/TrailingSlash/Test.php
@@ -40,6 +40,14 @@ public function homepage()
         $this->assertCanonicalGet('/');
     }
 
+    /**
+     * @test
+     */
+    public function homepagePage()
+    {
+        $this->assertCanonicalGet('/?page=2');
+    }
+
     /**
      * @test
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,14 @@ public function homepage() @@
             $this->assertCanonicalGet('/');
         }
+        /**
+         * @test
+         */
+        public function homepagePage()
+        {
+            $this->assertCanonicalGet('/?page=2');
+        }
         /**
          * @test
          */
@@ Expand Down @@