Adding support for using closures as rules in validator

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

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/Cake/ORM/Validation/ValidationRule.php b/Cake/ORM/Validation/ValidationRule.php
@@ -115,8 +115,12 @@ public function isLast() {
  * @return boolean|string
  */
 	public function process($data, $scopes, $newRecord) {
-		$scope = $scopes[$this->_scope];
-		$callable = [$scope, $this->_rule];
+		if (is_callable($this->_rule)) {
+			$callable = $this->_rule;
+		} else {
+			$scope = $scopes[$this->_scope];
+			$callable = [$scope, $this->_rule];
+		}
 
 		if ($this->_pass) {
 			$args = array_merge([$data], $this->_pass, [$scopes]);

diff --git a/Cake/Test/TestCase/ORM/ValidatorTest.php b/Cake/Test/TestCase/ORM/ValidatorTest.php
@@ -313,6 +313,23 @@ public function testMethodsWithExtraArguments() {
 		$this->assertEquals($expected, $errors);
 	}
 
+/**
+ * Tests that it is possible to use a closure as a rule
+ *
+ * @return void
+ */
+	public function testUsingClosureAsRule() {
+		$validator = new Validator;
+		$validator->add('name', 'myRule', [
+			'rule' => function($data, $scopes) {
+				$this->assertEquals('foo', $data);
+				return 'You fail';
+			}
+		]);
+		$expected = ['name' => ['myRule' => 'You fail']];
+		$this->assertEquals($expected, $validator->errors(['name' => 'foo']));
+	}
+
 /**
  * Tests that setting last to a rule will stop validating the rest of the rules
  *