Skip to content

Commit

Permalink
Fixed more refereces to old method
Browse files Browse the repository at this point in the history
  • Loading branch information
@lorenzo
lorenzo committed Apr 29, 2012
1 parent 4519ba1 commit 573d292
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
10 changes: 5 additions & 5 deletions lib/Cake/Model/ModelValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ public function validateAssociated($data, $options = array()) {
if (isset($associations[$association])) {
if (in_array($associations[$association], array('belongsTo', 'hasOne'))) {
if ($options['deep']) {
$validates = $this->getModel()->{$association}->getValidator()->validateAssociated($values, $options);
$validates = $this->getModel()->{$association}->validator()->validateAssociated($values, $options);
} else {
$validates = $this->getModel()->{$association}->create($values) !== null && $this->getModel()->{$association}->getValidator()->validates($options);
$validates = $this->getModel()->{$association}->create($values) !== null && $this->getModel()->{$association}->validator()->validates($options);
}
if (is_array($validates)) {
if (in_array(false, $validates, true)) {
Expand All @@ -165,11 +165,11 @@ public function validateAssociated($data, $options = array()) {
}
$return[$association] = $validates;
} elseif ($associations[$association] === 'hasMany') {
$validates = $this->getModel()->{$association}->getValidator()->validateMany($values, $options);
$validates = $this->getModel()->{$association}->validator()->validateMany($values, $options);
$return[$association] = $validates;
}
if (!$validates || (is_array($validates) && in_array(false, $validates, true))) {
$this->validationErrors[$association] = $this->getModel()->{$association}->getValidator()->validationErrors;
$this->validationErrors[$association] = $this->getModel()->{$association}->validator()->validationErrors;
}
}
}
Expand Down Expand Up @@ -512,7 +512,7 @@ protected function _validateWithModels($options) {
foreach ($newData as $data) {
$data[$this->getModel()->hasAndBelongsToMany[$assoc]['foreignKey']] = $this->getModel()->id;
$this->getModel()->{$join}->create($data);
$valid = ($valid && $this->getModel()->{$join}->getValidator()->validates($options));
$valid = ($valid && $this->getModel()->{$join}->validator()->validates($options));
}
}
return $valid;
Expand Down
70 changes: 35 additions & 35 deletions lib/Cake/Test/Case/Model/ModelValidationTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function testInvalidFieldsWithFieldListParams() {
*/
public function testInvalidFieldsWhitelist() {
$TestModel = new ValidationTest1();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();
$TestModel->validate = array(
'title' => array(
'rule' => 'alphaNumeric',
Expand Down Expand Up @@ -648,7 +648,7 @@ public function testValidatesWithAssociations() {

$Something = new Something();
$JoinThing = $Something->JoinThing;
$Validator = $Something->JoinThing->getValidator();
$Validator = $Something->JoinThing->validator();

$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));

Expand Down Expand Up @@ -713,15 +713,15 @@ public function testValidatesWithModelsAndSaveAll() {
$result = $Something->validateAssociated($data);
$this->assertFalse($result);
$this->assertEquals($expectedError, $JoinThing->validationErrors);
$result = $Something->getValidator()->validateAssociated($data);
$result = $Something->validator()->validateAssociated($data);
$this->assertFalse($result);
$this->assertEquals($expectedError, $JoinThing->getValidator()->validationErrors);
$this->assertEquals($expectedError, $JoinThing->validator()->validationErrors);

$Something->create();
$result = $Something->saveAll($data, array('validate' => 'first'));
$this->assertFalse($result);
$this->assertEquals($expectedError, $JoinThing->validationErrors);
$this->assertEquals($expectedError, $JoinThing->getValidator()->validationErrors);
$this->assertEquals($expectedError, $JoinThing->validator()->validationErrors);

$count = $Something->find('count', array('conditions' => array('Something.id' => $data['Something']['id'])));
$this->assertSame($count, 0);
Expand Down Expand Up @@ -760,7 +760,7 @@ public function testValidatesWithModelsAndSaveAllWithoutId() {
$this->assertTrue($result);
$result = $Author->validateAssociated($data);
$this->assertTrue($result);
$result = $Author->getValidator()->validateAssociated($data);
$result = $Author->validator()->validateAssociated($data);
$this->assertTrue($result);

$Author->create();
Expand Down Expand Up @@ -816,8 +816,8 @@ public function testMissingValidationErrorNoTriggering() {
);
$TestModel->invalidFields(array('fieldList' => array('title')));
$this->assertEquals(array(), $TestModel->validationErrors);
$TestModel->getValidator()->invalidFields(array('fieldList' => array('title')));
$this->assertEquals(array(), $TestModel->getValidator()->validationErrors);
$TestModel->validator()->invalidFields(array('fieldList' => array('title')));
$this->assertEquals(array(), $TestModel->validator()->validationErrors);
}

/**
Expand Down Expand Up @@ -851,9 +851,9 @@ public function testValidationMessageAsArray() {
$TestModel->invalidFields();
$this->assertEquals($expected, $TestModel->validationErrors);

$TestModel->getValidator()->validationErrors = array();
$TestModel->getValidator()->invalidFields();
$this->assertEquals($expected, $TestModel->getValidator()->validationErrors);
$TestModel->validator()->validationErrors = array();
$TestModel->validator()->invalidFields();
$this->assertEquals($expected, $TestModel->validator()->validationErrors);

$TestModel->create(array('title' => 'foo'));
$expected = array(
Expand All @@ -865,9 +865,9 @@ public function testValidationMessageAsArray() {
$TestModel->invalidFields();
$this->assertEquals($expected, $TestModel->validationErrors);

$TestModel->getValidator()->validationErrors = array();
$TestModel->getValidator()->invalidFields();
$this->assertEquals($expected, $TestModel->getValidator()->validationErrors);
$TestModel->validator()->validationErrors = array();
$TestModel->validator()->invalidFields();
$this->assertEquals($expected, $TestModel->validator()->validationErrors);
}

/**
Expand Down Expand Up @@ -903,9 +903,9 @@ public function testValidationMessageTranslation() {
$TestModel->invalidFields();
$this->assertEquals($expected, $TestModel->validationErrors);

$TestModel->getValidator()->validationErrors = array();
$TestModel->getValidator()->invalidFields();
$this->assertEquals($expected, $TestModel->getValidator()->validationErrors);
$TestModel->validator()->validationErrors = array();
$TestModel->validator()->invalidFields();
$this->assertEquals($expected, $TestModel->validator()->validationErrors);

$TestModel->validationDomain = 'default';
Configure::write('Config.language', $lang);
Expand Down Expand Up @@ -940,13 +940,13 @@ public function testStateValidation() {

$Article->create($data);
$this->assertFalse($Article->validates());
$this->assertFalse($Article->getValidator()->validates());
$this->assertFalse($Article->validator()->validates());

$Article->save(null, array('validate' => false));
$data['Article']['id'] = $Article->id;
$Article->set($data);
$this->assertTrue($Article->validates());
$this->assertTrue($Article->getValidator()->validates());
$this->assertTrue($Article->validator()->validates());

unset($data['Article']['id']);
$Article->validate = array(
Expand All @@ -960,13 +960,13 @@ public function testStateValidation() {

$Article->create($data);
$this->assertTrue($Article->validates());
$this->assertTrue($Article->getValidator()->validates());
$this->assertTrue($Article->validator()->validates());

$Article->save(null, array('validate' => false));
$data['Article']['id'] = $Article->id;
$Article->set($data);
$this->assertFalse($Article->validates());
$this->assertFalse($Article->getValidator()->validates());
$this->assertFalse($Article->validator()->validates());
}

/**
Expand Down Expand Up @@ -997,13 +997,13 @@ public function testStateRequiredValidation() {

$Article->create($data);
$this->assertFalse($Article->validates());
$this->assertFalse($Article->getValidator()->validates());
$this->assertFalse($Article->validator()->validates());

$Article->save(null, array('validate' => false));
$data['Article']['id'] = $Article->id;
$Article->set($data);
$this->assertTrue($Article->validates());
$this->assertTrue($Article->getValidator()->validates());
$this->assertTrue($Article->validator()->validates());

unset($data['Article']['id']);
$Article->validate = array(
Expand All @@ -1017,13 +1017,13 @@ public function testStateRequiredValidation() {

$Article->create($data);
$this->assertTrue($Article->validates());
$this->assertTrue($Article->getValidator()->validates());
$this->assertTrue($Article->validator()->validates());

$Article->save(null, array('validate' => false));
$data['Article']['id'] = $Article->id;
$Article->set($data);
$this->assertFalse($Article->validates());
$this->assertFalse($Article->getValidator()->validates());
$this->assertFalse($Article->validator()->validates());
}

/**
Expand Down Expand Up @@ -1175,7 +1175,7 @@ public function testSaveAllDeepValidateOnly() {
$this->assertTrue($result);
$result = $TestModel->validateAssociated($data, array('deep' => true));
$this->assertTrue($result);
$result = $TestModel->getValidator()->validateAssociated($data, array('deep' => true));
$result = $TestModel->validator()->validateAssociated($data, array('deep' => true));
$this->assertTrue($result);

$data = array(
Expand All @@ -1189,7 +1189,7 @@ public function testSaveAllDeepValidateOnly() {
$this->assertFalse($result);
$result = $TestModel->validateAssociated($data, array('deep' => true));
$this->assertFalse($result);
$result = $TestModel->getValidator()->validateAssociated($data, array('deep' => true));
$result = $TestModel->validator()->validateAssociated($data, array('deep' => true));
$this->assertFalse($result);

$data = array(
Expand All @@ -1210,7 +1210,7 @@ public function testSaveAllDeepValidateOnly() {
$this->assertSame($expected, $result);
$result = $TestModel->validateAssociated($data, array('atomic' => false, 'deep' => true));
$this->assertSame($expected, $result);
$result = $TestModel->getValidator()->validateAssociated($data, array('atomic' => false, 'deep' => true));
$result = $TestModel->validator()->validateAssociated($data, array('atomic' => false, 'deep' => true));
$this->assertSame($expected, $result);

$data = array(
Expand Down Expand Up @@ -1805,7 +1805,7 @@ public function testGetData() {
public function testGetMethods() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();

$result = $Validator->getMethods();
$this->assertEquals(array('model', 'behaviors', 'validator'), array_keys($result));
Expand All @@ -1822,7 +1822,7 @@ public function testGetMethods() {
public function testGetFields() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();

$result = $Validator->getFields();
$this->assertSame(array(), $result);
Expand All @@ -1844,7 +1844,7 @@ public function testSetFields() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$TestModel->whitelist = array('title', 'body');
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();

$result = $Validator->setFields();
$this->assertTrue($result);
Expand All @@ -1867,7 +1867,7 @@ public function testSetFields() {
public function testSetOptions() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();

$options = array('atomic' => false, 'validate' => true);
$Validator->setOptions($options);
Expand All @@ -1891,7 +1891,7 @@ public function testSetOptions() {
public function testGetOptions() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();
$options = array('atomic' => false, 'validate' => true);
$Validator->setOptions($options);

Expand All @@ -1910,7 +1910,7 @@ public function testGetOptions() {
public function testSetValidationDomain() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();

$result = $Validator->setValidationDomain();
$this->assertEquals('default', $result->validationDomain);
Expand All @@ -1931,7 +1931,7 @@ public function testSetValidationDomain() {
public function testGetModel() {
$this->loadFixtures('Article', 'Comment');
$TestModel = new Article();
$Validator = $TestModel->getValidator();
$Validator = $TestModel->validator();

$result = $Validator->getModel();
$this->assertInstanceOf('Article', $result);
Expand Down

0 comments on commit 573d292

Please sign in to comment.