Merge branch 'master' into 3.2-merge

Author: limingxinleo

src/Response/PaginatedResponse.php

@@ -41,10 +41,16 @@ protected function paginationInformation(): array
     {
         $paginated = $this->resource->resource->toArray();
 
-        return [
+        $default = [
             'links' => $this->paginationLinks($paginated),
             'meta' => $this->meta($paginated),
         ];
+
+        if ($this->resource instanceof PaginationInformationInterface) {
+            return $this->resource->paginationInformation($paginated, $default);
+        }
+
+        return $default;
     }
 
     /**

src/Response/PaginationInformationInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\Resource\Response;
+
+interface PaginationInformationInterface
+{
+    public function paginationInformation(array $paginated, array $default);
+}

tests/ResourceTest.php

@@ -23,6 +23,7 @@
 use HyperfTest\Resource\Stubs\Models\Subscription;
 use HyperfTest\Resource\Stubs\Resources\AuthorResourceWithOptionalRelationship;
 use HyperfTest\Resource\Stubs\Resources\ObjectResource;
+use HyperfTest\Resource\Stubs\Resources\PaginationCollection;
 use HyperfTest\Resource\Stubs\Resources\PostCollectionResource;
 use HyperfTest\Resource\Stubs\Resources\PostResource;
 use HyperfTest\Resource\Stubs\Resources\PostResourceWithExtraData;
@@ -733,6 +734,27 @@ public function testItWontKeysIfAnyOfThemAreStrings()
         ], ['data' => [0 => 10, 1 => 20, 'total' => 30]]);
     }
 
+    public function testResourceCollectionPagination()
+    {
+        $this->http(function () {
+            $paginator = new LengthAwarePaginator(
+                collect([new Post(['id' => 5, 'title' => 'Test Title'])]),
+                10,
+                15,
+                1
+            );
+
+            return new PaginationCollection($paginator);
+        })->assertJson([
+            'data' => [
+                [
+                    'id' => 5,
+                    'title' => 'Test Title',
+                ],
+            ],
+        ]);
+    }
+
     private function assertJsonResourceResponse($data, $expectedJson)
     {
         $this->http(function () use ($data) {

tests/Stubs/Resources/PaginationCollection.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace HyperfTest\Resource\Stubs\Resources;
+
+use Hyperf\Resource\Json\ResourceCollection;
+use Hyperf\Resource\Response\PaginationInformationInterface;
+
+class PaginationCollection extends ResourceCollection implements PaginationInformationInterface
+{
+    public function paginationInformation(array $paginated, array $default): array
+    {
+        return [];
+    }
+}