Merge branch '3.1/bugfix/3658-validation-class-method-as-error-name' of

https://github.com/synapsestudios/kohana-core into synapsestudios-3.1/bugfix/3658-validation-class-method-as-error-name

classes/kohana/validation.php

@@ -287,9 +287,19 @@ public function check()
 					}
 				}
 
-				if (is_array($rule) OR ! is_string($rule))
+				// Default the error name to be the rule (except array and lambda rules)
+				$error_name = $rule;
+
+				if (is_array($rule))
+				{
+					// This is an array callback, the method name is the error name
+					$error_name = $rule[1];
+					$passed = call_user_func_array($rule, $params);
+				}
+				elseif ( ! is_string($rule))
 				{
-					// This is either a callback as an array or a lambda
+					// This is a lambda function, there is no error name (errors must be added manually)
+					$error_name = FALSE;
 					$passed = call_user_func_array($rule, $params);
 				}
 				elseif (method_exists('Valid', $rule))
@@ -324,10 +334,10 @@ public function check()
 				if ( ! in_array($rule, $this->_empty_rules) AND ! Valid::not_empty($value))
 					continue;
 
-				if ($passed === FALSE)
+				if ($passed === FALSE AND $error_name !== FALSE)
 				{
 					// Add the rule to the errors
-					$this->error($field, $rule, $params);
+					$this->error($field, $error_name, $params);
 
 					// This field has an error, stop executing rules
 					break;

tests/kohana/ValidationTest.php

@@ -235,6 +235,14 @@ public function provider_check()
 				FALSE,
 				array('foo' => '1.foo.is_string'),
 			),
+			// Test array rules use method as error name
+			array(
+				array('foo' => 'test'),
+				array('foo' => array(array(array('Valid', 'min_length'), array(':value', 10)))),
+				array(),
+				FALSE,
+				array('foo' => 'foo must be at least 10 characters long'),
+			),
 		);
 	}