Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more validator refactoring.

This commit is contained in:
Taylor Otwell 2011-10-16 20:48:01 -05:00
parent 06765e9aa3
commit d849cda377
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
laravel/validation/validator.php
View File

@ -508,6 +508,7 @@ protected function message($attribute, $rule)
{ {
return $this->messages[$attribute.'_'.$rule]; return $this->messages[$attribute.'_'.$rule];
} }
// Next we'll check for developer specified, rule specific messages. These allow the // Next we'll check for developer specified, rule specific messages. These allow the
// developer to override the error message for an entire rule, regardless of the // developer to override the error message for an entire rule, regardless of the
// attribute being validated by that rule. // attribute being validated by that rule.
@ -515,12 +516,20 @@ protected function message($attribute, $rule)
{ {
return $this->messages[$rule]; return $this->messages[$rule];
} }
// If the rule being validated is a "size" rule and the attribute is not a number,
// we will need to gather the specific size message for the type of attribute
// being validated, either a file or a string.
elseif (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules)) elseif (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules))
{ {
$line = (array_key_exists($attribute, Input::file())) ? "file" : "string"; $line = (array_key_exists($attribute, Input::file())) ? "file" : "string";
return Lang::line("validation.{$rule}.{$line}")->get($this->language); return Lang::line("validation.{$rule}.{$line}")->get($this->language);
} }
// If no developer specified messages have been set, and no other special messages
// apply to the rule, we will just pull the default validation message from the
// validation language file.
else else
{ {
return Lang::line("validation.{$rule}")->get($this->language); return Lang::line("validation.{$rule}")->get($this->language);
@ -628,8 +637,7 @@ public function connection(\Laravel\Database\Connection $connection)
public function __call($method, $parameters) public function __call($method, $parameters)
{ {
// First we will slice the "validate_" prefix off of the validator // First we will slice the "validate_" prefix off of the validator
// since custom validators are not registered with such a prefix. // since customvalidators aren't registered with such a prefix.
// Then, if a custom validator exists, we will call it.
if (isset(static::$validators[$method = substr($method, 9)])) if (isset(static::$validators[$method = substr($method, 9)]))
{ {
return call_user_func_array(static::$validators[$method], $parameters); return call_user_func_array(static::$validators[$method], $parameters);