Merge pull request #71 from atiksoftware/3.x

Fix canonical URL generation for first page in pagination

Author: butschster

src/MetaTags/Concerns/ManageLinksTags.php

@@ -57,8 +57,12 @@ public function getCanonical(): ?TagInterface
 
     public function setPaginationLinks(Paginator $paginator): self
     {
-        $this->setCanonical($paginator->currentPage() > 1 ? $paginator->url($paginator->currentPage()) : $paginator->url(1));
-
+        $canonical = $paginator->url($paginator->currentPage());
+        if ($paginator->currentPage() == 1) {
+            $canonical = preg_replace('/[?&]page=\d+/', '', $canonical);
+            $canonical = rtrim($canonical, '?');
+        }
+        $this->setCanonical($canonical);
         $this->setNextHref($paginator->nextPageUrl());
         $this->setPrevHref($paginator->previousPageUrl());
 

tests/MetaTags/PaginatorMetaTagsTest.php

@@ -21,7 +21,7 @@ function test_its_can_be_set_from_paginator()
         // Mock methods to simulate paginator behavior for the first page.
         $paginator->shouldReceive('nextPageUrl')->once()->andReturn('http://site.com?page=2');
         $paginator->shouldReceive('previousPageUrl')->once()->andReturn(null); // No previous page for the first page
-        $paginator->shouldReceive('currentPage')->once()->andReturn(1);
+        $paginator->shouldReceive('currentPage')->twice()->andReturn(1);
         $paginator->shouldReceive('url')->with(1)->andReturn('http://site.com'); // Canonical URL without ?page=1
         $paginator->shouldReceive('url')->with(2)->andReturn('http://site.com?page=2');