ENHANCE Prevent possible loop if the API does return the last link while it should not

Author: sylvainraye

src/Pagination/Page.php

@@ -28,25 +28,30 @@ class Page implements PageInterface
     /** @var string */
     protected $nextLink;
 
+    /** @var string|null */
+    protected $selfLink;
+
     /** @var int */
     protected $count;
 
     /** @var array */
-    protected $items;
+    protected         $items;
 
     /**
      * @param string      $firstLink
      * @param null|string $previousLink
      * @param null|string $nextLink
+     * @param null|string $selfLink
      * @param null|int    $count
      */
-    public function __construct(PageFactoryInterface $pageFactory, HttpClientInterface $httpClient, $firstLink, $previousLink, $nextLink, $count, array $items)
+    public function __construct(PageFactoryInterface $pageFactory, HttpClientInterface $httpClient, $firstLink, $previousLink, $nextLink, $selfLink, $count, array $items)
     {
         $this->pageFactory = $pageFactory;
         $this->httpClient = $httpClient;
         $this->firstLink = $firstLink;
         $this->previousLink = $previousLink;
         $this->nextLink = $nextLink;
+        $this->selfLink = $selfLink;
         $this->count = $count;
         $this->items = $items;
     }
@@ -96,7 +101,7 @@ public function getItems()
      */
     public function hasNextPage()
     {
-        return null !== $this->nextLink;
+        return null !== $this->nextLink && $this->selfLink != $this->nextLink;
     }
 
     /**

src/Pagination/PageFactory.php

@@ -35,6 +35,7 @@ public function createPage(array $data)
         $nextLink = $data['_links']['next']['href'] ?? null;
         $previousLink = $data['_links']['previous']['href'] ?? null;
         $firstLink = $data['_links']['first']['href'] ?? null;
+        $selftLink = $data['_links']['self']['href'] ?? null;
         $count = $data['total'] ?? null;
         $items = $data['_embedded']['items'] ?? [];
 
@@ -44,6 +45,7 @@ public function createPage(array $data)
             $firstLink,
             $previousLink,
             $nextLink,
+            $selftLink,
             $count,
             $items
         );