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

refactor the validator class.

This commit is contained in:
Taylor Otwell 2011-08-08 11:18:07 -05:00
parent 3d48b323c3
commit f0db808fd1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/validator.php
View File

@ -38,12 +38,19 @@ class Validator {
public $language; public $language;
/** /**
* The "size" related validation rules. * The size related validation rules.
* *
* @var array * @var array
*/ */
protected $size_rules = array('size', 'between', 'min', 'max'); protected $size_rules = array('size', 'between', 'min', 'max');
/**
* The numeric related validation rules.
*
* @var array
*/
protected $numeric_rules = array('numeric', 'integer');
/** /**
* Create a new validator instance. * Create a new validator instance.
* *
@ -250,7 +257,7 @@ protected function validate_max($attribute, $parameters)
*/ */
protected function get_size($attribute) protected function get_size($attribute)
{ {
if (is_numeric($this->attributes[$attribute]) and $this->has_rule($attribute, array('integer', 'numeric'))) if (is_numeric($this->attributes[$attribute]) and $this->has_rule($attribute, $this->numeric_rules))
{ {
return $this->attributes[$attribute]; return $this->attributes[$attribute];
} }
@ -423,7 +430,7 @@ protected function get_message($attribute, $rule)
// For "size" rules that are validating strings or files, we need to adjust // For "size" rules that are validating strings or files, we need to adjust
// the default error message for the appropriate type. // the default error message for the appropriate type.
if (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, array('numeric', 'integer'))) if (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules))
{ {
return (array_key_exists($attribute, $_FILES)) return (array_key_exists($attribute, $_FILES))
? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.' ? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.'