Changeset 2069 for trunk/system/libraries/Validation.php

Timestamp:

02/16/2008 11:36:03 PM (9 months ago)

Author:

armen

Message:

in PHP > 5.2.3 its possible to use scope resolution syntax which is nice, it is possible to use such syntax for PHP < 5.2.3, now.
example:

$validation->add_rules('subject', 'valid::ip');

instead of:

$validation->add_rules('subject', array('valid', 'ip'));

Files:

• trunk/system/libraries/Validation.php (modified) (4 diffs)

trunk/system/libraries/Validation.php

@@ -124 +124 @@
                         throw new Kohana_Exception('validation.filter_not_callable');
 
+                $filter = (is_string($filter) AND strpos($filter, '::') !== FALSE) ? explode('::', $filter) : $filter;                  
+
                 if ($field === TRUE)
                 {
@@ -158 +160 @@
                         throw new Kohana_Exception('validation.filter_not_callable');
 
+                $filter = (is_string($filter) AND strpos($filter, '::') !== FALSE) ? explode('::', $filter) : $filter;
+
                 if ($field === TRUE)
                 {
@@ -221 +225 @@
                                 throw new Kohana_Exception('validation.rule_not_callable');
 
+                        $rule = (is_string($rule) AND strpos($rule, '::') !== FALSE) ? explode('::', $rule) : $rule;
+
                         // Add the rule to specified field
                         $this->rules[$field][] = array($rule, $args);
@@ -258 +264 @@
                         if ( ! is_callable($callback, TRUE))
                                 throw new Kohana_Exception('validation.callback_not_callable');
+
+                        $callback = (is_string($callback) AND strpos($callback, '::') !== FALSE) ? explode('::', $callback) : $callback;                                                        
 
                         // Add the filter to specified field