From 4eb69edf460c285d7b709922e3e2272baafa2e02 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 9 Dec 2015 22:52:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84config=E7=B1=BB=E7=9A=84l?= =?UTF-8?q?oad=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/config.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/think/config.php b/library/think/config.php index b899c1c1..092d9478 100644 --- a/library/think/config.php +++ b/library/think/config.php @@ -33,6 +33,7 @@ class Config if (empty($type)) { $type = substr(strrchr($config, '.'), 1); } + $range = $range ? $range : self::$range; $class = '\\think\\config\\driver\\' . strtolower($type); self::set((new $class())->parse($config), '', $range); } @@ -40,7 +41,8 @@ class Config // 加载配置文件 public static function load($file, $name = '', $range = '') { - $file = strpos($file, '.') ? $file : APP_PATH . $file . EXT; + $range = $range ? $range : self::$range; + $file = strpos($file, '.') ? $file : APP_PATH . $file . EXT; if (!isset(self::$config[$range])) { self::$config[$range] = []; } From 829a09fc839706eea8c955540c2a5c739408a07f Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 10 Dec 2015 09:38:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- convention.php | 96 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 26 deletions(-) diff --git a/convention.php b/convention.php index 44bb97c0..42371075 100644 --- a/convention.php +++ b/convention.php @@ -1,16 +1,33 @@ '', - // PATHINFO变量名 用于兼容模式 - 'var_pathinfo' => 's', - // 兼容PATH_INFO获取 - 'pathinfo_fetch' => 'ORIG_PATH_INFO,REDIRECT_PATH_INFO,REDIRECT_URL', // 扩展配置文件 'extra_config_list' => ['database', 'route'], - // pathinfo分隔符 - 'pathinfo_depr' => '/', + // 默认输出类型 + 'default_return_type' => 'html', + // 默认语言 + 'default_lang' => 'zh-cn', + // 是否使用session + 'use_session' => true, + // response输出终止执行 + 'response_exit' => true, + // 默认AJAX 数据返回格式,可选JSON XML ... + 'default_ajax_return' => 'JSON', + // 默认JSONP格式返回的处理方法 + 'default_jsonp_handler' => 'jsonpReturn', + // 默认JSONP处理方法 + 'var_jsonp_handler' => 'callback', + + // +---------------------------------------------------------------------- + // | 模块设置 + // +---------------------------------------------------------------------- + // 默认模块名 'default_module' => 'index', // 禁止访问模块 @@ -23,8 +40,19 @@ return [ 'empty_controller' => 'error', // 操作方法后缀 'action_suffix' => '', + // 操作绑定到类 + 'action_bind_class' => false, - /* URL设置 */ + // +---------------------------------------------------------------------- + // | URL设置 + // +---------------------------------------------------------------------- + + // PATHINFO变量名 用于兼容模式 + 'var_pathinfo' => 's', + // 兼容PATH_INFO获取 + 'pathinfo_fetch' => 'ORIG_PATH_INFO,REDIRECT_PATH_INFO,REDIRECT_URL', + // pathinfo分隔符 + 'pathinfo_depr' => '/', // 获取当前页面地址的系统变量 默认为REQUEST_URI 'url_request_uri' => 'REQUEST_URI', // 基础URL路径 @@ -37,29 +65,26 @@ return [ 'url_parmas_bind_type' => 0, //url地址的后缀 'url_deny_suffix' => '', - //是否必须使用路由 + // 是否开启路由 + 'url_route_on' => true, + // 是否强制使用路由 'url_route_must' => false, + // URL模块映射 + 'url_module_map' => [], - // 默认输出类型 - 'default_return_type' => 'html', - // 默认语言 - 'default_lang' => 'zh-cn', - // 是否使用session - 'use_session' => true, + // +---------------------------------------------------------------------- + // | 视图及模板设置 + // +---------------------------------------------------------------------- // 默认跳转页面对应的模板文件 'dispatch_jump_tmpl' => THINK_PATH . 'tpl/dispatch_jump.tpl', - // 默认AJAX 数据返回格式,可选JSON XML ... - 'default_ajax_return' => 'JSON', - // 默认JSONP格式返回的处理方法 - 'default_jsonp_handler' => 'jsonpReturn', - 'var_jsonp_handler' => 'callback', + // 默认的模板引擎 'template_engine' => 'think', - 'action_bind_class' => false, - 'url_module_map' => [], - 'response_exit' => true, - /* 错误设置 */ + // +---------------------------------------------------------------------- + // | 异常及错误设置 + // +---------------------------------------------------------------------- + // 异常页面的模板文件 'exception_tmpl' => THINK_PATH . 'tpl/think_exception.tpl', // 错误显示信息,非调试模式有效 @@ -69,11 +94,19 @@ return [ // 显示错误信息 'show_error_msg' => false, + // +---------------------------------------------------------------------- + // | 日志设置 + // +---------------------------------------------------------------------- + 'log' => [ 'type' => 'File', 'path' => LOG_PATH, ], + // +---------------------------------------------------------------------- + // | 缓存设置 + // +---------------------------------------------------------------------- + 'cache' => [ 'type' => 'File', 'path' => CACHE_PATH, @@ -81,13 +114,20 @@ return [ 'expire' => 0, ], + // +---------------------------------------------------------------------- + // | 会话设置 + // +---------------------------------------------------------------------- + 'session' => [ 'prefix' => 'think', 'type' => '', 'auto_start' => true, ], - /* 数据库设置 */ + // +---------------------------------------------------------------------- + // | 数据库设置 + // +---------------------------------------------------------------------- + 'database' => [ // 数据库类型 'type' => 'mysql', @@ -120,7 +160,11 @@ return [ // 指定从服务器序号 'slave_no' => '', ], - /* SocketLog 调试 */ + + // +---------------------------------------------------------------------- + // | SocketLog设置 + // +---------------------------------------------------------------------- + 'slog' => [ 'host' => 'localhost', //是否显示利于优化的参数，如果允许时间，消耗内存等 @@ -130,6 +174,6 @@ return [ //日志强制记录到配置的client_id 'force_client_id' => '', //限制允许读取日志的client_id - 'allow_client_ids' => array(), + 'allow_client_ids' => [], ], ]; From 9a2ff2f23126d2ea7a2dd96987b2899bed93bb5f Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 10 Dec 2015 12:11:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=8C=96=E7=B1=BB=20=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/cache.php | 2 +- library/think/loader.php | 4 ++-- library/think/log.php | 2 +- library/think/template.php | 10 +++++----- library/think/view.php | 8 ++++---- mode/common.php | 5 +++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/library/think/cache.php b/library/think/cache.php index 15ff26a6..55242cd7 100644 --- a/library/think/cache.php +++ b/library/think/cache.php @@ -29,7 +29,7 @@ class Cache public static function connect($options = []) { $type = !empty($options['type']) ? $options['type'] : 'File'; - $class = 'think\\cache\\driver\\' . strtolower($type); + $class = 'think\\cache\\driver\\' . ucwords($type); self::$handler = new $class($options); return self::$handler; } diff --git a/library/think/loader.php b/library/think/loader.php index fbb89de4..a4abe594 100644 --- a/library/think/loader.php +++ b/library/think/loader.php @@ -26,7 +26,7 @@ class Loader include self::$map[$class]; } else { // 命名空间自动加载 - $name = strstr($class, '\\', true); + $name = strtolower(strstr($class, '\\', true)); if (isset(self::$namespace[$name])) { // 注册的命名空间 $path = dirname(self::$namespace[$name]) . '/'; @@ -246,7 +246,7 @@ class Loader if (class_exists($class)) { $o = new $class(); if (!empty($method) && method_exists($o, $method)) { - $_instance[$identify] = call_user_func_array([ & $o, $method],[]); + $_instance[$identify] = call_user_func_array([ & $o, $method], []); } else { $_instance[$identify] = $o; } diff --git a/library/think/log.php b/library/think/log.php index ba0d7e94..f2b73b45 100644 --- a/library/think/log.php +++ b/library/think/log.php @@ -22,7 +22,7 @@ class Log public static function init($config = []) { $type = isset($config['type']) ? $config['type'] : 'File'; - $class = '\\think\\log\\driver\\' . strtolower($type); + $class = '\\think\\log\\driver\\' . ucwords($type); unset($config['type']); self::$storage = new $class($config); } diff --git a/library/think/template.php b/library/think/template.php index 1e9fa0cb..f6359280 100644 --- a/library/think/template.php +++ b/library/think/template.php @@ -19,9 +19,9 @@ namespace think; class Template { // 模板变量 - protected $data = []; + protected $data = []; // 引擎配置 - protected $config = [ + protected $config = [ 'tpl_path' => VIEW_PATH, // 模板路径 'tpl_suffix' => '.html', // 默认模板文件后缀 'cache_suffix' => '.php', // 默认模板缓存后缀 @@ -63,7 +63,7 @@ class Template // 初始化模板编译存储器 $type = $this->config['compile_type'] ? $this->config['compile_type'] : 'File'; - $class = '\\think\\template\\driver\\' . strtolower($type); + $class = '\\think\\template\\driver\\' . ucwords($type); $this->storage = new $class(); } @@ -658,10 +658,10 @@ class Template //模板函数过滤 $fun = strtolower(trim($args[0])); switch ($fun) { - case 'default': // 特殊模板函数 + case 'default': // 特殊模板函数 $name = '(' . $name . ')?(' . $name . '):' . $args[1]; break; - default: // 通用模板函数 + default: // 通用模板函数 if (!in_array($fun, $template_deny_funs)) { if (isset($args[1])) { if (strstr($args[1], '###')) { diff --git a/library/think/view.php b/library/think/view.php index 84c71e47..b4f5ff5c 100644 --- a/library/think/view.php +++ b/library/think/view.php @@ -62,7 +62,7 @@ class View * @param string $value 值 * @return View */ - public function config($config = '',$value='') + public function config($config = '', $value = '') { if (is_array($config)) { foreach ($this->config as $key => $val) { @@ -70,8 +70,8 @@ class View $this->config[$key] = $config[$key]; } } - }else{ - $this->config[$config] = $value; + } else { + $this->config[$config] = $value; } return $this; } @@ -85,7 +85,7 @@ class View */ public function engine($engine, array $config = []) { - $class = '\\think\\view\\driver\\' . strtolower($engine); + $class = '\\think\\view\\driver\\' . ucwords($engine); $this->engine = new $class($config); return $this; } diff --git a/mode/common.php b/mode/common.php index 1156e533..576e7a35 100644 --- a/mode/common.php +++ b/mode/common.php @@ -23,11 +23,12 @@ return [ 'think\Log' => CORE_PATH . 'log' . EXT, 'think\log\driver\File' => CORE_PATH . 'log' . DS . 'driver' . DS . 'file' . EXT, 'think\Config' => CORE_PATH . 'config' . EXT, + 'think\Create' => CORE_PATH . 'create' . EXT, 'think\Route' => CORE_PATH . 'route' . EXT, 'think\Exception' => CORE_PATH . 'exception' . EXT, 'think\Model' => CORE_PATH . 'model' . EXT, 'think\Db' => CORE_PATH . 'db' . EXT, - 'think\Db\Driver' => CORE_PATH . 'db'.DS.'driver' . EXT, + 'think\Db\Driver' => CORE_PATH . 'db' . DS . 'driver' . EXT, 'think\Template' => CORE_PATH . 'template' . EXT, 'think\view\driver\Think' => CORE_PATH . 'view' . DS . 'driver' . DS . 'think' . EXT, 'think\template\driver\File' => CORE_PATH . 'template' . DS . 'driver' . DS . 'file' . EXT, @@ -42,7 +43,7 @@ return [ 'think\Url' => CORE_PATH . 'url' . EXT, 'think\Debug' => CORE_PATH . 'debug' . EXT, 'think\Input' => CORE_PATH . 'input' . EXT, - 'think\Lang' => CORE_PATH . 'lang' . EXT + 'think\Lang' => CORE_PATH . 'lang' . EXT, ], 'init' => [],