Merge branch 'improve-json-ld-hal-partial-pagination' into don-working

Author: onethumb

src/Hal/Serializer/CollectionNormalizer.php

@@ -53,8 +53,9 @@ protected function getPaginationData(iterable $object, array $context = []): arr
         ];
 
         if ($paginated) {
+            $data['_links']['first']['href'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, 1., $urlGenerationStrategy);
+
             if (null !== $lastPage) {
-                $data['_links']['first']['href'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, 1., $urlGenerationStrategy);
                 $data['_links']['last']['href'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $lastPage, $urlGenerationStrategy);
             }
 

src/JsonApi/Serializer/CollectionNormalizer.php

@@ -54,8 +54,9 @@ protected function getPaginationData($object, array $context = []): array
         ];
 
         if ($paginated) {
+            $data['links']['first'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, 1., $urlGenerationStrategy);
+
             if (null !== $lastPage) {
-                $data['links']['first'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, 1., $urlGenerationStrategy);
                 $data['links']['last'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $lastPage, $urlGenerationStrategy);
             }
 

src/Serializer/AbstractCollectionNormalizer.php

@@ -135,15 +135,24 @@ protected function getPaginationConfig(iterable $object, array $context = []): a
 
         if ($object instanceof PartialPaginatorInterface) {
             $paginated = $paginator = true;
+            $currentPage = $object->getCurrentPage();
+            $itemsPerPage = $object->getItemsPerPage();
+
             if ($object instanceof PaginatorInterface) {
                 $paginated = 1. !== $lastPage = $object->getLastPage();
                 $totalItems = $object->getTotalItems();
             } else {
                 $pageTotalItems = (float) \count($object);
+                if ($pageTotalItems < $itemsPerPage) {
+                    // this is likely the last page, include it
+                    $lastPage = $object->getCurrentPage();
+
+                    // we can also infer the total items
+                    $maxPossibleItems = $object->getCurrentPage() * $itemsPerPage;
+                    $missingItems = $itemsPerPage - $pageTotalItems;
+                    $totalItems = $maxPossibleItems - $missingItems;
+                }
             }
-
-            $currentPage = $object->getCurrentPage();
-            $itemsPerPage = $object->getItemsPerPage();
         } elseif (is_countable($object)) {
             $totalItems = \count($object);
         }