From 264e61101a7c188a1276fe492d66ea32f8f1e83e Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 8 Jan 2014 20:10:32 +0200 Subject: [PATCH] UplodedFile enhasement --- framework/yii/web/UploadedFile.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/framework/yii/web/UploadedFile.php b/framework/yii/web/UploadedFile.php index c02df23..5e1e428 100644 --- a/framework/yii/web/UploadedFile.php +++ b/framework/yii/web/UploadedFile.php @@ -33,20 +33,12 @@ class UploadedFile extends Object */ public $name; /** - * @var string the original base file name - */ - public $baseName; - /** * @var string the path of the uploaded file on the server. * Note, this is a temporary file which will be automatically deleted by PHP * after the current request is processed. */ public $tempName; /** - * @var string file extension. - */ - public $extension; - /** * @var string the MIME-type of the uploaded file (such as "image/gif"). * Since this MIME type is not checked on the server side, do not take this value for granted. * Instead, use [[FileHelper::getMimeType()]] to determine the exact MIME type. @@ -171,6 +163,22 @@ class UploadedFile extends Object } return false; } + + /** + * @return string original file base name + */ + public function getBaseName() + { + return pathinfo($this->name, PATHINFO_FILENAME); + } + + /** + * @return string file extension + */ + public function getExtension() + { + return strtolower(pathinfo($this->name, PATHINFO_EXTENSION)); + } /** * @return boolean whether there is an error with the uploaded file. @@ -216,9 +224,7 @@ class UploadedFile extends Object } else { self::$_files[$key] = new static([ 'name' => $names, - 'baseName' => pathinfo($names, PATHINFO_FILENAME), 'tempName' => $tempNames, - 'extension' => strtolower(pathinfo($names, PATHINFO_EXTENSION)), 'type' => $types, 'size' => $sizes, 'error' => $errors,