Browse Source

Merge pull request #11781 from cakephp/3.next-validator-rule-name

Use rule alias as rule name by default.
Mark Sch 8 years ago
parent
commit
9562eb7920
2 changed files with 5 additions and 1 deletions
  1. 1 1
      src/Validation/Validator.php
  2. 4 0
      tests/TestCase/Validation/ValidatorTest.php

+ 1 - 1
src/Validation/Validator.php

@@ -397,7 +397,7 @@ class Validator implements ArrayAccess, IteratorAggregate, Countable
         }
 
         foreach ($rules as $name => $rule) {
-            $field->add($name, $rule);
+            $field->add($name, $rule + ['rule' => $name]);
         }
 
         return $this;

+ 4 - 0
tests/TestCase/Validation/ValidatorTest.php

@@ -44,6 +44,10 @@ class ValidatorTest extends TestCase
         $validator->add('body', 'another', ['rule' => 'crazy']);
         $this->assertCount(1, $validator->field('body'));
         $this->assertCount(2, $validator);
+
+        $validator->add('email', 'notBlank');
+        $result = $validator->field('email')->rule('notBlank')->get('rule');
+        $this->assertEquals('notBlank', $result);
     }
 
     /**