kj/duckbrain
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor(validator): rename enum rule and method to in

Browse Source
This commit is contained in:
kj
2026-09-14 16:47:48 -03:00
parent b7260b5199
commit 3b6da45b01
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Libs/Validator.php
View File

@@ -38,7 +38,7 @@ use Exception;
* | url | | Must be a valid URL | * | url | | Must be a valid URL |
* | date | | Must be a parseable date | * | date | | Must be a parseable date |
* | regex | :pattern | Must match a PCRE pattern (with delimiters) | * | regex | :pattern | Must match a PCRE pattern (with delimiters) |
* | enum | :a,b,c | Must be one of the listed values | * | in | :a,b,c | Must be one of the listed values |
* | min | :n | Length/number/count min (files: KB) | * | min | :n | Length/number/count min (files: KB) |
* | max | :n | Length/number/count max (files: KB) | * | max | :n | Length/number/count max (files: KB) |
* | between | :min,:max | Value within range (files: KB per upload) | * | between | :min,:max | Value within range (files: KB per upload) |
@@ -105,7 +105,7 @@ class Validator
* | :size | the size rule value | * | :size | the size rule value |
* | :value | the required_if expected value | * | :value | the required_if expected value |
* | :other | the required_if companion field / confirmation | * | :other | the required_if companion field / confirmation |
* | :values | a comma list (enum, mimes, required_with) | * | :values | a comma list (in, mimes, required_with) |
* |----------+----------------------------------------------------| * |----------+----------------------------------------------------|
* *
* @var array<string,string> * @var array<string,string>
@@ -122,7 +122,7 @@ class Validator
'array' => 'The :attribute must be an array.', 'array' => 'The :attribute must be an array.',
'email' => 'The :attribute must be a valid email address.', 'email' => 'The :attribute must be a valid email address.',
'url' => 'The :attribute must be a valid URL.', 'url' => 'The :attribute must be a valid URL.',
'enum' => 'The selected :attribute is invalid. Allowed: :values.', 'in' => 'The selected :attribute is invalid. Allowed: :values.',
'min' => 'The :attribute must be at least :min.', 'min' => 'The :attribute must be at least :min.',
'max' => 'The :attribute must not be greater than :max.', 'max' => 'The :attribute must not be greater than :max.',
'between' => 'The :attribute must be between :min and :max.', 'between' => 'The :attribute must be between :min and :max.',
@@ -243,7 +243,7 @@ class Validator
case 'size': case 'size':
$replace[':size'] = $args[0] ?? ''; $replace[':size'] = $args[0] ?? '';
break; break;
case 'enum': case 'in':
case 'mimes': case 'mimes':
case 'required_with': case 'required_with':
$replace[':values'] = implode(', ', $args); $replace[':values'] = implode(', ', $args);
@@ -305,7 +305,7 @@ class Validator
* arguments legitimately contain ':' or ',' - such as regex or mimes - * arguments legitimately contain ':' or ',' - such as regex or mimes -
* are preserved intact. The caller decides how to split the arguments. * are preserved intact. The caller decides how to split the arguments.
* *
* @param string $rule The rule to parse. Ex: "regex:/^a,b$/" or "enum:a,b". * @param string $rule The rule to parse. Ex: "regex:/^a,b$/" or "in:a,b".
* *
* @return array A two element array: [name, rawArguments]. When the rule * @return array A two element array: [name, rawArguments]. When the rule
* has no parameters, rawArguments is an empty string. * has no parameters, rawArguments is an empty string.
@@ -419,7 +419,7 @@ class Validator
* Splits a rule's raw argument string into the arguments to pass to the * Splits a rule's raw argument string into the arguments to pass to the
* rule's method (the subject is not included). * rule's method (the subject is not included).
* *
* Most rules take a comma-separated list of values (e.g. "enum:a,b"). * Most rules take a comma-separated list of values (e.g. "in:a,b").
* A few rules receive an argument that must be kept intact because it can * A few rules receive an argument that must be kept intact because it can
* legitimately contain commas or colons: "regex" (a pattern) and "not" * legitimately contain commas or colons: "regex" (a pattern) and "not"
* (a sub-rule that is itself parsed recursively). An empty argument string * (a sub-rule that is itself parsed recursively). An empty argument string
@@ -810,7 +810,7 @@ class Validator
* *
* @return bool * @return bool
*/ */
public static function enum(mixed $subject, ...$values): bool public static function in(mixed $subject, ...$values): bool
{ {
return in_array($subject, $values); return in_array($subject, $values);
} }