Extra data error fixed

README.md

@@ -8,7 +8,7 @@ as converting and formatting exceptions to JSON responses.
 
 ## Talablar (Requirements)
 
-- PHP ^7.4|8.1
+- PHP ^8.1
 - Laravel ^10 | ^11
 
 ## Talqinlar mutonosibligi (Version Compatibility)

composer.json

@@ -24,7 +24,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/contracts": "^v10.48.16"
+        "illuminate/contracts": "^v10.0.1"
     },
     "require-dev": {
         "orchestra/testbench": "^8.0",

src/Responses/RestResponse.php

@@ -2,9 +2,8 @@
 
 namespace Ijodkor\ApiResponse\Responses;
 
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Ijodkor\ApiResponse\Supporters\ListPaginator;
 
 trait RestResponse {
@@ -104,24 +103,16 @@ protected function noContent(): JsonResponse {
 
     /**
      * Returned paginated response
-     * @param LengthAwarePaginator|ResourceCollection $data
+     * @param LengthAwarePaginator $data
      * @param string $key
      * @param string|null $message
      * @return JsonResponse
      */
-    protected function paginated($data, string $key, ?string $message = 'Muvaffaqiyatli'): JsonResponse {
-        if ($data instanceof LengthAwarePaginator) {
-            $data = new ListPaginator($data, $key);
-        } elseif ($data instanceof ResourceCollection) {
-            $data = new ListPaginator($data, $key);
-        }
-
+    protected function paginated(LengthAwarePaginator $data, string $key, ?string $message = 'Muvaffaqiyatli'): JsonResponse {
         return response()->json([
             'status' => true,
-            'data' => [
-                $key => $data
-            ],
-            'message' => $message,
+            'data' => new ListPaginator($data, $key),
+            'message' => $message
         ]);
     }
 }

src/Supporters/ListPaginator.php

@@ -3,7 +3,6 @@
 namespace Ijodkor\ApiResponse\Supporters;
 
 use Illuminate\Contracts\Pagination\LengthAwarePaginator as Paginator;
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Pagination\LengthAwarePaginator;
 
 class ListPaginator extends LengthAwarePaginator {
@@ -13,7 +12,7 @@ class ListPaginator extends LengthAwarePaginator {
      */
     private string $key;
 
-    public function __construct(Paginator|ResourceCollection $paginator, string $key = "data") {
+    public function __construct(Paginator $paginator, string $key = "data") {
         $this->key = $key;
 
         $options = ['path' => $paginator->path()];