feat: 分页数据格式化返回

Author: jiannei

src/Response.php

@@ -178,6 +178,10 @@ public function success($data = null, string $message = '', $code = 200, array $
             return $this->formatResourceResponse(...func_get_args());
         }
 
+        if ($data instanceof AbstractPaginator) {
+            return $this->formatPaginatedResponse(...func_get_args());
+        }
+
         if ($data instanceof Arrayable) {
             $data = $data->toArray();
         }
@@ -231,24 +235,43 @@ protected function formatData($data, $message, &$code, $errors = null): array
             'code' => $originalCode,
             'message' => $message,
             'data' => $data ?: (object) $data,
-            'error' =>  $errors ?: (object) [],
+            'error' => $errors ?: (object) [],
         ];
     }
 
     /**
-     * Format paginated resource data.
+     * Format paginated response.
      *
-     * @param  JsonResource  $resource
+     * @param  AbstractPaginator  $resource
      * @param  string  $message
      * @param  int  $code
      * @param  array  $headers
      * @param  int  $option
      *
      * @return mixed
      */
-    protected function formatPaginatedResourceResponse($resource, string $message = '', $code = 200, array $headers = [], $option = 0)
+    protected function formatPaginatedResponse($resource, string $message = '', $code = 200, array $headers = [], $option = 0)
+    {
+        $paginated = $resource->toArray();
+
+        $paginationInformation = $this->formatPaginatedData($paginated);
+
+        $paginationDataField = Config::get('response.format.paginated_resource.data_field', 'data');
+        $data = array_merge_recursive([$paginationDataField => $paginated['data']], $paginationInformation);
+
+        return $this->response($this->formatData($data, $message, $code), $code, $headers, $option);
+    }
+
+
+    /**
+     * Format paginated data.
+     *
+     * @param  array  $paginated
+     *
+     * @return array
+     */
+    protected function formatPaginatedData(array $paginated)
     {
-        $paginated = $resource->resource->toArray();
         $count = $paginated['total'] ?? null;
         $totalPages = $paginated['last_page'] ?? null;
         $previous = $paginated['prev_page_url'] ?? null;
@@ -279,6 +302,26 @@ protected function formatPaginatedResourceResponse($resource, string $message =
             ];
         }
 
+        return $paginationInformation;
+    }
+
+    /**
+     * Format paginated resource response.
+     *
+     * @param  JsonResource  $resource
+     * @param  string  $message
+     * @param  int  $code
+     * @param  array  $headers
+     * @param  int  $option
+     *
+     * @return mixed
+     */
+    protected function formatPaginatedResourceResponse($resource, string $message = '', $code = 200, array $headers = [], $option = 0)
+    {
+        $paginated = $resource->resource->toArray();
+
+        $paginationInformation = $this->formatPaginatedData($paginated);
+
         $paginationDataField = Config::get('response.format.paginated_resource.data_field', 'data');
         $data = array_merge_recursive([$paginationDataField => $this->parseDataFrom($resource)], $paginationInformation);