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

Merge pull request #10526 from cakephp/issue-10521

Browse source 
Fix notBlank() to pass on -0.0
This commit is contained in:
Mark Story 2017-04-17 20:33:15 -04:00 committed by GitHub
commit c1f1d79f10
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Test/Case/Utility/ValidationTest.php
View file

@ -148,6 +148,10 @@ class ValidationTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testNotBlank() { public function testNotBlank() {
$this->assertTrue(Validation::notBlank(0), 'zero should not be blank');
$this->assertTrue(Validation::notBlank(0.0), 'zero should not be blank');
$this->assertTrue(Validation::notBlank(0.0 * -1), 'negative 0 should not be blank');
$this->assertTrue(Validation::notBlank(-0.0), 'negative 0 should not be blank');
$this->assertTrue(Validation::notBlank('abcdefg')); $this->assertTrue(Validation::notBlank('abcdefg'));
$this->assertTrue(Validation::notBlank('fasdf ')); $this->assertTrue(Validation::notBlank('fasdf '));
$this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla')); $this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla'));

11
lib/Cake/Utility/Validation.php
View file

@ -66,19 +66,14 @@ class Validation {
* *
* Returns true if string contains something other than whitespace * Returns true if string contains something other than whitespace
* *
* $check can be passed as an array: * @param string $check Value to check
* array('check' => 'valueToCheck');
*
* @param string|array $check Value to check
* @return bool Success * @return bool Success
*/ */
public static function notBlank($check) { public static function notBlank($check) {
if (!is_scalar($check)) { if (empty($check) && !is_bool($check) && !is_numeric($check)) {
return false;
}
if (empty($check) && (string)$check !== '0') {
return false; return false;
} }
return static::_check($check, '/[^\s]+/m'); return static::_check($check, '/[^\s]+/m');
} }