php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-16 07:11:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

=== array() => empty()

Browse Source
This commit is contained in:
Alexander Kochetov
2013-05-07 19:51:29 +04:00
parent 901dabc301
commit d7df7053e0
11 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/validators/FileValidator.php
View File

@ -116,7 +116,7 @@ class FileValidator extends Validator
}
if (!is_array($this->types)) {
$this->types = preg_split('/[\s,]+/', strtolower($this->types), -1, PREG_SPLIT_NO_EMPTY);
}
}
}
/**
@ -138,8 +138,8 @@ class FileValidator extends Validator
}
}
$object->$attribute = array_values($files);
if ($files === array()) {
$this->addError($object, $attribute, $this->uploadRequired);
if (empty($files)) {
$this->addError($object, $attribute, $this->uploadRequired);
}
if (count($files) > $this->maxFiles) {
$this->addError($object, $attribute, $this->tooMany, array('{attribute}' => $attribute, '{limit}' => $this->maxFiles));
@ -153,7 +153,7 @@ class FileValidator extends Validator
if ($file instanceof UploadedFile && $file->getError() != UPLOAD_ERR_NO_FILE) {
$this->validateFile($object, $attribute, $file);
} else {
$this->addError($object, $attribute, $this->uploadRequired);
$this->addError($object, $attribute, $this->uploadRequired);
}
}
}

3
framework/validators/Validator.php
View File

@ -262,7 +262,6 @@ abstract class Validator extends Component
*/
public function isEmpty($value, $trim = false)
{
return $value === null || $value === array() || $value === ''
|| $trim && is_scalar($value) && trim($value) === '';
return $value === null || empty($value) || $value === '' || $trim && is_scalar($value) && trim($value) === '';
}
}