adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update checkRequired to simply check if an array key is present rather than isset (which fails if the value is null)

Browse source
This commit is contained in:
Ryan Morris 2012-11-02 09:35:02 -04:00 • committed by Jose Lorenzo Rodriguez
parent 9007406b9d
commit fa759231da
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/Validator/CakeValidationRule.php
View file

@ -163,9 +163,9 @@ class CakeValidationRule {
*/
public function checkRequired($field, &$data) {
return (
(!isset($data[$field]) && $this->isRequired() === true) ||
(!array_key_exists($field, $data) && $this->isRequired() === true) ||
(
isset($data[$field]) && (empty($data[$field]) &&
array_key_exists($field, $data) && (empty($data[$field]) &&
!is_numeric($data[$field])) && $this->allowEmpty === false
)
);

26
lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php
View file

@ -171,4 +171,30 @@ class CakeValidationRuleTest extends CakeTestCase {
$Rule->isUpdate(true);
$this->assertTrue($Rule->isEmptyAllowed());
}
/**
* Test checkRequired method
*
* @return void
*/
public function testCheckRequiredWhenRequiredAndAllowEmpty() {
$Rule = $this->getMock('CakeValidationRule', array('isRequired'));
$Rule->expects($this->any())
->method('isRequired')
->will($this->returnValue(true));
$Rule->allowEmpty = true;
$fieldname = 'field';
$data = array(
$fieldname => null
);
$this->assertFalse($Rule->checkRequired($fieldname, $data), "A null but present field should not fail requirement check if allowEmpty is true");
$Rule->allowEmpty = false;
$this->assertTrue($Rule->checkRequired($fieldname, $data), "A null but present field should fail requirement check if allowEmpty is false");
}
}