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

Fixing issue where whitelist would not be used for validation. Test case added. Fixes #1037

Browse source
This commit is contained in:
mark_story 2010-08-21 22:48:59 -04:00
parent 12d4b52f10
commit 5446a062ee
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/model.php
View file

@ -2511,7 +2511,7 @@ class Model extends Overloadable {
$_validate = $this->validate;
$whitelist = $this->whitelist;
if (array_key_exists('fieldList', $options)) {
if (!empty($options['fieldList'])) {
$whitelist = $options['fieldList'];
}

25
cake/tests/cases/libs/model/model_validation.test.php
View file

@ -164,11 +164,34 @@ class ModelValidationTest extends BaseModelTest {
$TestModel->invalidFields();
$expected = array('name' => 'This field cannot be left blank');
$this->assertEqual($TestModel->validationErrors, $expected);
$TestModel->validationErrors = array();
$this->assertEqual($TestModel->validate, $validate);
}
/**
* Test that invalidFields() integrates well with save(). And that fieldList can be an empty type.
*
* @return void
*/
function testInvalidFieldsWhitelist() {
$TestModel =& new ValidationTest1();
$TestModel->validate = $validate = array(
'title' => array(
'rule' => 'customValidator',
'required' => true
),
'name' => array(
'rule' => 'alphaNumeric',
'required' => true
));
$TestModel->whitelist = array('name');
$TestModel->save(array('name' => '#$$#'));
$expected = array('name' => 'This field cannot be left blank');
$this->assertEqual($TestModel->validationErrors, $expected);
}
/**
* testValidates method
*