🐛 laravel 11 compatibility

Author: GautierDele

README.md

@@ -6,7 +6,7 @@ Laravel Rest Api is an elegant way to expose your app through an API, it takes f
 
 ## Requirements
 
-PHP 8.1+ and Laravel 10.0+
+PHP 8.2+ and Laravel 11+
 
 ## Documentation, Installation, and Usage Instructions
 

composer.json

@@ -12,7 +12,7 @@
   "require": {
     "php": "^8.2",
     "ext-json": "*",
-    "laravel/framework": "^11.0|^12.0"
+    "laravel/framework": "^11|^12"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.0|^7.0",

src/Actions/DispatchAction.php

@@ -3,6 +3,7 @@
 namespace Lomkit\Rest\Actions;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\DB;
@@ -122,25 +123,36 @@ public function dispatch($chunkCount)
      */
     public function handleClassic(int $chunkCount)
     {
+        /**
+         * @var Builder $searchQuery
+         */
         $searchQuery =
             app()->make(QueryBuilder::class, ['resource' => $this->request->resource, 'query' => null])
                 ->disableDefaultLimit()
                 ->search($this->request->input('search', []));
 
+        $limit = $searchQuery->toBase()->limit;
+
         $searchQuery
             ->clone()
             ->chunk(
                 $chunkCount,
-                function ($chunk) {
-                    return $this->forModels(
-                        \Illuminate\Database\Eloquent\Collection::make(
-                            $chunk
-                        )
-                    );
+                function ($chunk, $page) use ($limit, $chunkCount) {
+                    $collection = \Illuminate\Database\Eloquent\Collection::make($chunk);
+
+                    // This is to remove for Laravel 12, chunking with limit does not work
+                    // in Laravel 11
+                    if ($page * $chunkCount >= $limit) {
+                        $collection = $collection->take($limit - ($page - 1) * $chunkCount);
+                        $this->forModels($collection);
+                        return false;
+                    }
+
+                    return $this->forModels($collection);
                 }
             );
 
-        return $searchQuery->getLimit() ?? $searchQuery->count();
+        return $limit ?? $searchQuery->count();
     }
 
     /**
@@ -208,7 +220,7 @@ protected function dispatchSynchronouslyForCollection(Collection $models)
      *
      * @return $this
      */
-    protected function addQueuedActionJob(Collection $models)
+    protected function addQueuedActionJob(Collection $models): self
     {
         $job = new CallRestApiAction($this->action, $this->fields, $models);
 

tests/Feature/Controllers/ActionsOperationsTest.php

@@ -298,7 +298,7 @@ public function test_operate_action_with_search(): void
     public function test_operate_action_with_search_and_limit(): void
     {
         ModelFactory::new()
-            ->count(100)
+            ->count(300)
             ->create([
                 'string' => 'match',
             ]);
@@ -315,19 +315,19 @@ public function test_operate_action_with_search_and_limit(): void
                     'filters' => [
                         ['field' => 'string', 'value' => 'match'],
                     ],
-                    'limit' => 50,
+                    'limit' => 150,
                 ],
             ],
             ['Accept' => 'application/json']
         );
 
         $response->assertJson([
             'data' => [
-                'impacted' => 50,
+                'impacted' => 150,
             ],
         ]);
         $this->assertEquals(
-            50,
+            150,
             Model::where('number', 100000000)->count()
         );
     }

tests/Support/Rest/Resources/ModelResource.php

@@ -115,6 +115,7 @@ public function limits(RestRequest $request): array
             10,
             25,
             50,
+            150
         ];
     }