Add the ability to optionally merge automatically inferred rules with manual rules #848
Conversation
CWAscend
changed the title
|
Up |
| $manualRules = collect($manualRules)->map( | ||
| fn (string|array $rules) => is_array($rules) ? $rules : explode('|', $rules) | ||
| )->all(); |
There was a problem hiding this comment.
Why not use the RuleDenormalizer here?
Also: when we add an attribute not to validate the property it will still be validated we don't want that.
I think a better solution would be to implement the logic within the loop where addRules isn't called since it replaces them but rather rules are merged over there (or not if the property shouldn"t be validated).
|
|
||
| protected function shouldMergeRules(DataClass $class): bool | ||
| { | ||
| return $class->attributes->contains(fn (object $attribute) => $attribute::class === MergeRules::class); |
There was a problem hiding this comment.
No need for an extra function here, just inline the variable
| @@ -223,7 +224,7 @@ protected function resolveToplevelRules( | |||
| } | |||
|
|
|||
|
|
|||
| protected function resolveOverwrittenRules( | |||
| protected function resolveRules( | |||
There was a problem hiding this comment.
Let us rename this to appendOverwrittenRules, resolveRules is too general.
| @@ -240,9 +241,19 @@ protected function resolveOverwrittenRules( | |||
| $path | |||
| ); | |||
|
|
|||
| $overwrittenRules = app()->call([$class->name, 'rules'], ['context' => $validationContext]); | |||
| $manualRules = app()->call([$class->name, 'rules'], ['context' => $validationContext]); | |||
There was a problem hiding this comment.
Let's keep this as overwrittenRules.
| public static function rules(): array | ||
| { | ||
| return [ | ||
| 'first_name' => ['min:2'] | ||
| ]; |
There was a problem hiding this comment.
Inline these classes within the tests, that makes the fakes directory a bit less heavy.
|
@rubenvanassche thanks for the feedback, I'll action this over the weekend 👍 |
💪 Motivation
I would like the ability to use a combination of Attribute rules and manual rules that are defined within the static
rulesmethod in aDataobject. For me, this will massively clean up my rules method when I have to reach for it, such as which I might be reaching for acallablerule, or using theRule::in()rule where the array is dynamic - just to name some examples.🛠 Changes
Spatie\LaravelData\Attributes\MergeRulesattributetests/Fakes/DataWithMergedRuleset.php🧪 Testing
it will merge validation rules, which ensures both validation rules from the Attributes and the rules method are picked up.it will merge validation rules using string ruleswhich ensures the validation rules can be a piped string of rules instead of an array of files for each attribute🧙 Reminders (Author)