mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 07:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Config类的parse方法

Browse Source
This commit is contained in:
thinkphp
2016-07-30 10:13:19 +08:00
parent 18b5a41b14
commit 16fdc931ea
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Config.php
View File

@@ -33,6 +33,7 @@ class Config
* @param string $type 配置解析类型 * @param string $type 配置解析类型
* @param string $name 配置名（如设置即表示二级配置） * @param string $name 配置名（如设置即表示二级配置）
* @param string $range 作用域 * @param string $range 作用域
* @return mixed
*/ */
public static function parse($config, $type = '', $name = '', $range = '') public static function parse($config, $type = '', $name = '', $range = '')
{ {
@@ -41,7 +42,7 @@ class Config
$type = pathinfo($config, PATHINFO_EXTENSION); $type = pathinfo($config, PATHINFO_EXTENSION);
} }
$class = false !== strpos($type, '\\') ? $type : '\\think\\config\\driver\\' . ucwords($type); $class = false !== strpos($type, '\\') ? $type : '\\think\\config\\driver\\' . ucwords($type);
self::set((new $class())->parse($config), $name, $range); return self::set((new $class())->parse($config), $name, $range);
} }
/** /**
@@ -122,7 +123,7 @@ class Config
} else { } else {
// 二维数组设置和获取支持 // 二维数组设置和获取支持
$name = explode('.', $name); $name = explode('.', $name);
$result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1])); $result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量 // 判断环境变量
if (false !== $result) { if (false !== $result) {
return $result; return $result;