Stopping validation for a field if the rule is marked as 'last'

cakephp · Nov 20, 2013 · 37dc016 · 37dc016
1 parent 82aa396
commit 37dc016
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Cake/ORM/Validation/ValidationRule.php b/Cake/ORM/Validation/ValidationRule.php
@@ -45,7 +45,7 @@ class ValidationRule {
  *
  * @var boolean
  */
-	protected $_last = true;
+	protected $_last = false;
 
 /**
  * The 'message' key
@@ -99,7 +99,7 @@ public function skip() {
  * @return boolean
  */
 	public function isLast() {
-		return (bool)$this->last;
+		return (bool)$this->_last;
 	}
 
 /**

diff --git a/Cake/ORM/Validator.php b/Cake/ORM/Validator.php
@@ -373,6 +373,10 @@ protected function _processRules(ValidationSet $rules, $value, $newRecord) {
 			if (is_string($result)) {
 				$errors[$name] = __d($this->_validationDomain, $result);
 			}
+
+			if ($rule->isLast()) {
+				break;
+			}
 		}
 		return $errors;
 	}

diff --git a/Cake/Test/TestCase/ORM/ValidatorTest.php b/Cake/Test/TestCase/ORM/ValidatorTest.php
@@ -312,4 +312,24 @@ public function testMethodsWithExtraArguments() {
 		];
 		$this->assertEquals($expected, $errors);
 	}
+
+/**
+ * Tests that setting last to a rule will stop validating the rest of the rules
+ *
+ * @return void
+ */
+	public function testErrorsWithLastRule() {
+		$validator = new Validator;
+		$validator
+			->add('email', 'alpha', ['rule' => 'alphanumeric', 'last' => true])
+			->add('email', 'email', ['rule' => 'email', 'message' => 'Y u no write email?']);
+		$errors = $validator->errors(['email' => 'not an email!']);
+		$expected = [
+			'email' => [
+				'alpha' => 'The provided value is invalid'
+			]
+		];
+
+		$this->assertEquals($expected, $errors);
+	}
 }