adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rules set being updated with array instead of CakeValidationRule objects. Closes #3367

Browse source
This commit is contained in:
ADmad 2012-11-13 22:13:15 +05:30
parent e0586da808
commit ac087ec938
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Cake/Model/Validator/CakeValidationSet.php
View file

@ -192,7 +192,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
* @return CakeValidationSet this instance * @return CakeValidationSet this instance
*/ */
public function setRule($name, $rule) { public function setRule($name, $rule) {
if (!$rule instanceof CakeValidationRule) { if (!($rule instanceof CakeValidationRule)) {
$rule = new CakeValidationRule($rule); $rule = new CakeValidationRule($rule);
} }
$this->_rules[$name] = $rule; $this->_rules[$name] = $rule;
@ -236,9 +236,10 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
*/ */
public function setRules($rules = array(), $mergeVars = true) { public function setRules($rules = array(), $mergeVars = true) {
if ($mergeVars === false) { if ($mergeVars === false) {
$this->_rules = $rules; $this->_rules = array();
} else { }
$this->_rules = array_merge($this->_rules, $rules); foreach ($rules as $name => $rule) {
$this->setRule($name, $rule);
} }
return $this; return $this;
} }

12
lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php
View file

@ -156,10 +156,22 @@ class CakeValidationSetTest extends CakeTestCase {
$result = $Field->getRules(); $result = $Field->getRules();
$this->assertEquals(array('validEmail'), array_keys($result)); $this->assertEquals(array('validEmail'), array_keys($result));
$Field->setRules(array('validEmail' => $rule), false);
$result = $Field->getRules();
$this->assertEquals(array('validEmail'), array_keys($result));
$this->assertTrue(array_pop($result) instanceof CakeValidationRule);
$rules = array('notEmpty' => $RuleEmpty); $rules = array('notEmpty' => $RuleEmpty);
$Field->setRules($rules, true); $Field->setRules($rules, true);
$result = $Field->getRules(); $result = $Field->getRules();
$this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result)); $this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result));
$rules = array('notEmpty' => array('rule' => 'notEmpty'));
$Field->setRules($rules, true);
$result = $Field->getRules();
$this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result));
$this->assertTrue(array_pop($result) instanceof CakeValidationRule);
$this->assertTrue(array_pop($result) instanceof CakeValidationRule);
} }
/** /**