revert: resource collection 结构（close: #56）

jiannei · Nov 17, 2021 · b3ccfc8 · b3ccfc8
1 parent e4f8d3f
commit b3ccfc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Response.php b/src/Response.php
@@ -344,13 +344,12 @@ protected function formatPaginatedData(array $paginated)
      */
     protected function formatResourceCollectionResponse($resource, string $message = '', int $code = 200, array $headers = [], int $option = 0)
     {
+        $data = array_merge_recursive(['data' => $resource->resolve(request())], $resource->with(request()), $resource->additional);
         if ($resource->resource instanceof AbstractPaginator) {
             $paginated = $resource->resource->toArray();
             $paginationInformation = $this->formatPaginatedData($paginated);
 
-            $data = array_merge_recursive(['data' => $resource->resolve(request())], $resource->with(request()), $resource->additional, $paginationInformation);
-        } else {
-            $data = array_merge_recursive($resource->resolve(request()), $resource->with(request()), $resource->additional);
+            $data = array_merge_recursive($data, $paginationInformation);
         }
 
         return tap(

diff --git a/tests/SuccessTest.php b/tests/SuccessTest.php
@@ -151,7 +151,7 @@ public function testSuccessWithCollectionData()
             'status' => 'success',
             'code' => 200,
             'message' => ResponseCodeEnum::fromValue(200)->description,
-            'data' => $data,
+            'data' => ['data' => $data],
             'error' => (object) [],
         ]);
         $this->assertJsonStringEqualsJsonString($expectedJson, $response->getContent());