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

Merge branch 'improved-mkdir-error'

Browse Source 
Conflicts:
	framework/CHANGELOG.md
This commit is contained in:
Klimov Paul
2015-04-20 13:13:03 +03:00
parent 95d65b4958 14c003acab
commit a3df232655
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/helpers/BaseFileHelper.php
View File

@ -447,6 +447,7 @@ class BaseFileHelper
* @param integer $mode the permission to be set for the created directory. * @param integer $mode the permission to be set for the created directory.
* @param boolean $recursive whether to create parent directories if they do not exist. * @param boolean $recursive whether to create parent directories if they do not exist.
* @return boolean whether the directory is created successfully * @return boolean whether the directory is created successfully
* @throws \yii\base\Exception if the directory could not be created.
*/ */
public static function createDirectory($path, $mode = 0775, $recursive = true) public static function createDirectory($path, $mode = 0775, $recursive = true)
{ {
@ -457,8 +458,12 @@ class BaseFileHelper
if ($recursive && !is_dir($parentDir)) { if ($recursive && !is_dir($parentDir)) {
static::createDirectory($parentDir, $mode, true); static::createDirectory($parentDir, $mode, true);
} }
$result = mkdir($path, $mode); try {
chmod($path, $mode); $result = mkdir($path, $mode);
chmod($path, $mode);
} catch(\Exception $e) {
throw new \yii\base\Exception("Failed to create directory '$path': " . $e->getMessage(), $e->getCode(), $e);
}
return $result; return $result;
} }