♻️ changed feedback

Author: GautierDele

composer.json

@@ -17,7 +17,7 @@
   "require-dev": {
     "guzzlehttp/guzzle": "^6.0|^7.0",
     "orchestra/testbench": "^9|^10",
-    "phpunit/phpunit": "^10|^11|^12",
+    "phpunit/phpunit": "^10|^11",
     "laravel/scout": "^10"
   },
   "autoload": {

src/Rules/Resource/ResourceCustomRules.php

@@ -11,14 +11,16 @@ public function buildValidationRules(string $attribute, mixed $value): array
     {
         $request = app(RestRequest::class);
 
-        if ($value['operation'] === 'create') {
+        $operation = is_array($value) ? ($value['operation'] ?? null) : null;
+
+        if ($operation === 'create') {
             $rules = $this->resource->createRules($request);
-        } elseif ($value['operation'] === 'update') {
+        } elseif ($operation === 'update') {
             $rules = $this->resource->updateRules($request);
         } else {
-            // No rules needed
-            return [];
-        }
+             // No rules needed for unknown/missing operations
+             return [];
+         }
 
         $rules = array_merge_recursive(
             $rules,

src/Rules/Resource/ResourceRelationOrNested.php

@@ -19,7 +19,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
         $relationResource = $this->resource->relation($relation)?->resource();
 
         if ($relationResource === null) {
-            $fail('The relation is not allowed');
+            $fail('The relation is not valid or allowed for this resource.');
         }
     }
 

src/Rules/Search/Search.php

@@ -15,9 +15,9 @@ public function buildValidationRules(string $attribute, mixed $value): array
 
         return [
             $attribute.'.limit'          => ['sometimes', 'integer', Rule::in($this->resource->getLimits($request))],
-            $attribute.'page'            => ['sometimes', 'integer'],
+            $attribute.'.page'            => ['sometimes', 'integer'],
             $attribute.'.filters'        => ['sometimes', 'array'],
-            $attribute.'gates'           => ['sometimes', 'array', Rule::in(['viewAny', 'view', 'create', 'update', 'delete', 'restore', 'forceDelete'])],
+            $attribute.'.gates'           => ['sometimes', 'array', Rule::in(['viewAny', 'view', 'create', 'update', 'delete', 'restore', 'forceDelete'])],
             $attribute.'.filters.*'      => (new SearchFilter())->setResource($this->resource),
             $attribute.'.scopes'         => ['sometimes', 'array', $isScoutMode ? 'prohibited' : ''],
             $attribute.'.scopes.*'       => (new SearchScope())->setResource($this->resource),

src/Rules/Search/SearchFilter.php

@@ -18,7 +18,7 @@ public function buildValidationRules(string $attribute, mixed $value): array
             Rule::in($this->resource->getScoutFields($request)) :
             (new ResourceFieldOrNested())->setResource($this->resource);
 
-        $allowedOperators = app(RestRequest::class)->isScoutMode() ?
+        $allowedOperators = $isScoutMode ?
             ['=', 'in', 'not in'] :
             ['=', '!=', '>', '>=', '<', '<=', 'like', 'not like', 'in', 'not in'];
 
@@ -47,7 +47,7 @@ public function buildValidationRules(string $attribute, mixed $value): array
             ],
             $attribute.'.type' => !$isScoutMode ? [
                 'sometimes',
-                Rule::in('or', 'and'),
+                Rule::in(['or', 'and']),
             ] : [
                 'prohibited',
             ],

src/Rules/Search/SearchInstructionField.php

@@ -26,7 +26,7 @@ public function buildValidationRules(string $attribute, mixed $value): array
         ];
     }
 
-    public function setInstruction(Instruction $instruction)
+    public function setInstruction(Instruction $instruction): static
     {
         $this->instruction = $instruction;
 

tests/Feature/Controllers/SearchLimitingOperationsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Controllers;
+namespace Lomkit\Rest\Tests\Feature\Controllers;
 
 use Illuminate\Support\Facades\Gate;
 use Lomkit\Rest\Tests\Feature\TestCase;

tests/Feature/Controllers/SearchPaginateOperationsTest.php

@@ -31,6 +31,26 @@ public function test_getting_a_list_of_resources_paginating_unauthorized_limit()
         $response->assertExactJsonStructure(['message', 'errors' => ['search.limit']]);
     }
 
+    public function test_getting_a_list_of_resources_using_string_page(): void
+    {
+        ModelFactory::new()->count(2)->create();
+
+        Gate::policy(Model::class, GreenPolicy::class);
+
+        $response = $this->post(
+            '/api/models/search',
+            [
+                'search' => [
+                    'page' => 'hello',
+                ],
+            ],
+            ['Accept' => 'application/json']
+        );
+
+        $response->assertStatus(422);
+        $response->assertExactJsonStructure(['message', 'errors' => ['search.page']]);
+    }
+
     public function test_getting_a_list_of_resources_paginating_second_page(): void
     {
         $matchingModel = ModelFactory::new()->create()->fresh();
@@ -50,6 +70,10 @@ public function test_getting_a_list_of_resources_paginating_second_page(): void
             ['Accept' => 'application/json']
         );
 
+        $response->assertJsonFragment([
+            'current_page' => 2,
+        ]);
+
         $this->assertResourcePaginated(
             $response,
             [$matchingModel2],