Merge pull request #45 from Lomkit/feature/attribute-validation-errors

♻️ better attribute validation errors

Author: GautierDele

src/Http/Requests/MutateRequest.php

@@ -2,9 +2,9 @@
 
 namespace Lomkit\Rest\Http\Requests;
 
-use Illuminate\Support\Arr;
 use Illuminate\Validation\Rule;
 use Lomkit\Rest\Http\Resource;
+use Lomkit\Rest\Rules\ArrayWith;
 use Lomkit\Rest\Rules\CustomRulable;
 
 class MutateRequest extends RestRequest
@@ -45,7 +45,7 @@ public function mutateRules(Resource $resource, $prefix = 'mutate.*', $loadedRel
                 $prefix.'.attributes' => [
                     'prohibited_if:'.$prefix.'.operation,attach',
                     'prohibited_if:'.$prefix.'.operation,detach',
-                    'array:'.Arr::join($resource->fields($this), ','),
+                    new ArrayWith($resource->fields($this)),
                 ],
                 $prefix.'.key' => [
                     'required_if:'.$prefix.'.operation,update',
@@ -83,9 +83,11 @@ protected function relationRules(Resource $resource, string $prefix = '', $loade
 
         $rules = [
             $prefix => [
-                'array:'.Arr::join($resourceRelationsNotLoaded->map(function ($resourceRelationNotLoaded) {
-                    return $resourceRelationNotLoaded->relation;
-                })->toArray(), ','),
+                new ArrayWith(
+                    $resourceRelationsNotLoaded->map(function ($resourceRelationNotLoaded) {
+                        return $resourceRelationNotLoaded->relation;
+                    })->toArray()
+                ),
             ],
         ];
 

src/Relations/BelongsToMany.php

@@ -3,12 +3,12 @@
 namespace Lomkit\Rest\Relations;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
 use Lomkit\Rest\Concerns\Relations\HasPivotFields;
 use Lomkit\Rest\Contracts\QueryBuilder;
 use Lomkit\Rest\Contracts\RelationResource;
 use Lomkit\Rest\Http\Resource;
 use Lomkit\Rest\Relations\Traits\HasMultipleResults;
+use Lomkit\Rest\Rules\ArrayWith;
 
 class BelongsToMany extends Relation implements RelationResource
 {
@@ -30,7 +30,7 @@ public function rules(Resource $resource, string $prefix)
             [
                 $prefix.'.*.pivot' => [
                     'prohibited_if:'.$prefix.'.*.operation,detach',
-                    'array:'.Arr::join($this->getPivotFields(), ','),
+                    new ArrayWith($this->getPivotFields()),
                 ],
             ]
         );

src/Relations/MorphToMany.php

@@ -3,12 +3,12 @@
 namespace Lomkit\Rest\Relations;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
 use Lomkit\Rest\Concerns\Relations\HasPivotFields;
 use Lomkit\Rest\Contracts\QueryBuilder;
 use Lomkit\Rest\Contracts\RelationResource;
 use Lomkit\Rest\Http\Resource;
 use Lomkit\Rest\Relations\Traits\HasMultipleResults;
+use Lomkit\Rest\Rules\ArrayWith;
 
 class MorphToMany extends MorphRelation implements RelationResource
 {
@@ -30,7 +30,7 @@ public function rules(Resource $resource, string $prefix)
             [
                 $prefix.'.*.pivot' => [
                     'prohibited_if:'.$prefix.'.*.operation,detach',
-                    'array:'.Arr::join($this->getPivotFields(), ','),
+                    new ArrayWith($this->getPivotFields()),
                 ],
             ]
         );

src/Relations/MorphedByMany.php

@@ -3,12 +3,12 @@
 namespace Lomkit\Rest\Relations;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
 use Lomkit\Rest\Concerns\Relations\HasPivotFields;
 use Lomkit\Rest\Contracts\QueryBuilder;
 use Lomkit\Rest\Contracts\RelationResource;
 use Lomkit\Rest\Http\Resource;
 use Lomkit\Rest\Relations\Traits\HasMultipleResults;
+use Lomkit\Rest\Rules\ArrayWith;
 
 class MorphedByMany extends MorphRelation implements RelationResource
 {
@@ -30,7 +30,7 @@ public function rules(Resource $resource, string $prefix)
             [
                 $prefix.'.*.pivot' => [
                     'prohibited_if:'.$prefix.'.*.operation,detach',
-                    'array:'.Arr::join($this->getPivotFields(), ','),
+                    new ArrayWith($this->getPivotFields()),
                 ],
             ]
         );

src/Rules/ArrayWith.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Lomkit\Rest\Rules;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class ArrayWith implements ValidationRule
+{
+    protected array $keys;
+
+    public function __construct(array $keys)
+    {
+        $this->keys = $keys;
+    }
+
+    public function validate(string $attribute, mixed $value, \Closure $fail): void
+    {
+        if (!is_array($value)) {
+            $fail('The '.$attribute.' field must be an array.');
+        }
+        foreach (array_keys($value) as $key) {
+            if (!in_array($key, $this->keys)) {
+                $fail('The '.$key.' key is not valid for the '.$attribute.' field.');
+            }
+        }
+    }
+}