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

cleaning up validation library.

This commit is contained in:
Taylor Otwell 2011-07-16 21:56:40 -05:00
parent 808543844d
commit 4d647c33c0
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
system/validator.php
View File

@ -47,6 +47,11 @@ class Validator {
*/ */
public function __construct($attributes, $rules, $messages = array()) public function __construct($attributes, $rules, $messages = array())
{ {
foreach ($rules as $key => &$rule)
{
$rule = (is_string($rule)) ? explode('|', $rule) : $rule;
}
$this->attributes = $attributes; $this->attributes = $attributes;
$this->rules = $rules; $this->rules = $rules;
$this->messages = $messages; $this->messages = $messages;
@ -86,11 +91,6 @@ public function valid()
foreach ($this->rules as $attribute => $rules) foreach ($this->rules as $attribute => $rules)
{ {
if (is_string($rules))
{
$rules = explode('|', $rules);
}
foreach ($rules as $rule) foreach ($rules as $rule)
{ {
$this->check($attribute, $rule); $this->check($attribute, $rule);
@ -242,7 +242,7 @@ protected function validate_max($attribute, $parameters)
*/ */
protected function get_size($attribute) protected function get_size($attribute)
{ {
if ($this->has_numeric_rule($attribute)) if (is_numeric($this->attributes[$attribute]))
{ {
return $this->attributes[$attribute]; return $this->attributes[$attribute];
} }
@ -419,7 +419,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 appropriately. // the default error message appropriately.
if (in_array($rule, $this->size_rules) and ! $this->has_numeric_rule($attribute)) if (in_array($rule, $this->size_rules) and ! is_numeric($this->attributes[$attribute]))
{ {
return (array_key_exists($attribute, $_FILES)) ? rtrim($message, '.').' kilobytes.' : rtrim($message, '.').' characters.'; return (array_key_exists($attribute, $_FILES)) ? rtrim($message, '.').' kilobytes.' : rtrim($message, '.').' characters.';
} }
@ -457,17 +457,6 @@ protected function format_message($message, $attribute, $rule, $parameters)
return $message; return $message;
} }
/**
* Determine if an attribute has either a "numeric" or "integer" rule.
*
* @param string $attribute
* @return bool
*/
protected function has_numeric_rule($attribute)
{
return $this->has_rule($attribute, array('numeric', 'integer'));
}
/** /**
* Determine if an attribute has a rule assigned to it. * Determine if an attribute has a rule assigned to it.
* *