Added missing methods (accepted_if, ascii, date_equals...) to validation messages. (#7150)

weslenteche · web-flow · commit 8644f23a6df5 · 2024-11-20T13:51:36.000+08:00
diff --git a/publish/en/validation.php b/publish/en/validation.php
@@ -22,13 +22,15 @@
     */
 
     'accepted' => 'The :attribute must be accepted.',
+    'accepted_if' => 'The :attribute must be accepted when :other is :value.',
     'active_url' => 'The :attribute is not a valid URL.',
     'after' => 'The :attribute must be a date after :date.',
     'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
     'alpha' => 'The :attribute may only contain letters.',
     'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
     'alpha_num' => 'The :attribute may only contain letters and numbers.',
     'array' => 'The :attribute must be an array.',
+    'ascii' => 'The :attribute must only contain single-byte alphanumeric characters and symbols.',
     'before' => 'The :attribute must be a date before :date.',
     'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
     'between' => [
@@ -40,14 +42,20 @@
     'boolean' => 'The :attribute field must be true or false.',
     'confirmed' => 'The :attribute confirmation does not match.',
     'date' => 'The :attribute is not a valid date.',
+    'date_equals' => 'The :attribute must be a date equal to :date.',
     'date_format' => 'The :attribute does not match the format :format.',
     'decimal' => 'The :attribute must have :decimal decimal places.',
+    'declined' => 'The :attribute must be declined.',
+    'declined_if' => 'The :attribute must be declined when :other is :value.',
     'different' => 'The :attribute and :other must be different.',
     'digits' => 'The :attribute must be :digits digits.',
     'digits_between' => 'The :attribute must be between :min and :max digits.',
     'dimensions' => 'The :attribute has invalid image dimensions.',
     'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute must not start with one of the following: :values.',
     'email' => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values.',
     'exists' => 'The selected :attribute is invalid.',
     'file' => 'The :attribute must be a file.',
     'filled' => 'The :attribute field is required.',
@@ -72,6 +80,7 @@
     'ipv6' => 'The :attribute must be a valid IPv6 address.',
     'json' => 'The :attribute must be a valid JSON string.',
     'list' => 'The :attribute must be a list.',
+    'lowercase' => 'The :attribute must be lowercase.',
     'lt' => [
         'numeric' => 'The :attribute must be less than :value',
         'file' => 'The :attribute must be less than :value kb',
@@ -90,6 +99,7 @@
         'string' => 'The :attribute may not be greater than :max characters.',
         'array' => 'The :attribute may not have more than :max items.',
     ],
+    'max_digits' => 'The :attribute must not have more than :max digits.',
     'mimes' => 'The :attribute must be a file of type: :values.',
     'mimetypes' => 'The :attribute must be a file of type: :values.',
     'min' => [
@@ -98,6 +108,13 @@
         'string' => 'The :attribute must be at least :min characters.',
         'array' => 'The :attribute must have at least :min items.',
     ],
+    'min_digits' => 'The :attribute must have at least :min digits.',
+    'missing' => 'The :attribute must be missing.',
+    'missing_if' => 'The :attribute must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute must be missing when :values are present.',
+    'multiple_of' => 'The :attribute must be a multiple of :value.',
     'not_in' => 'The selected :attribute is invalid.',
     'not_regex' => 'The :attribute cannot match a given regular rule.',
     'numeric' => 'The :attribute must be a number.',
@@ -128,7 +145,9 @@
     'timezone' => 'The :attribute must be a valid zone.',
     'unique' => 'The :attribute has already been taken.',
     'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute must be uppercase.',
     'url' => 'The :attribute format is invalid.',
+    'ulid' => 'The :attribute must be a valid ULID.',
     'uuid' => 'The :attribute is invalid UUID.',
     'max_if' => [
         'numeric' => 'The :attribute may not be greater than :max when :other is :value.',
diff --git a/src/Concerns/FormatsMessages.php b/src/Concerns/FormatsMessages.php
@@ -94,12 +94,24 @@ public function getDisplayableValue(string $attribute, $value): string
             return $this->customValues[$attribute][$value];
         }
 
+        if (is_array($value)) {
+            return 'array';
+        }
+
         $key = "validation.values.{$attribute}.{$value}";
 
         if (($line = $this->translator->trans($key)) !== $key) {
             return $line;
         }
 
+        if (is_bool($value)) {
+            return $value ? 'true' : 'false';
+        }
+
+        if (is_null($value)) {
+            return 'empty';
+        }
+
         return (string) $value;
     }
 
diff --git a/src/Concerns/ReplacesAttributes.php b/src/Concerns/ReplacesAttributes.php
@@ -16,6 +16,30 @@
 
 trait ReplacesAttributes
 {
+    /**
+     * Replace all place-holders for the accepted_if rule.
+     */
+    protected function replaceAcceptedIf(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        $parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
+
+        $parameters[0] = $this->getDisplayableAttribute($parameters[0]);
+
+        return str_replace([':other', ':value'], $parameters, $message);
+    }
+
+    /**
+     * Replace all place-holders for the declined_if rule.
+     */
+    protected function replaceDeclinedIf(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        $parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
+
+        $parameters[0] = $this->getDisplayableAttribute($parameters[0]);
+
+        return str_replace([':other', ':value'], $parameters, $message);
+    }
+
     /**
      * Replace all place-holders for the between rule.
      */
@@ -78,6 +102,14 @@ protected function replaceMin(string $message, string $attribute, string $rule,
         return str_replace(':min', $parameters[0], $message);
     }
 
+    /**
+     * Replace all place-holders for the min digits rule.
+     */
+    protected function replaceMinDigits(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        return str_replace(':min', $parameters[0], $message);
+    }
+
     /**
      * Replace all place-holders for the max rule.
      */
@@ -86,6 +118,61 @@ protected function replaceMax(string $message, string $attribute, string $rule,
         return str_replace(':max', $parameters[0], $message);
     }
 
+    /**
+     * Replace all place-holders for the max digits rule.
+     */
+    protected function replaceMaxDigits(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        return str_replace(':max', $parameters[0], $message);
+    }
+
+    /**
+     * Replace all place-holders for the missing_if rule.
+     */
+    protected function replaceMissingIf(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        $parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
+
+        $parameters[0] = $this->getDisplayableAttribute($parameters[0]);
+
+        return str_replace([':other', ':value'], $parameters, $message);
+    }
+
+    /**
+     * Replace all place-holders for the missing_unless rule.
+     */
+    protected function replaceMissingUnless(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        return str_replace([':other', ':value'], [
+            $this->getDisplayableAttribute($parameters[0]),
+            $this->getDisplayableValue($parameters[0], $parameters[1]),
+        ], $message);
+    }
+
+    /**
+     * Replace all place-holders for the missing_with rule.
+     */
+    protected function replaceMissingWith(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        return str_replace(':values', implode(' / ', $this->getAttributeList($parameters)), $message);
+    }
+
+    /**
+     * Replace all place-holders for the missing_with_all rule.
+     */
+    protected function replaceMissingWithAll(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        return $this->replaceMissingWith($message, $attribute, $rule, $parameters);
+    }
+
+    /**
+     * Replace all place-holders for the multiple_of rule.
+     */
+    protected function replaceMultipleOf(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        return str_replace(':value', $parameters[0] ?? '', $message);
+    }
+
     /**
      * Replace all place-holders for the in rule.
      */
@@ -326,6 +413,18 @@ protected function replaceEndsWith(string $message, string $attribute, string $r
         return str_replace(':values', implode(', ', $parameters), $message);
     }
 
+    /**
+     * Replace all place-holders for the doesnt_end_with rule.
+     */
+    protected function replaceDoesntEndWith(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        foreach ($parameters as &$parameter) {
+            $parameter = $this->getDisplayableValue($attribute, $parameter);
+        }
+
+        return str_replace(':values', implode(', ', $parameters), $message);
+    }
+
     /**
      * Replace all place-holders for the starts_with rule.
      */
@@ -338,6 +437,18 @@ protected function replaceStartsWith(string $message, string $attribute, string
         return str_replace(':values', implode(', ', $parameters), $message);
     }
 
+    /**
+     * Replace all place-holders for the doesnt_start_with rule.
+     */
+    protected function replaceDoesntStartWith(string $message, string $attribute, string $rule, array $parameters): string
+    {
+        foreach ($parameters as &$parameter) {
+            $parameter = $this->getDisplayableValue($attribute, $parameter);
+        }
+
+        return str_replace(':values', implode(', ', $parameters), $message);
+    }
+
     /**
      * Replace all place-holders for the prohibited_with rule.
      * @param array<int,string> $parameters
diff --git a/src/Concerns/ValidatesAttributes.php b/src/Concerns/ValidatesAttributes.php
@@ -2009,4 +2009,15 @@ protected function shouldBeNumeric(string $attribute, string $rule)
             $this->numericRules[] = $rule;
         }
     }
+
+    /**
+     * Trim the value if it is a string.
+     *
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function trim($value)
+    {
+        return is_string($value) ? trim($value) : $value;
+    }
 }
diff --git a/src/Validator.php b/src/Validator.php
@@ -136,18 +136,19 @@ class Validator implements ValidatorContract
      * The validation rules that imply the field is required.
      */
     protected array $implicitRules = [
-        'Required', 'Filled', 'RequiredWith', 'RequiredWithAll', 'RequiredWithout',
-        'RequiredWithoutAll', 'RequiredIf', 'RequiredUnless', 'Accepted', 'Present',
+        'Required', 'Filled', 'Missing', 'MissingIf', 'MissingUnless', 'MissingWith',
+        'MissingWithAll', 'RequiredWith', 'RequiredWithAll', 'RequiredWithout', 'RequiredWithoutAll',
+        'RequiredIf', 'RequiredUnless', 'Accepted', 'AcceptedIf', 'Declined', 'DeclinedIf', 'Present',
     ];
 
     /**
      * The validation rules which depend on other fields as parameters.
      */
     protected array $dependentRules = [
-        'RequiredWith', 'RequiredWithAll', 'RequiredWithout', 'RequiredWithoutAll',
-        'RequiredIf', 'RequiredUnless', 'Confirmed', 'Same', 'Different', 'Unique',
-        'Before', 'After', 'BeforeOrEqual', 'AfterOrEqual', 'Gt', 'Lt', 'Gte', 'Lte',
-        'Prohibits', 'ExcludeIf', 'ExcludeUnless', 'ExcludeWith', 'ExcludeWithout',
+        'AcceptedIf', 'DeclinedIf', 'RequiredWith', 'RequiredWithAll', 'RequiredWithout',
+        'RequiredWithoutAll', 'RequiredIf', 'RequiredUnless', 'Confirmed', 'Same', 'Different',
+        'Unique', 'Before', 'After', 'BeforeOrEqual', 'AfterOrEqual', 'Gt', 'Lt', 'Gte', 'Lte',
+        'Prohibits', 'ExcludeIf', 'ExcludeUnless', 'ExcludeWith', 'ExcludeWithout', 'MissingIf', 'MissingUnless', 'MissingWith', 'MissingWithAll',
     ];
 
     /**
diff --git a/tests/Cases/ValidationValidatorTest.php b/tests/Cases/ValidationValidatorTest.php

Original file line number	Diff line number	Diff line change
`@@ -2009,4 +2009,15 @@ protected function shouldBeNumeric(string $attribute, string $rule)`
`2009`	`2009`	`$this->numericRules[] = $rule;`
`2010`	`2010`	`}`
`2011`	`2011`	`}`
	`2012`	`+`
	`2013`	`+ /**`
	`2014`	`+ * Trim the value if it is a string.`
	`2015`	`+ *`
	`2016`	`+ * @param mixed $value`
	`2017`	`+ * @return mixed`
	`2018`	`+ */`
	`2019`	`+ protected function trim($value)`
	`2020`	`+ {`
	`2021`	`+ return is_string($value) ? trim($value) : $value;`
	`2022`	`+ }`
`2012`	`2023`	`}`