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

改进Config类支持配置CONF_EXT常量

Browse Source
This commit is contained in:
thinkphp
2016-05-10 14:39:47 +08:00
parent 85fe5d89fe
commit 822d9a235b
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
base.php
View File

@@ -32,6 +32,7 @@ defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH . 'cache' . DS);
defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH . 'temp' . DS); defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH . 'temp' . DS);
defined('VENDOR_PATH') or define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS); defined('VENDOR_PATH') or define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
defined('EXT') or define('EXT', '.php'); defined('EXT') or define('EXT', '.php');
defined('CONF_EXT') or define('CONF_EXT', EXT); // 配置文件后缀
defined('MODEL_LAYER') or define('MODEL_LAYER', 'model'); defined('MODEL_LAYER') or define('MODEL_LAYER', 'model');
defined('VIEW_LAYER') or define('VIEW_LAYER', 'view'); defined('VIEW_LAYER') or define('VIEW_LAYER', 'view');
defined('CONTROLLER_LAYER') or define('CONTROLLER_LAYER', 'controller'); defined('CONTROLLER_LAYER') or define('CONTROLLER_LAYER', 'controller');

6
library/think/App.php
View File

@@ -263,17 +263,17 @@ class App
} else { } else {
$path = APP_PATH . $module; $path = APP_PATH . $module;
// 加载模块配置 // 加载模块配置
$config = Config::load(APP_PATH . $module . 'config' . EXT); $config = Config::load(APP_PATH . $module . 'config' . CONF_EXT);
// 加载应用状态配置 // 加载应用状态配置
if ($config['app_status']) { if ($config['app_status']) {
$config = Config::load(APP_PATH . $module . $config['app_status'] . EXT); $config = Config::load(APP_PATH . $module . $config['app_status'] . CONF_EXT);
} }
// 读取扩展配置文件 // 读取扩展配置文件
if ($config['extra_config_list']) { if ($config['extra_config_list']) {
foreach ($config['extra_config_list'] as $name => $file) { foreach ($config['extra_config_list'] as $name => $file) {
$filename = $path . $file . EXT; $filename = $path . $file . CONF_EXT;
Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME)); Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
} }
} }

12
library/think/Config.php
View File

@@ -31,16 +31,17 @@ class Config
* 解析配置文件或内容 * 解析配置文件或内容
* @param string $config 配置文件路径或内容 * @param string $config 配置文件路径或内容
* @param string $type 配置解析类型 * @param string $type 配置解析类型
* @param string $name 配置名（如设置即表示二级配置）
* @param string $range 作用域 * @param string $range 作用域
*/ */
public static function parse($config, $type = '', $range = '') public static function parse($config, $type = '', $name = '', $range = '')
{ {
$range = $range ?: self::$range; $range = $range ?: self::$range;
if (empty($type)) { if (empty($type)) {
$type = pathinfo($config, PATHINFO_EXTENSION); $type = pathinfo($config, PATHINFO_EXTENSION);
} }
$class = (false === strpos($type, '\\')) ? '\\think\\config\\driver\\' . ucwords($type) : $type; $class = (false === strpos($type, '\\')) ? '\\think\\config\\driver\\' . ucwords($type) : $type;
self::set((new $class())->parse($config), '', $range); self::set((new $class())->parse($config), $name, $range);
} }
/** /**
@@ -59,7 +60,12 @@ class Config
if (is_file($file)) { if (is_file($file)) {
// 记录加载信息 // 记录加载信息
APP_DEBUG && Log::record('[ CONFIG ] ' . $file, 'info'); APP_DEBUG && Log::record('[ CONFIG ] ' . $file, 'info');
return self::set(include $file, $name, $range); $type = pathinfo($file, PATHINFO_EXTENSION);
if ('php' != $type) {
return self::parse($config, $type, $name, $range);
} else {
return self::set(include $file, $name, $range);
}
} else { } else {
return self::$config[$range]; return self::$config[$range];
} }