Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed some validation tests

  • Loading branch information...
commit 8700f3c7a229b7836a18e2ddc98a97ad06b674ef 1 parent 30761f9
@lorenzo lorenzo authored
View
3  lib/Cake/Model/ModelValidator.php
@@ -311,13 +311,12 @@ protected function _parseRules() {
return false;
}
- if (!empty($this->_validate) && $this->_validate === $this->_model->validate) {
+ if ($this->_validate === $this->_model->validate) {
return true;
}
$this->_validate = $this->_model->validate;
$this->_processWhitelist();
-
$this->_fields = array();
$methods = $this->getMethods();
foreach ($this->_validate as $fieldName => $ruleSet) {
View
11 lib/Cake/Model/Validator/CakeRule.php
@@ -171,12 +171,13 @@ public function isRequired() {
* @return boolean
*/
public function checkRequired(&$data) {
- $required = !isset($data[$this->_field]) && $this->required === true;
- $required = $required || (
- isset($this->data[$this->_field]) && (empty($data[$this->_field]) &&
- !is_numeric($data[$this->_field])) && $this->allowEmpty === false
+ return (
+ (!isset($data[$this->_field]) && $this->required === true) ||
+ (
+ isset($data[$this->_field]) && (empty($data[$this->_field]) &&
+ !is_numeric($data[$this->_field])) && $this->allowEmpty === false
+ )
);
- return $required;
}
/**
View
6 lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -346,8 +346,6 @@ public function testValidates() {
$this->assertEquals($data, $result);
$result = $TestModel->validates();
$this->assertTrue($result);
- $result = $Validator->validates();
- $this->assertTrue($result);
$data = array('TestValidate' => array(
'user_id' => '1',
@@ -517,8 +515,6 @@ public function testValidates() {
'title' => array('tooShort')
);
$this->assertEquals($expected, $result);
- $result = $Validator->validates();
- $this->assertFalse($result);
$TestModel->validate = array(
'title' => array(
@@ -540,8 +536,6 @@ public function testValidates() {
'title' => array('tooShort', 'onlyLetters')
);
$this->assertEquals($expected, $result);
- $result = $Validator->validates();
- $this->assertFalse($result);
$result = $TestModel->validationErrors;
$this->assertEquals($expected, $result);
}
Please sign in to comment.
Something went wrong with that request. Please try again.