diff --git a/_composer.cmd b/_composer.cmd deleted file mode 100644 index f0c7ac58a..000000000 --- a/_composer.cmd +++ /dev/null @@ -1,13 +0,0 @@ -:: Composer 安装更新脚本 -@echo off -title Composer Plugs Install And Optimize -echo. -echo ========= 1. 清理已安装插件 ========= -rmdir /s/q vendor thinkphp runtime -echo. -echo ========= 2. 下载并安装插件 ========= -composer update --profile --prefer-dist --optimize-autoloader -echo. -echo ========= 3. 压缩并发布插件 ========= -composer dump-autoload --optimize -exit \ No newline at end of file diff --git a/composer.json b/composer.json index d79dbe52c..77b5ef4b7 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,11 @@ "qiniu/php-sdk": "^7.0", "zoujingli/wechat-php-sdk": "dev-master", "zoujingli/ip2region": "^1.0", - "topthink/framework": "^5.0", + "topthink/framework": "5.0.*", "topthink/think-captcha": "^1.0", "topthink/think-mongo": "^1.1", "topthink/think-queue": "^1.0", - "endroid/qrcode": "^1.9", + "endroid/qr-code": "^1.9", "aliyuncs/oss-sdk-php": "^2.2" }, "extra": { diff --git a/thinkphp/CONTRIBUTING.md b/thinkphp/CONTRIBUTING.md index 6cefcb38c..dc8e91cd5 100644 --- a/thinkphp/CONTRIBUTING.md +++ b/thinkphp/CONTRIBUTING.md @@ -7,7 +7,7 @@ ThinkPHP 鐩墠浣跨敤 Git 鏉ユ帶鍒剁▼搴忕増鏈紝濡傛灉浣犳兂涓 ThinkPHP 璐＄尞婧愪唬鐮侊紝璇峰厛澶ц嚧浜嗚В Git 鐨勪娇鐢ㄦ柟娉曘傛垜浠洰鍓嶆妸椤圭洰鎵樼鍦 GitHub 涓婏紝浠讳綍 GitHub 鐢ㄦ埛閮藉彲浠ュ悜鎴戜滑璐＄尞浠ｇ爜銆 -鍙備笌鐨勬柟寮忓緢绠鍗曪紝`fork`涓浠 ThinkPHP 鐨勪唬鐮佸埌浣犵殑浠撳簱涓紝淇敼鍚庢彁浜わ紝骞跺悜鎴戜滑鍙戣捣`pull request`鐢宠锛屾垜浠細鍙婃椂瀵逛唬鐮佽繘琛屽鏌ュ苟澶勭悊浣犵殑鐢宠骞躲傚鏌ラ氳繃鍚庯紝浣犵殑浠ｇ爜灏嗚`merge`杩涙垜浠殑浠撳簱涓紝杩欐牱浣犲氨浼氳嚜鍔ㄥ嚭鐜板湪璐＄尞鑰呭悕鍗曢噷浜嗭紝闈炲父鏂逛究銆 +鍙備笌鐨勬柟寮忓緢绠鍗曪紝`fork`涓浠 ThinkPHP 鐨勪唬鐮佸埌浣犵殑浠撳簱涓紝淇敼鍚庢彁浜わ紝骞跺悜鎴戜滑鍙戣捣`pull request`鐢宠锛屾垜浠細鍙婃椂瀵逛唬鐮佽繘琛屽鏌ュ苟澶勭悊浣犵殑鐢宠銆傚鏌ラ氳繃鍚庯紝浣犵殑浠ｇ爜灏嗚`merge`杩涙垜浠殑浠撳簱涓紝杩欐牱浣犲氨浼氳嚜鍔ㄥ嚭鐜板湪璐＄尞鑰呭悕鍗曢噷浜嗭紝闈炲父鏂逛究銆 鎴戜滑甯屾湜浣犺础鐚殑浠ｇ爜绗﹀悎锛 @@ -60,7 +60,7 @@ GitHub 鎻愪緵浜 Issue 鍔熻兘锛岃鍔熻兘鍙互鐢ㄤ簬锛 6. 鍙樺熀锛堣鍚 `rebase`锛変綘鐨勫垎鏀埌涓婃父 master 鍒嗘敮锛 7. `push` 浣犵殑鏈湴浠撳簱鍒 GitHub锛 8. 鎻愪氦 `pull request`锛 -9. 绛夊緟 CI 楠岃瘉锛堣嫢涓嶉氳繃鍒欓噸澶 5~7锛孏itHub 浼氳嚜鍔ㄦ洿鏂颁綘鐨 `pull request`锛夛紱 +9. 绛夊緟 CI 楠岃瘉锛堣嫢涓嶉氳繃鍒欓噸澶 5~7锛屼笉闇瑕侀噸鏂版彁浜 `pull request`锛孏itHub 浼氳嚜鍔ㄦ洿鏂颁綘鐨 `pull request`锛夛紱 10. 绛夊緟绠＄悊鍛樺鐞嗭紝骞跺強鏃 `rebase` 浣犵殑鍒嗘敮鍒颁笂娓 master 鍒嗘敮锛堣嫢涓婃父 master 鍒嗘敮鏈変慨鏀癸級銆 *鑻ユ湁蹇呰锛屽彲浠 `git push -f` 寮鸿鎺ㄩ rebase 鍚庣殑鍒嗘敮鍒拌嚜宸辩殑 `fork`* diff --git a/thinkphp/LICENSE.txt b/thinkphp/LICENSE.txt index 574a39c40..2cb9a8a9f 100644 --- a/thinkphp/LICENSE.txt +++ b/thinkphp/LICENSE.txt @@ -1,6 +1,6 @@ ThinkPHP閬靛惊Apache2寮婧愬崗璁彂甯冿紝骞舵彁渚涘厤璐逛娇鐢ㄣ -鐗堟潈鎵鏈塁opyright 漏 2006-2016 by ThinkPHP (http://thinkphp.cn) +鐗堟潈鎵鏈塁opyright 漏 2006-2017 by ThinkPHP (http://thinkphp.cn) All rights reserved銆 ThinkPHP庐 鍟嗘爣鍜岃憲浣滄潈鎵鏈夎呬负涓婃捣椤舵兂淇℃伅绉戞妧鏈夐檺鍏徃銆 diff --git a/thinkphp/README.md b/thinkphp/README.md index 4b0eb838f..f01fd2b96 100644 --- a/thinkphp/README.md +++ b/thinkphp/README.md @@ -92,7 +92,7 @@ www WEB閮ㄧ讲鐩綍锛堟垨鑰呭瓙鐩綍锛 ## 鍛藉悕瑙勮寖 -ThinkPHP5鐨勫懡鍚嶈鑼冮伒寰狿SR-2瑙勮寖浠ュ強PSR-4鑷姩鍔犺浇瑙勮寖銆 +ThinkPHP5鐨勫懡鍚嶈鑼冮伒寰猔PSR-2`瑙勮寖浠ュ強`PSR-4`鑷姩鍔犺浇瑙勮寖銆 ## 鍙備笌寮鍙 娉ㄥ唽骞剁櫥褰 Github 甯愬彿锛 fork 鏈」鐩苟杩涜鏀瑰姩銆 @@ -105,7 +105,7 @@ ThinkPHP閬靛惊Apache2寮婧愬崗璁彂甯冿紝骞舵彁渚涘厤璐逛娇鐢ㄣ 鏈」鐩寘鍚殑绗笁鏂规簮鐮佸拰浜岃繘鍒舵枃浠朵箣鐗堟潈淇℃伅鍙﹁鏍囨敞銆 -鐗堟潈鎵鏈塁opyright 漏 2006-2016 by ThinkPHP (http://thinkphp.cn) +鐗堟潈鎵鏈塁opyright 漏 2006-2018 by ThinkPHP (http://thinkphp.cn) All rights reserved銆 diff --git a/thinkphp/base.php b/thinkphp/base.php index 31a2333f2..92c4fa557 100644 --- a/thinkphp/base.php +++ b/thinkphp/base.php @@ -2,14 +2,14 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -define('THINK_VERSION', '5.0.10'); +define('THINK_VERSION', '5.0.24'); define('THINK_START_TIME', microtime(true)); define('THINK_START_MEM', memory_get_usage()); define('EXT', '.php'); @@ -40,8 +40,10 @@ require CORE_PATH . 'Loader.php'; // 鍔犺浇鐜鍙橀噺閰嶇疆鏂囦欢 if (is_file(ROOT_PATH . '.env')) { $env = parse_ini_file(ROOT_PATH . '.env', true); + foreach ($env as $key => $val) { $name = ENV_PREFIX . strtoupper($key); + if (is_array($val)) { foreach ($val as $k => $v) { $item = $name . '_' . strtoupper($k); diff --git a/thinkphp/convention.php b/thinkphp/convention.php index 4ca03c06e..31a0a0c11 100644 --- a/thinkphp/convention.php +++ b/thinkphp/convention.php @@ -116,6 +116,8 @@ return [ // +---------------------------------------------------------------------- 'template' => [ + // 榛樿妯℃澘娓叉煋瑙勫垯 1 瑙ｆ瀽涓哄皬鍐+涓嬪垝绾 2 鍏ㄩ儴杞崲灏忓啓 + 'auto_rule' => 1, // 妯℃澘寮曟搸绫诲瀷 鏀寔 php think 鏀寔鎵╁睍 'type' => 'Think', // 瑙嗗浘鍩虹鐩綍锛岄厤缃洰褰曚负鎵鏈夋ā鍧楃殑瑙嗗浘璧峰鐩綍 @@ -286,4 +288,11 @@ return [ 'list_rows' => 15, ], + //鎺у埗鍙伴厤缃 + 'console' => [ + 'name' => 'Think Console', + 'version' => '0.1', + 'user' => null, + ], + ]; diff --git a/thinkphp/helper.php b/thinkphp/helper.php index a23b67942..12683cfd8 100644 --- a/thinkphp/helper.php +++ b/thinkphp/helper.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -127,7 +127,7 @@ if (!function_exists('input')) { if ($pos = strpos($key, '.')) { // 鎸囧畾鍙傛暟鏉ユ簮 list($method, $key) = explode('.', $key, 2); - if (!in_array($method, ['get', 'post', 'put', 'patch', 'delete', 'param', 'request', 'session', 'cookie', 'server', 'env', 'path', 'file'])) { + if (!in_array($method, ['get', 'post', 'put', 'patch', 'delete', 'route', 'param', 'request', 'session', 'cookie', 'server', 'env', 'path', 'file'])) { $key = $method . '.' . $key; $method = 'param'; } diff --git a/thinkphp/lang/zh-cn.php b/thinkphp/lang/zh-cn.php index 6e89f01a8..eb7a9142a 100644 --- a/thinkphp/lang/zh-cn.php +++ b/thinkphp/lang/zh-cn.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -12,57 +12,125 @@ // 鏍稿績涓枃璇█鍖 return [ // 绯荤粺閿欒鎻愮ず - 'Undefined variable' => '鏈畾涔夊彉閲', - 'Undefined index' => '鏈畾涔夋暟缁勭储寮', - 'Undefined offset' => '鏈畾涔夋暟缁勪笅鏍', - 'Parse error' => '璇硶瑙ｆ瀽閿欒', - 'Type error' => '绫诲瀷閿欒', - 'Fatal error' => '鑷村懡閿欒', - 'syntax error' => '璇硶閿欒', + 'Undefined variable' => '鏈畾涔夊彉閲', + 'Undefined index' => '鏈畾涔夋暟缁勭储寮', + 'Undefined offset' => '鏈畾涔夋暟缁勪笅鏍', + 'Parse error' => '璇硶瑙ｆ瀽閿欒', + 'Type error' => '绫诲瀷閿欒', + 'Fatal error' => '鑷村懡閿欒', + 'syntax error' => '璇硶閿欒', // 妗嗘灦鏍稿績閿欒鎻愮ず - 'dispatch type not support' => '涓嶆敮鎸佺殑璋冨害绫诲瀷', - 'method param miss' => '鏂规硶鍙傛暟閿欒', - 'method not exists' => '鏂规硶涓嶅瓨鍦', - 'module not exists' => '妯″潡涓嶅瓨鍦', - 'controller not exists' => '鎺у埗鍣ㄤ笉瀛樺湪', - 'class not exists' => '绫讳笉瀛樺湪', - 'property not exists' => '绫荤殑灞炴т笉瀛樺湪', - 'template not exists' => '妯℃澘鏂囦欢涓嶅瓨鍦', - 'illegal controller name' => '闈炴硶鐨勬帶鍒跺櫒鍚嶇О', - 'illegal action name' => '闈炴硶鐨勬搷浣滃悕绉', - 'url suffix deny' => '绂佹鐨刄RL鍚庣紑璁块棶', - 'Route Not Found' => '褰撳墠璁块棶璺敱鏈畾涔', - 'Undefined db type' => '鏈畾涔夋暟鎹簱绫诲瀷', - 'variable type error' => '鍙橀噺绫诲瀷閿欒', - 'PSR-4 error' => 'PSR-4 瑙勮寖閿欒', - 'not support total' => '绠娲佹ā寮忎笅涓嶈兘鑾峰彇鏁版嵁鎬绘暟', - 'not support last' => '绠娲佹ā寮忎笅涓嶈兘鑾峰彇鏈鍚庝竴椤', - 'error session handler' => '閿欒鐨凷ESSION澶勭悊鍣ㄧ被', - 'not allow php tag' => '妯℃澘涓嶅厑璁镐娇鐢≒HP璇硶', - 'not support' => '涓嶆敮鎸', - 'redisd master' => 'Redisd 涓绘湇鍔″櫒閿欒', - 'redisd slave' => 'Redisd 浠庢湇鍔″櫒閿欒', - 'must run at sae' => '蹇呴』鍦⊿AE杩愯', - 'memcache init error' => '鏈紑閫歁emcache鏈嶅姟锛岃鍦⊿AE绠＄悊骞冲彴鍒濆鍖朚emcache鏈嶅姟', - 'KVDB init error' => '娌℃湁鍒濆鍖朘VDB锛岃鍦⊿AE绠＄悊骞冲彴鍒濆鍖朘VDB鏈嶅姟', - 'fields not exists' => '鏁版嵁琛ㄥ瓧娈典笉瀛樺湪', - 'where express error' => '鏌ヨ琛ㄨ揪寮忛敊璇', - 'no data to update' => '娌℃湁浠讳綍鏁版嵁闇瑕佹洿鏂', - 'miss data to insert' => '缂哄皯闇瑕佸啓鍏ョ殑鏁版嵁', - 'miss complex primary data' => '缂哄皯澶嶅悎涓婚敭鏁版嵁', - 'miss update condition' => '缂哄皯鏇存柊鏉′欢', - 'model data Not Found' => '妯″瀷鏁版嵁涓嶅瓨鍦', - 'table data not Found' => '琛ㄦ暟鎹笉瀛樺湪', - 'delete without condition' => '娌℃湁鏉′欢涓嶄細鎵ц鍒犻櫎鎿嶄綔', - 'miss relation data' => '缂哄皯鍏宠仈琛ㄦ暟鎹', - 'tag attr must' => '妯℃澘鏍囩灞炴у繀椤', - 'tag error' => '妯℃澘鏍囩閿欒', - 'cache write error' => '缂撳瓨鍐欏叆澶辫触', - 'sae mc write error' => 'SAE mc 鍐欏叆閿欒', - 'route name not exists' => '璺敱鏍囪瘑涓嶅瓨鍦紙鎴栧弬鏁颁笉澶燂級', - 'invalid request' => '闈炴硶璇锋眰', - 'bind attr has exists' => '妯″瀷鐨勫睘鎬у凡缁忓瓨鍦', - 'relation data not exists' => '鍏宠仈鏁版嵁涓嶅瓨鍦', - 'relation not support' => '鍏宠仈涓嶆敮鎸', + 'dispatch type not support' => '涓嶆敮鎸佺殑璋冨害绫诲瀷', + 'method param miss' => '鏂规硶鍙傛暟閿欒', + 'method not exists' => '鏂规硶涓嶅瓨鍦', + 'module not exists' => '妯″潡涓嶅瓨鍦', + 'controller not exists' => '鎺у埗鍣ㄤ笉瀛樺湪', + 'class not exists' => '绫讳笉瀛樺湪', + 'property not exists' => '绫荤殑灞炴т笉瀛樺湪', + 'template not exists' => '妯℃澘鏂囦欢涓嶅瓨鍦', + 'illegal controller name' => '闈炴硶鐨勬帶鍒跺櫒鍚嶇О', + 'illegal action name' => '闈炴硶鐨勬搷浣滃悕绉', + 'url suffix deny' => '绂佹鐨刄RL鍚庣紑璁块棶', + 'Route Not Found' => '褰撳墠璁块棶璺敱鏈畾涔', + 'Undefined db type' => '鏈畾涔夋暟鎹簱绫诲瀷', + 'variable type error' => '鍙橀噺绫诲瀷閿欒', + 'PSR-4 error' => 'PSR-4 瑙勮寖閿欒', + 'not support total' => '绠娲佹ā寮忎笅涓嶈兘鑾峰彇鏁版嵁鎬绘暟', + 'not support last' => '绠娲佹ā寮忎笅涓嶈兘鑾峰彇鏈鍚庝竴椤', + 'error session handler' => '閿欒鐨凷ESSION澶勭悊鍣ㄧ被', + 'not allow php tag' => '妯℃澘涓嶅厑璁镐娇鐢≒HP璇硶', + 'not support' => '涓嶆敮鎸', + 'redisd master' => 'Redisd 涓绘湇鍔″櫒閿欒', + 'redisd slave' => 'Redisd 浠庢湇鍔″櫒閿欒', + 'must run at sae' => '蹇呴』鍦⊿AE杩愯', + 'memcache init error' => '鏈紑閫歁emcache鏈嶅姟锛岃鍦⊿AE绠＄悊骞冲彴鍒濆鍖朚emcache鏈嶅姟', + 'KVDB init error' => '娌℃湁鍒濆鍖朘VDB锛岃鍦⊿AE绠＄悊骞冲彴鍒濆鍖朘VDB鏈嶅姟', + 'fields not exists' => '鏁版嵁琛ㄥ瓧娈典笉瀛樺湪', + 'where express error' => '鏌ヨ琛ㄨ揪寮忛敊璇', + 'not support data' => '涓嶆敮鎸佺殑鏁版嵁琛ㄨ揪寮', + 'no data to update' => '娌℃湁浠讳綍鏁版嵁闇瑕佹洿鏂', + 'miss data to insert' => '缂哄皯闇瑕佸啓鍏ョ殑鏁版嵁', + 'miss complex primary data' => '缂哄皯澶嶅悎涓婚敭鏁版嵁', + 'miss update condition' => '缂哄皯鏇存柊鏉′欢', + 'model data Not Found' => '妯″瀷鏁版嵁涓嶅瓨鍦', + 'table data not Found' => '琛ㄦ暟鎹笉瀛樺湪', + 'delete without condition' => '娌℃湁鏉′欢涓嶄細鎵ц鍒犻櫎鎿嶄綔', + 'miss relation data' => '缂哄皯鍏宠仈琛ㄦ暟鎹', + 'tag attr must' => '妯℃澘鏍囩灞炴у繀椤', + 'tag error' => '妯℃澘鏍囩閿欒', + 'cache write error' => '缂撳瓨鍐欏叆澶辫触', + 'sae mc write error' => 'SAE mc 鍐欏叆閿欒', + 'route name not exists' => '璺敱鏍囪瘑涓嶅瓨鍦紙鎴栧弬鏁颁笉澶燂級', + 'invalid request' => '闈炴硶璇锋眰', + 'bind attr has exists' => '妯″瀷鐨勫睘鎬у凡缁忓瓨鍦', + 'relation data not exists' => '鍏宠仈鏁版嵁涓嶅瓨鍦', + 'relation not support' => '鍏宠仈涓嶆敮鎸', + 'chunk not support order' => 'Chunk涓嶆敮鎸佽皟鐢╫rder鏂规硶', + 'closure not support cache(true)' => '浣跨敤闂寘鏌ヨ涓嶆敮鎸乧ache(true)锛岃鎸囧畾缂撳瓨Key', + + // 涓婁紶閿欒淇℃伅 + 'unknown upload error' => '鏈煡涓婁紶閿欒锛', + 'file write error' => '鏂囦欢鍐欏叆澶辫触锛', + 'upload temp dir not found' => '鎵句笉鍒颁复鏃舵枃浠跺す锛', + 'no file to uploaded' => '娌℃湁鏂囦欢琚笂浼狅紒', + 'only the portion of file is uploaded' => '鏂囦欢鍙湁閮ㄥ垎琚笂浼狅紒', + 'upload File size exceeds the maximum value' => '涓婁紶鏂囦欢澶у皬瓒呰繃浜嗘渶澶у硷紒', + 'upload write error' => '鏂囦欢涓婁紶淇濆瓨閿欒锛', + 'has the same filename: {:filename}' => '瀛樺湪鍚屽悕鏂囦欢锛歿:filename}', + 'upload illegal files' => '闈炴硶涓婁紶鏂囦欢', + 'illegal image files' => '闈炴硶鍥剧墖鏂囦欢', + 'extensions to upload is not allowed' => '涓婁紶鏂囦欢鍚庣紑涓嶅厑璁', + 'mimetype to upload is not allowed' => '涓婁紶鏂囦欢MIME绫诲瀷涓嶅厑璁革紒', + 'filesize not match' => '涓婁紶鏂囦欢澶у皬涓嶇锛', + 'directory {:path} creation failed' => '鐩綍 {:path} 鍒涘缓澶辫触锛', + + // Validate Error Message + ':attribute require' => ':attribute涓嶈兘涓虹┖', + ':attribute must be numeric' => ':attribute蹇呴』鏄暟瀛', + ':attribute must be integer' => ':attribute蹇呴』鏄暣鏁', + ':attribute must be float' => ':attribute蹇呴』鏄诞鐐规暟', + ':attribute must be bool' => ':attribute蹇呴』鏄竷灏斿', + ':attribute not a valid email address' => ':attribute鏍煎紡涓嶇', + ':attribute not a valid mobile' => ':attribute鏍煎紡涓嶇', + ':attribute must be a array' => ':attribute蹇呴』鏄暟缁', + ':attribute must be yes,on or 1' => ':attribute蹇呴』鏄痽es銆乷n鎴栬1', + ':attribute not a valid datetime' => ':attribute涓嶆槸涓涓湁鏁堢殑鏃ユ湡鎴栨椂闂存牸寮', + ':attribute not a valid file' => ':attribute涓嶆槸鏈夋晥鐨勪笂浼犳枃浠', + ':attribute not a valid image' => ':attribute涓嶆槸鏈夋晥鐨勫浘鍍忔枃浠', + ':attribute must be alpha' => ':attribute鍙兘鏄瓧姣', + ':attribute must be alpha-numeric' => ':attribute鍙兘鏄瓧姣嶅拰鏁板瓧', + ':attribute must be alpha-numeric, dash, underscore' => ':attribute鍙兘鏄瓧姣嶃佹暟瀛楀拰涓嬪垝绾縚鍙婄牬鎶樺彿-', + ':attribute not a valid domain or ip' => ':attribute涓嶆槸鏈夋晥鐨勫煙鍚嶆垨鑰匢P', + ':attribute must be chinese' => ':attribute鍙兘鏄眽瀛', + ':attribute must be chinese or alpha' => ':attribute鍙兘鏄眽瀛椼佸瓧姣', + ':attribute must be chinese,alpha-numeric' => ':attribute鍙兘鏄眽瀛椼佸瓧姣嶅拰鏁板瓧', + ':attribute must be chinese,alpha-numeric,underscore, dash' => ':attribute鍙兘鏄眽瀛椼佸瓧姣嶃佹暟瀛楀拰涓嬪垝绾縚鍙婄牬鎶樺彿-', + ':attribute not a valid url' => ':attribute涓嶆槸鏈夋晥鐨刄RL鍦板潃', + ':attribute not a valid ip' => ':attribute涓嶆槸鏈夋晥鐨処P鍦板潃', + ':attribute must be dateFormat of :rule' => ':attribute蹇呴』浣跨敤鏃ユ湡鏍煎紡 :rule', + ':attribute must be in :rule' => ':attribute蹇呴』鍦 :rule 鑼冨洿鍐', + ':attribute be notin :rule' => ':attribute涓嶈兘鍦 :rule 鑼冨洿鍐', + ':attribute must between :1 - :2' => ':attribute鍙兘鍦 :1 - :2 涔嬮棿', + ':attribute not between :1 - :2' => ':attribute涓嶈兘鍦 :1 - :2 涔嬮棿', + 'size of :attribute must be :rule' => ':attribute闀垮害涓嶇鍚堣姹 :rule', + 'max size of :attribute must be :rule' => ':attribute闀垮害涓嶈兘瓒呰繃 :rule', + 'min size of :attribute must be :rule' => ':attribute闀垮害涓嶈兘灏忎簬 :rule', + ':attribute cannot be less than :rule' => ':attribute鏃ユ湡涓嶈兘灏忎簬 :rule', + ':attribute cannot exceed :rule' => ':attribute鏃ユ湡涓嶈兘瓒呰繃 :rule', + ':attribute not within :rule' => '涓嶅湪鏈夋晥鏈熷唴 :rule', + 'access IP is not allowed' => '涓嶅厑璁哥殑IP璁块棶', + 'access IP denied' => '绂佹鐨処P璁块棶', + ':attribute out of accord with :2' => ':attribute鍜岀‘璁ゅ瓧娈:2涓嶄竴鑷', + ':attribute cannot be same with :2' => ':attribute鍜屾瘮杈冨瓧娈:2涓嶈兘鐩稿悓', + ':attribute must greater than or equal :rule' => ':attribute蹇呴』澶т簬绛変簬 :rule', + ':attribute must greater than :rule' => ':attribute蹇呴』澶т簬 :rule', + ':attribute must less than or equal :rule' => ':attribute蹇呴』灏忎簬绛変簬 :rule', + ':attribute must less than :rule' => ':attribute蹇呴』灏忎簬 :rule', + ':attribute must equal :rule' => ':attribute蹇呴』绛変簬 :rule', + ':attribute has exists' => ':attribute宸插瓨鍦', + ':attribute not conform to the rules' => ':attribute涓嶇鍚堟寚瀹氳鍒', + 'invalid Request method' => '鏃犳晥鐨勮姹傜被鍨', + 'invalid token' => '浠ょ墝鏁版嵁鏃犳晥', + 'not conform to the rules' => '瑙勫垯閿欒', ]; diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php index b7d596911..f572b907c 100644 --- a/thinkphp/library/think/App.php +++ b/thinkphp/library/think/App.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -11,13 +11,14 @@ namespace think; +use think\exception\ClassNotFoundException; use think\exception\HttpException; use think\exception\HttpResponseException; use think\exception\RouteNotFoundException; /** * App 搴旂敤绠＄悊 - * @author liu21st + * @author liu21st */ class App { @@ -56,24 +57,32 @@ class App */ protected static $routeMust; + /** + * @var array 璇锋眰璋冨害鍒嗗彂 + */ protected static $dispatch; + + /** + * @var array 棰濆鍔犺浇鏂囦欢 + */ protected static $file = []; /** * 鎵ц搴旂敤绋嬪簭 * @access public - * @param Request $request Request瀵硅薄 + * @param Request $request 璇锋眰瀵硅薄 * @return Response * @throws Exception */ public static function run(Request $request = null) { - is_null($request) && $request = Request::instance(); + $request = is_null($request) ? Request::instance() : $request; try { $config = self::initCommon(); + + // 妯″潡/鎺у埗鍣ㄧ粦瀹 if (defined('BIND_MODULE')) { - // 妯″潡/鎺у埗鍣ㄧ粦瀹 BIND_MODULE && Route::bind(BIND_MODULE); } elseif ($config['auto_bind_module']) { // 鍏ュ彛鑷姩缁戝畾 @@ -87,10 +96,8 @@ class App // 榛樿璇█ Lang::range($config['default_lang']); - if ($config['lang_switch_on']) { - // 寮鍚璇█鏈哄埗 妫娴嬪綋鍓嶈瑷 - Lang::detect(); - } + // 寮鍚璇█鏈哄埗 妫娴嬪綋鍓嶈瑷 + $config['lang_switch_on'] && Lang::detect(); $request->langset(Lang::range()); // 鍔犺浇绯荤粺璇█鍖 @@ -99,12 +106,16 @@ class App APP_PATH . 'lang' . DS . $request->langset() . EXT, ]); + // 鐩戝惉 app_dispatch + Hook::listen('app_dispatch', self::$dispatch); // 鑾峰彇搴旂敤璋冨害淇℃伅 $dispatch = self::$dispatch; + + // 鏈缃皟搴︿俊鎭垯杩涜 URL 璺敱妫娴 if (empty($dispatch)) { - // 杩涜URL璺敱妫娴 $dispatch = self::routeCheck($request, $config); } + // 璁板綍褰撳墠璋冨害淇℃伅 $request->dispatch($dispatch); @@ -115,10 +126,15 @@ class App Log::record('[ PARAM ] ' . var_export($request->param(), true), 'info'); } - // 鐩戝惉app_begin + // 鐩戝惉 app_begin Hook::listen('app_begin', $dispatch); + // 璇锋眰缂撳瓨妫鏌 - $request->cache($config['request_cache'], $config['request_cache_expire'], $config['request_cache_except']); + $request->cache( + $config['request_cache'], + $config['request_cache_expire'], + $config['request_cache_except'] + ); $data = self::exec($dispatch, $config); } catch (HttpResponseException $exception) { @@ -133,290 +149,33 @@ class App $response = $data; } elseif (!is_null($data)) { // 榛樿鑷姩璇嗗埆鍝嶅簲杈撳嚭绫诲瀷 - $isAjax = $request->isAjax(); - $type = $isAjax ? Config::get('default_ajax_return') : Config::get('default_return_type'); + $type = $request->isAjax() ? + Config::get('default_ajax_return') : + Config::get('default_return_type'); + $response = Response::create($data, $type); } else { $response = Response::create(); } - // 鐩戝惉app_end + // 鐩戝惉 app_end Hook::listen('app_end', $response); return $response; } /** - * 璁剧疆褰撳墠璇锋眰鐨勮皟搴︿俊鎭 + * 鍒濆鍖栧簲鐢紝骞惰繑鍥為厤缃俊鎭 * @access public - * @param array|string $dispatch 璋冨害淇℃伅 - * @param string $type 璋冨害绫诲瀷 - * @return void - */ - public static function dispatch($dispatch, $type = 'module') - { - self::$dispatch = ['type' => $type, $type => $dispatch]; - } - - /** - * 鎵ц鍑芥暟鎴栬呴棴鍖呮柟娉 鏀寔鍙傛暟璋冪敤 - * @access public - * @param string|array|\Closure $function 鍑芥暟鎴栬呴棴鍖 - * @param array $vars 鍙橀噺 - * @return mixed - */ - public static function invokeFunction($function, $vars = []) - { - $reflect = new \ReflectionFunction($function); - $args = self::bindParams($reflect, $vars); - // 璁板綍鎵ц淇℃伅 - self::$debug && Log::record('[ RUN ] ' . $reflect->__toString(), 'info'); - return $reflect->invokeArgs($args); - } - - /** - * 璋冪敤鍙嶅皠鎵ц绫荤殑鏂规硶 鏀寔鍙傛暟缁戝畾 - * @access public - * @param string|array $method 鏂规硶 - * @param array $vars 鍙橀噺 - * @return mixed - */ - public static function invokeMethod($method, $vars = []) - { - if (is_array($method)) { - $class = is_object($method[0]) ? $method[0] : self::invokeClass($method[0]); - $reflect = new \ReflectionMethod($class, $method[1]); - } else { - // 闈欐佹柟娉 - $reflect = new \ReflectionMethod($method); - } - $args = self::bindParams($reflect, $vars); - - self::$debug && Log::record('[ RUN ] ' . $reflect->class . '->' . $reflect->name . '[ ' . $reflect->getFileName() . ' ]', 'info'); - return $reflect->invokeArgs(isset($class) ? $class : null, $args); - } - - /** - * 璋冪敤鍙嶅皠鎵ц绫荤殑瀹炰緥鍖 鏀寔渚濊禆娉ㄥ叆 - * @access public - * @param string $class 绫诲悕 - * @param array $vars 鍙橀噺 - * @return mixed - */ - public static function invokeClass($class, $vars = []) - { - $reflect = new \ReflectionClass($class); - $constructor = $reflect->getConstructor(); - if ($constructor) { - $args = self::bindParams($constructor, $vars); - } else { - $args = []; - } - return $reflect->newInstanceArgs($args); - } - - /** - * 缁戝畾鍙傛暟 - * @access private - * @param \ReflectionMethod|\ReflectionFunction $reflect 鍙嶅皠绫 - * @param array $vars 鍙橀噺 * @return array */ - private static function bindParams($reflect, $vars = []) - { - if (empty($vars)) { - // 鑷姩鑾峰彇璇锋眰鍙橀噺 - if (Config::get('url_param_type')) { - $vars = Request::instance()->route(); - } else { - $vars = Request::instance()->param(); - } - } - $args = []; - if ($reflect->getNumberOfParameters() > 0) { - // 鍒ゆ柇鏁扮粍绫诲瀷 鏁板瓧鏁扮粍鏃舵寜椤哄簭缁戝畾鍙傛暟 - reset($vars); - $type = key($vars) === 0 ? 1 : 0; - $params = $reflect->getParameters(); - foreach ($params as $param) { - $args[] = self::getParamValue($param, $vars, $type); - } - } - return $args; - } - - /** - * 鑾峰彇鍙傛暟鍊 - * @access private - * @param \ReflectionParameter $param - * @param array $vars 鍙橀噺 - * @param string $type - * @return array - */ - private static function getParamValue($param, &$vars, $type) - { - $name = $param->getName(); - $class = $param->getClass(); - if ($class) { - $className = $class->getName(); - $bind = Request::instance()->$name; - if ($bind instanceof $className) { - $result = $bind; - } else { - if (method_exists($className, 'invoke')) { - $method = new \ReflectionMethod($className, 'invoke'); - if ($method->isPublic() && $method->isStatic()) { - return $className::invoke(Request::instance()); - } - } - $result = method_exists($className, 'instance') ? $className::instance() : new $className; - } - } elseif (1 == $type && !empty($vars)) { - $result = array_shift($vars); - } elseif (0 == $type && isset($vars[$name])) { - $result = $vars[$name]; - } elseif ($param->isDefaultValueAvailable()) { - $result = $param->getDefaultValue(); - } else { - throw new \InvalidArgumentException('method param miss:' . $name); - } - return $result; - } - - protected static function exec($dispatch, $config) - { - switch ($dispatch['type']) { - case 'redirect': - // 鎵ц閲嶅畾鍚戣烦杞 - $data = Response::create($dispatch['url'], 'redirect')->code($dispatch['status']); - break; - case 'module': - // 妯″潡/鎺у埗鍣/鎿嶄綔 - $data = self::module($dispatch['module'], $config, isset($dispatch['convert']) ? $dispatch['convert'] : null); - break; - case 'controller': - // 鎵ц鎺у埗鍣ㄦ搷浣 - $vars = array_merge(Request::instance()->param(), $dispatch['var']); - $data = Loader::action($dispatch['controller'], $vars, $config['url_controller_layer'], $config['controller_suffix']); - break; - case 'method': - // 鎵ц鍥炶皟鏂规硶 - $vars = array_merge(Request::instance()->param(), $dispatch['var']); - $data = self::invokeMethod($dispatch['method'], $vars); - break; - case 'function': - // 鎵ц闂寘 - $data = self::invokeFunction($dispatch['function']); - break; - case 'response': - $data = $dispatch['response']; - break; - default: - throw new \InvalidArgumentException('dispatch type not support'); - } - return $data; - } - - /** - * 鎵ц妯″潡 - * @access public - * @param array $result 妯″潡/鎺у埗鍣/鎿嶄綔 - * @param array $config 閰嶇疆鍙傛暟 - * @param bool $convert 鏄惁鑷姩杞崲鎺у埗鍣ㄥ拰鎿嶄綔鍚 - * @return mixed - */ - public static function module($result, $config, $convert = null) - { - if (is_string($result)) { - $result = explode('/', $result); - } - $request = Request::instance(); - if ($config['app_multi_module']) { - // 澶氭ā鍧楅儴缃 - $module = strip_tags(strtolower($result[0] ?: $config['default_module'])); - $bind = Route::getBind('module'); - $available = false; - if ($bind) { - // 缁戝畾妯″潡 - list($bindModule) = explode('/', $bind); - if (empty($result[0])) { - $module = $bindModule; - $available = true; - } elseif ($module == $bindModule) { - $available = true; - } - } elseif (!in_array($module, $config['deny_module_list']) && is_dir(APP_PATH . $module)) { - $available = true; - } - - // 妯″潡鍒濆鍖 - if ($module && $available) { - // 鍒濆鍖栨ā鍧 - $request->module($module); - $config = self::init($module); - // 妯″潡璇锋眰缂撳瓨妫鏌 - $request->cache($config['request_cache'], $config['request_cache_expire'], $config['request_cache_except']); - } else { - throw new HttpException(404, 'module not exists:' . $module); - } - } else { - // 鍗曚竴妯″潡閮ㄧ讲 - $module = ''; - $request->module($module); - } - // 褰撳墠妯″潡璺緞 - App::$modulePath = APP_PATH . ($module ? $module . DS : ''); - - // 鏄惁鑷姩杞崲鎺у埗鍣ㄥ拰鎿嶄綔鍚 - $convert = is_bool($convert) ? $convert : $config['url_convert']; - // 鑾峰彇鎺у埗鍣ㄥ悕 - $controller = strip_tags($result[1] ?: $config['default_controller']); - $controller = $convert ? strtolower($controller) : $controller; - - // 鑾峰彇鎿嶄綔鍚 - $actionName = strip_tags($result[2] ?: $config['default_action']); - $actionName = $convert ? strtolower($actionName) : $actionName; - - // 璁剧疆褰撳墠璇锋眰鐨勬帶鍒跺櫒銆佹搷浣 - $request->controller(Loader::parseName($controller, 1))->action($actionName); - - // 鐩戝惉module_init - Hook::listen('module_init', $request); - - $instance = Loader::controller($controller, $config['url_controller_layer'], $config['controller_suffix'], $config['empty_controller']); - if (is_null($instance)) { - throw new HttpException(404, 'controller not exists:' . Loader::parseName($controller, 1)); - } - // 鑾峰彇褰撳墠鎿嶄綔鍚 - $action = $actionName . $config['action_suffix']; - - $vars = []; - if (is_callable([$instance, $action])) { - // 鎵ц鎿嶄綔鏂规硶 - $call = [$instance, $action]; - } elseif (is_callable([$instance, '_empty'])) { - // 绌烘搷浣 - $call = [$instance, '_empty']; - $vars = [$actionName]; - } else { - // 鎿嶄綔涓嶅瓨鍦 - throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()'); - } - - Hook::listen('action_begin', $call); - - return self::invokeMethod($call, $vars); - } - - /** - * 鍒濆鍖栧簲鐢 - */ public static function initCommon() { if (empty(self::$init)) { if (defined('APP_NAMESPACE')) { self::$namespace = APP_NAMESPACE; } + Loader::addNamespace(self::$namespace, APP_PATH); // 鍒濆鍖栧簲鐢 @@ -425,17 +184,21 @@ class App // 搴旂敤璋冭瘯妯″紡 self::$debug = Env::get('app_debug', Config::get('app_debug')); + if (!self::$debug) { ini_set('display_errors', 'Off'); } elseif (!IS_CLI) { - //閲嶆柊鐢宠涓鍧楁瘮杈冨ぇ鐨刡uffer + // 閲嶆柊鐢宠涓鍧楁瘮杈冨ぇ鐨 buffer if (ob_get_level() > 0) { $output = ob_get_clean(); } + ob_start(); + if (!empty($output)) { echo $output; } + } if (!empty($config['root_namespace'])) { @@ -456,11 +219,12 @@ class App // 璁剧疆绯荤粺鏃跺尯 date_default_timezone_set($config['default_timezone']); - // 鐩戝惉app_init + // 鐩戝惉 app_init Hook::listen('app_init'); self::$init = true; } + return Config::get(); } @@ -481,12 +245,13 @@ class App } elseif (is_file(RUNTIME_PATH . $module . 'init' . EXT)) { include RUNTIME_PATH . $module . 'init' . EXT; } else { - $path = APP_PATH . $module; // 鍔犺浇妯″潡閰嶇疆 $config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT); + // 璇诲彇鏁版嵁搴撻厤缃枃浠 $filename = CONF_PATH . $module . 'database' . CONF_EXT; Config::load($filename, 'database'); + // 璇诲彇鎵╁睍閰嶇疆鏂囦欢 if (is_dir(CONF_PATH . $module . 'extra')) { $dir = CONF_PATH . $module . 'extra'; @@ -501,7 +266,7 @@ class App // 鍔犺浇搴旂敤鐘舵侀厤缃 if ($config['app_status']) { - $config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT); + Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT); } // 鍔犺浇琛屼负鎵╁睍鏂囦欢 @@ -510,6 +275,7 @@ class App } // 鍔犺浇鍏叡鏂囦欢 + $path = APP_PATH . $module; if (is_file($path . 'common' . EXT)) { include $path . 'common' . EXT; } @@ -519,14 +285,337 @@ class App Lang::load($path . 'lang' . DS . Request::instance()->langset() . EXT); } } + return Config::get(); } + /** + * 璁剧疆褰撳墠璇锋眰鐨勮皟搴︿俊鎭 + * @access public + * @param array|string $dispatch 璋冨害淇℃伅 + * @param string $type 璋冨害绫诲瀷 + * @return void + */ + public static function dispatch($dispatch, $type = 'module') + { + self::$dispatch = ['type' => $type, $type => $dispatch]; + } + + /** + * 鎵ц鍑芥暟鎴栬呴棴鍖呮柟娉 鏀寔鍙傛暟璋冪敤 + * @access public + * @param string|array|\Closure $function 鍑芥暟鎴栬呴棴鍖 + * @param array $vars 鍙橀噺 + * @return mixed + */ + public static function invokeFunction($function, $vars = []) + { + $reflect = new \ReflectionFunction($function); + $args = self::bindParams($reflect, $vars); + + // 璁板綍鎵ц淇℃伅 + self::$debug && Log::record('[ RUN ] ' . $reflect->__toString(), 'info'); + + return $reflect->invokeArgs($args); + } + + /** + * 璋冪敤鍙嶅皠鎵ц绫荤殑鏂规硶 鏀寔鍙傛暟缁戝畾 + * @access public + * @param string|array $method 鏂规硶 + * @param array $vars 鍙橀噺 + * @return mixed + */ + public static function invokeMethod($method, $vars = []) + { + if (is_array($method)) { + $class = is_object($method[0]) ? $method[0] : self::invokeClass($method[0]); + $reflect = new \ReflectionMethod($class, $method[1]); + } else { + // 闈欐佹柟娉 + $reflect = new \ReflectionMethod($method); + } + + $args = self::bindParams($reflect, $vars); + + self::$debug && Log::record('[ RUN ] ' . $reflect->class . '->' . $reflect->name . '[ ' . $reflect->getFileName() . ' ]', 'info'); + + return $reflect->invokeArgs(isset($class) ? $class : null, $args); + } + + /** + * 璋冪敤鍙嶅皠鎵ц绫荤殑瀹炰緥鍖 鏀寔渚濊禆娉ㄥ叆 + * @access public + * @param string $class 绫诲悕 + * @param array $vars 鍙橀噺 + * @return mixed + */ + public static function invokeClass($class, $vars = []) + { + $reflect = new \ReflectionClass($class); + $constructor = $reflect->getConstructor(); + $args = $constructor ? self::bindParams($constructor, $vars) : []; + + return $reflect->newInstanceArgs($args); + } + + /** + * 缁戝畾鍙傛暟 + * @access private + * @param \ReflectionMethod|\ReflectionFunction $reflect 鍙嶅皠绫 + * @param array $vars 鍙橀噺 + * @return array + */ + private static function bindParams($reflect, $vars = []) + { + // 鑷姩鑾峰彇璇锋眰鍙橀噺 + if (empty($vars)) { + $vars = Config::get('url_param_type') ? + Request::instance()->route() : + Request::instance()->param(); + } + + $args = []; + if ($reflect->getNumberOfParameters() > 0) { + // 鍒ゆ柇鏁扮粍绫诲瀷 鏁板瓧鏁扮粍鏃舵寜椤哄簭缁戝畾鍙傛暟 + reset($vars); + $type = key($vars) === 0 ? 1 : 0; + + foreach ($reflect->getParameters() as $param) { + $args[] = self::getParamValue($param, $vars, $type); + } + } + + return $args; + } + + /** + * 鑾峰彇鍙傛暟鍊 + * @access private + * @param \ReflectionParameter $param 鍙傛暟 + * @param array $vars 鍙橀噺 + * @param string $type 绫诲埆 + * @return array + */ + private static function getParamValue($param, &$vars, $type) + { + $name = $param->getName(); + $class = $param->getClass(); + + if ($class) { + $className = $class->getName(); + $bind = Request::instance()->$name; + + if ($bind instanceof $className) { + $result = $bind; + } else { + if (method_exists($className, 'invoke')) { + $method = new \ReflectionMethod($className, 'invoke'); + + if ($method->isPublic() && $method->isStatic()) { + return $className::invoke(Request::instance()); + } + } + + $result = method_exists($className, 'instance') ? + $className::instance() : + new $className; + } + } elseif (1 == $type && !empty($vars)) { + $result = array_shift($vars); + } elseif (0 == $type && isset($vars[$name])) { + $result = $vars[$name]; + } elseif ($param->isDefaultValueAvailable()) { + $result = $param->getDefaultValue(); + } else { + throw new \InvalidArgumentException('method param miss:' . $name); + } + + return $result; + } + + /** + * 鎵ц璋冪敤鍒嗗彂 + * @access protected + * @param array $dispatch 璋冪敤淇℃伅 + * @param array $config 閰嶇疆淇℃伅 + * @return Response|mixed + * @throws \InvalidArgumentException + */ + protected static function exec($dispatch, $config) + { + switch ($dispatch['type']) { + case 'redirect': // 閲嶅畾鍚戣烦杞 + $data = Response::create($dispatch['url'], 'redirect') + ->code($dispatch['status']); + break; + case 'module': // 妯″潡/鎺у埗鍣/鎿嶄綔 + $data = self::module( + $dispatch['module'], + $config, + isset($dispatch['convert']) ? $dispatch['convert'] : null + ); + break; + case 'controller': // 鎵ц鎺у埗鍣ㄦ搷浣 + $vars = array_merge(Request::instance()->param(), $dispatch['var']); + $data = Loader::action( + $dispatch['controller'], + $vars, + $config['url_controller_layer'], + $config['controller_suffix'] + ); + break; + case 'method': // 鍥炶皟鏂规硶 + $vars = array_merge(Request::instance()->param(), $dispatch['var']); + $data = self::invokeMethod($dispatch['method'], $vars); + break; + case 'function': // 闂寘 + $data = self::invokeFunction($dispatch['function']); + break; + case 'response': // Response 瀹炰緥 + $data = $dispatch['response']; + break; + default: + throw new \InvalidArgumentException('dispatch type not support'); + } + + return $data; + } + + /** + * 鎵ц妯″潡 + * @access public + * @param array $result 妯″潡/鎺у埗鍣/鎿嶄綔 + * @param array $config 閰嶇疆鍙傛暟 + * @param bool $convert 鏄惁鑷姩杞崲鎺у埗鍣ㄥ拰鎿嶄綔鍚 + * @return mixed + * @throws HttpException + */ + public static function module($result, $config, $convert = null) + { + if (is_string($result)) { + $result = explode('/', $result); + } + + $request = Request::instance(); + + if ($config['app_multi_module']) { + // 澶氭ā鍧楅儴缃 + $module = strip_tags(strtolower($result[0] ?: $config['default_module'])); + $bind = Route::getBind('module'); + $available = false; + + if ($bind) { + // 缁戝畾妯″潡 + list($bindModule) = explode('/', $bind); + + if (empty($result[0])) { + $module = $bindModule; + $available = true; + } elseif ($module == $bindModule) { + $available = true; + } + } elseif (!in_array($module, $config['deny_module_list']) && is_dir(APP_PATH . $module)) { + $available = true; + } + + // 妯″潡鍒濆鍖 + if ($module && $available) { + // 鍒濆鍖栨ā鍧 + $request->module($module); + $config = self::init($module); + + // 妯″潡璇锋眰缂撳瓨妫鏌 + $request->cache( + $config['request_cache'], + $config['request_cache_expire'], + $config['request_cache_except'] + ); + } else { + throw new HttpException(404, 'module not exists:' . $module); + } + } else { + // 鍗曚竴妯″潡閮ㄧ讲 + $module = ''; + $request->module($module); + } + + // 璁剧疆榛樿杩囨护鏈哄埗 + $request->filter($config['default_filter']); + + // 褰撳墠妯″潡璺緞 + App::$modulePath = APP_PATH . ($module ? $module . DS : ''); + + // 鏄惁鑷姩杞崲鎺у埗鍣ㄥ拰鎿嶄綔鍚 + $convert = is_bool($convert) ? $convert : $config['url_convert']; + + // 鑾峰彇鎺у埗鍣ㄥ悕 + $controller = strip_tags($result[1] ?: $config['default_controller']); + + if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) { + throw new HttpException(404, 'controller not exists:' . $controller); + } + + $controller = $convert ? strtolower($controller) : $controller; + + // 鑾峰彇鎿嶄綔鍚 + $actionName = strip_tags($result[2] ?: $config['default_action']); + if (!empty($config['action_convert'])) { + $actionName = Loader::parseName($actionName, 1); + } else { + $actionName = $convert ? strtolower($actionName) : $actionName; + } + + // 璁剧疆褰撳墠璇锋眰鐨勬帶鍒跺櫒銆佹搷浣 + $request->controller(Loader::parseName($controller, 1))->action($actionName); + + // 鐩戝惉module_init + Hook::listen('module_init', $request); + + try { + $instance = Loader::controller( + $controller, + $config['url_controller_layer'], + $config['controller_suffix'], + $config['empty_controller'] + ); + } catch (ClassNotFoundException $e) { + throw new HttpException(404, 'controller not exists:' . $e->getClass()); + } + + // 鑾峰彇褰撳墠鎿嶄綔鍚 + $action = $actionName . $config['action_suffix']; + + $vars = []; + if (is_callable([$instance, $action])) { + // 鎵ц鎿嶄綔鏂规硶 + $call = [$instance, $action]; + // 涓ユ牸鑾峰彇褰撳墠鎿嶄綔鏂规硶鍚 + $reflect = new \ReflectionMethod($instance, $action); + $methodName = $reflect->getName(); + $suffix = $config['action_suffix']; + $actionName = $suffix ? substr($methodName, 0, -strlen($suffix)) : $methodName; + $request->action($actionName); + + } elseif (is_callable([$instance, '_empty'])) { + // 绌烘搷浣 + $call = [$instance, '_empty']; + $vars = [$actionName]; + } else { + // 鎿嶄綔涓嶅瓨鍦 + throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()'); + } + + Hook::listen('action_begin', $call); + + return self::invokeMethod($call, $vars); + } + /** * URL璺敱妫娴嬶紙鏍规嵁PATH_INFO) * @access public - * @param \think\Request $request - * @param array $config + * @param \think\Request $request 璇锋眰瀹炰緥 + * @param array $config 閰嶇疆淇℃伅 * @return array * @throws \think\Exception */ @@ -535,6 +624,7 @@ class App $path = $request->path(); $depr = $config['pathinfo_depr']; $result = false; + // 璺敱妫娴 $check = !is_null(self::$routeCheck) ? self::$routeCheck : $config['url_route_on']; if ($check) { @@ -542,18 +632,14 @@ class App if (is_file(RUNTIME_PATH . 'route.php')) { // 璇诲彇璺敱缂撳瓨 $rules = include RUNTIME_PATH . 'route.php'; - if (is_array($rules)) { - Route::rules($rules); - } + is_array($rules) && Route::rules($rules); } else { $files = $config['route_config_file']; foreach ($files as $file) { if (is_file(CONF_PATH . $file . CONF_EXT)) { // 瀵煎叆璺敱閰嶇疆 $rules = include CONF_PATH . $file . CONF_EXT; - if (is_array($rules)) { - Route::import($rules); - } + is_array($rules) && Route::import($rules); } } } @@ -561,15 +647,18 @@ class App // 璺敱妫娴嬶紙鏍规嵁璺敱瀹氫箟杩斿洖涓嶅悓鐨刄RL璋冨害锛 $result = Route::check($request, $path, $depr, $config['url_domain_deploy']); $must = !is_null(self::$routeMust) ? self::$routeMust : $config['url_route_must']; + if ($must && false === $result) { // 璺敱鏃犳晥 throw new RouteNotFoundException(); } } + + // 璺敱鏃犳晥 瑙ｆ瀽妯″潡/鎺у埗鍣/鎿嶄綔/鍙傛暟... 鏀寔鎺у埗鍣ㄨ嚜鍔ㄦ悳绱 if (false === $result) { - // 璺敱鏃犳晥 瑙ｆ瀽妯″潡/鎺у埗鍣/鎿嶄綔/鍙傛暟... 鏀寔鎺у埗鍣ㄨ嚜鍔ㄦ悳绱 $result = Route::parseUrl($path, $depr, $config['controller_auto_search']); } + return $result; } diff --git a/thinkphp/library/think/Build.php b/thinkphp/library/think/Build.php index 6e055c92a..de7c3275a 100644 --- a/thinkphp/library/think/Build.php +++ b/thinkphp/library/think/Build.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -14,36 +14,44 @@ namespace think; class Build { /** - * 鏍规嵁浼犲叆鐨刡uild璧勬枡鍒涘缓鐩綍鍜屾枃浠 - * @access protected - * @param array $build build鍒楄〃 + * 鏍规嵁浼犲叆鐨 build 璧勬枡鍒涘缓鐩綍鍜屾枃浠 + * @access public + * @param array $build build 鍒楄〃 * @param string $namespace 搴旂敤绫诲簱鍛藉悕绌洪棿 - * @param bool $suffix 绫诲簱鍚庣紑 + * @param bool $suffix 绫诲簱鍚庣紑 * @return void + * @throws Exception */ public static function run(array $build = [], $namespace = 'app', $suffix = false) { // 閿佸畾 - $lockfile = APP_PATH . 'build.lock'; - if (is_writable($lockfile)) { - return; - } elseif (!touch($lockfile)) { - throw new Exception('搴旂敤鐩綍[' . APP_PATH . ']涓嶅彲鍐欙紝鐩綍鏃犳硶鑷姩鐢熸垚锛
璇锋墜鍔ㄧ敓鎴愰」鐩洰褰晘', 10006); - } - foreach ($build as $module => $list) { - if ('__dir__' == $module) { - // 鍒涘缓鐩綍鍒楄〃 - self::buildDir($list); - } elseif ('__file__' == $module) { - // 鍒涘缓鏂囦欢鍒楄〃 - self::buildFile($list); - } else { - // 鍒涘缓妯″潡 - self::module($module, $list, $namespace, $suffix); + $lock = APP_PATH . 'build.lock'; + + // 濡傛灉閿佸畾鏂囦欢涓嶅彲鍐(涓嶅瓨鍦)鍒欒繘琛屽鐞嗭紝鍚﹀垯琛ㄧず宸茬粡鏈夌▼搴忓湪澶勭悊浜 + if (!is_writable($lock)) { + if (!touch($lock)) { + throw new Exception( + '搴旂敤鐩綍[' . APP_PATH . ']涓嶅彲鍐欙紝鐩綍鏃犳硶鑷姩鐢熸垚锛
璇锋墜鍔ㄧ敓鎴愰」鐩洰褰晘', + 10006 + ); } + + foreach ($build as $module => $list) { + if ('__dir__' == $module) { + // 鍒涘缓鐩綍鍒楄〃 + self::buildDir($list); + } elseif ('__file__' == $module) { + // 鍒涘缓鏂囦欢鍒楄〃 + self::buildFile($list); + } else { + // 鍒涘缓妯″潡 + self::module($module, $list, $namespace, $suffix); + } + } + + // 瑙ｉ櫎閿佸畾 + unlink($lock); } - // 瑙ｉ櫎閿佸畾 - unlink($lockfile); } /** @@ -55,10 +63,8 @@ class Build protected static function buildDir($list) { foreach ($list as $dir) { - if (!is_dir(APP_PATH . $dir)) { - // 鍒涘缓鐩綍 - mkdir(APP_PATH . $dir, 0755, true); - } + // 鐩綍涓嶅瓨鍦ㄥ垯鍒涘缓鐩綍 + !is_dir(APP_PATH . $dir) && mkdir(APP_PATH . $dir, 0755, true); } } @@ -71,12 +77,17 @@ class Build protected static function buildFile($list) { foreach ($list as $file) { + // 鍏堝垱寤虹洰褰 if (!is_dir(APP_PATH . dirname($file))) { - // 鍒涘缓鐩綍 mkdir(APP_PATH . dirname($file), 0755, true); } + + // 鍐嶅垱寤烘枃浠 if (!is_file(APP_PATH . $file)) { - file_put_contents(APP_PATH . $file, 'php' == pathinfo($file, PATHINFO_EXTENSION) ? " ['config.php', 'common.php'], '__dir__' => ['controller', 'model', 'view'], ]; } + // 鍒涘缓瀛愮洰褰曞拰鏂囦欢 foreach ($list as $path => $file) { $modulePath = APP_PATH . $module . DS; + if ('__dir__' == $path) { // 鐢熸垚瀛愮洰褰 foreach ($file as $dir) { @@ -122,16 +135,20 @@ class Build // 鐢熸垚锛堢┖鐧斤級鏂囦欢 foreach ($file as $name) { if (!is_file($modulePath . $name)) { - file_put_contents($modulePath . $name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? "has($name); } /** * 璇诲彇缂撳瓨 * @access public - * @param string $name 缂撳瓨鏍囪瘑 - * @param mixed $default 榛樿鍊 + * @param string $name 缂撳瓨鏍囪瘑 + * @param mixed $default 榛樿鍊 * @return mixed */ public static function get($name, $default = false) { self::$readTimes++; + return self::init()->get($name, $default); } /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鏍囪瘑 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param int|null $expire 鏈夋晥鏃堕棿 0涓烘案涔 + * @param string $name 缂撳瓨鏍囪瘑 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param int|null $expire 鏈夋晥鏃堕棿 0涓烘案涔 * @return boolean */ public static function set($name, $value, $expire = null) { self::$writeTimes++; + return self::init()->set($name, $value, $expire); } /** * 鑷缂撳瓨锛堥拡瀵规暟鍊肩紦瀛橈級 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param int $step 姝ラ暱 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param int $step 姝ラ暱 * @return false|int */ public static function inc($name, $step = 1) { self::$writeTimes++; + return self::init()->inc($name, $step); } /** * 鑷噺缂撳瓨锛堥拡瀵规暟鍊肩紦瀛橈級 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param int $step 姝ラ暱 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param int $step 姝ラ暱 * @return false|int */ public static function dec($name, $step = 1) { self::$writeTimes++; + return self::init()->dec($name, $step); } /** * 鍒犻櫎缂撳瓨 * @access public - * @param string $name 缂撳瓨鏍囪瘑 + * @param string $name 缂撳瓨鏍囪瘑 * @return boolean */ public static function rm($name) { self::$writeTimes++; + return self::init()->rm($name); } /** * 娓呴櫎缂撳瓨 * @access public - * @param string $tag 鏍囩鍚 + * @param string $tag 鏍囩鍚 * @return boolean */ public static function clear($tag = null) { self::$writeTimes++; + return self::init()->clear($tag); } /** * 璇诲彇缂撳瓨骞跺垹闄 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 + * @param string $name 缂撳瓨鍙橀噺鍚 * @return mixed */ public static function pull($name) { self::$readTimes++; self::$writeTimes++; + return self::init()->pull($name); } /** * 濡傛灉涓嶅瓨鍦ㄥ垯鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param int $expire 鏈夋晥鏃堕棿 0涓烘案涔 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param int $expire 鏈夋晥鏃堕棿 0涓烘案涔 * @return mixed */ public static function remember($name, $value, $expire = null) { self::$readTimes++; + return self::init()->remember($name, $value, $expire); } /** * 缂撳瓨鏍囩 * @access public - * @param string $name 鏍囩鍚 - * @param string|array $keys 缂撳瓨鏍囪瘑 - * @param bool $overlay 鏄惁瑕嗙洊 + * @param string $name 鏍囩鍚 + * @param string|array $keys 缂撳瓨鏍囪瘑 + * @param bool $overlay 鏄惁瑕嗙洊 * @return Driver */ public static function tag($name, $keys = null, $overlay = false) diff --git a/thinkphp/library/think/Collection.php b/thinkphp/library/think/Collection.php index 41b427598..f872476f9 100644 --- a/thinkphp/library/think/Collection.php +++ b/thinkphp/library/think/Collection.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -19,20 +19,35 @@ use JsonSerializable; class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSerializable { + /** + * @var array 鏁版嵁 + */ protected $items = []; + /** + * Collection constructor. + * @access public + * @param array $items 鏁版嵁 + */ public function __construct($items = []) { $this->items = $this->convertToArray($items); } + /** + * 鍒涘缓 Collection 瀹炰緥 + * @access public + * @param array $items 鏁版嵁 + * @return static + */ public static function make($items = []) { return new static($items); } /** - * 鏄惁涓虹┖ + * 鍒ゆ柇鏁版嵁鏄惁涓虹┖ + * @access public * @return bool */ public function isEmpty() @@ -40,43 +55,33 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria return empty($this->items); } + /** + * 灏嗘暟鎹浆鎴愭暟缁 + * @access public + * @return array + */ public function toArray() { return array_map(function ($value) { - return ($value instanceof Model || $value instanceof self) ? $value->toArray() : $value; + return ($value instanceof Model || $value instanceof self) ? + $value->toArray() : + $value; }, $this->items); } + /** + * 鑾峰彇鍏ㄩ儴鐨勬暟鎹 + * @access public + * @return array + */ public function all() { return $this->items; } - /** - * 鍚堝苟鏁扮粍 - * - * @param mixed $items - * @return static - */ - public function merge($items) - { - return new static(array_merge($this->items, $this->convertToArray($items))); - } - - /** - * 姣旇緝鏁扮粍锛岃繑鍥炲樊闆 - * - * @param mixed $items - * @return static - */ - public function diff($items) - { - return new static(array_diff($this->items, $this->convertToArray($items))); - } - /** * 浜ゆ崲鏁扮粍涓殑閿拰鍊 - * + * @access public * @return static */ public function flip() @@ -85,19 +90,8 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 姣旇緝鏁扮粍锛岃繑鍥炰氦闆 - * - * @param mixed $items - * @return static - */ - public function intersect($items) - { - return new static(array_intersect($this->items, $this->convertToArray($items))); - } - - /** - * 杩斿洖鏁扮粍涓墍鏈夌殑閿悕 - * + * 杩斿洖鏁扮粍涓墍鏈夌殑閿悕缁勬垚鐨勬柊 Collection 瀹炰緥 + * @access public * @return static */ public function keys() @@ -106,8 +100,51 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 鍒犻櫎鏁扮粍鐨勬渶鍚庝竴涓厓绱狅紙鍑烘爤锛 - * + * 杩斿洖鏁扮粍涓墍鏈夌殑鍊肩粍鎴愮殑鏂 Collection 瀹炰緥 + * @access public + * @return static + */ + public function values() + { + return new static(array_values($this->items)); + } + + /** + * 鍚堝苟鏁扮粍骞惰繑鍥炰竴涓柊鐨 Collection 瀹炰緥 + * @access public + * @param mixed $items 鏂扮殑鏁版嵁 + * @return static + */ + public function merge($items) + { + return new static(array_merge($this->items, $this->convertToArray($items))); + } + + /** + * 姣旇緝鏁扮粍锛岃繑鍥炲樊闆嗙敓鎴愮殑鏂 Collection 瀹炰緥 + * @access public + * @param mixed $items 鍋氭瘮杈冪殑鏁版嵁 + * @return static + */ + public function diff($items) + { + return new static(array_diff($this->items, $this->convertToArray($items))); + } + + /** + * 姣旇緝鏁扮粍锛岃繑鍥炰氦闆嗙粍鎴愮殑 Collection 鏂板疄渚 + * @access public + * @param mixed $items 姣旇緝鏁版嵁 + * @return static + */ + public function intersect($items) + { + return new static(array_intersect($this->items, $this->convertToArray($items))); + } + + /** + * 杩斿洖骞跺垹闄ゆ暟鎹腑鐨勭殑鏈鍚庝竴涓厓绱狅紙鍑烘爤锛 + * @access public * @return mixed */ public function pop() @@ -116,30 +153,8 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 閫氳繃浣跨敤鐢ㄦ埛鑷畾涔夊嚱鏁帮紝浠ュ瓧绗︿覆杩斿洖鏁扮粍 - * - * @param callable $callback - * @param mixed $initial - * @return mixed - */ - public function reduce(callable $callback, $initial = null) - { - return array_reduce($this->items, $callback, $initial); - } - - /** - * 浠ョ浉鍙嶇殑椤哄簭杩斿洖鏁扮粍銆 - * - * @return static - */ - public function reverse() - { - return new static(array_reverse($this->items)); - } - - /** - * 鍒犻櫎鏁扮粍涓涓厓绱狅紝骞惰繑鍥炶鍒犻櫎鍏冪礌鐨勫 - * + * 杩斿洖骞跺垹闄ゆ暟鎹腑棣栦釜鍏冪礌 + * @access public * @return mixed */ public function shift() @@ -148,10 +163,64 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 鎶婁竴涓暟缁勫垎鍓蹭负鏂扮殑鏁扮粍鍧. - * - * @param int $size - * @param bool $preserveKeys + * 鍦ㄦ暟缁勫紑澶存彃鍏ヤ竴涓厓绱 + * @access public + * @param mixed $value 鍊 + * @param mixed $key 閿悕 + * @return void + */ + public function unshift($value, $key = null) + { + if (is_null($key)) { + array_unshift($this->items, $value); + } else { + $this->items = [$key => $value] + $this->items; + } + } + + /** + * 鍦ㄦ暟缁勭粨灏炬彃鍏ヤ竴涓厓绱 + * @access public + * @param mixed $value 鍊 + * @param mixed $key 閿悕 + * @return void + */ + public function push($value, $key = null) + { + if (is_null($key)) { + $this->items[] = $value; + } else { + $this->items[$key] = $value; + } + } + + /** + * 閫氳繃浣跨敤鐢ㄦ埛鑷畾涔夊嚱鏁帮紝浠ュ瓧绗︿覆杩斿洖鏁扮粍 + * @access public + * @param callable $callback 鍥炶皟鍑芥暟 + * @param mixed $initial 鍒濆鍊 + * @return mixed + */ + public function reduce(callable $callback, $initial = null) + { + return array_reduce($this->items, $callback, $initial); + } + + /** + * 浠ョ浉鍙嶇殑椤哄簭鍒涘缓涓涓柊鐨 Collection 瀹炰緥 + * @access public + * @return static + */ + public function reverse() + { + return new static(array_reverse($this->items)); + } + + /** + * 鎶婃暟鎹垎鍓蹭负鏂扮殑鏁扮粍鍧 + * @access public + * @param int $size 鍒嗛殧闀垮害 + * @param bool $preserveKeys 鏄惁淇濇寔鍘熸暟鎹储寮 * @return static */ public function chunk($size, $preserveKeys = false) @@ -166,78 +235,70 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 鍦ㄦ暟缁勫紑澶存彃鍏ヤ竴涓厓绱 - * @param mixed $value - * @param null $key - * @return int - */ - public function unshift($value, $key = null) - { - if (is_null($key)) { - array_unshift($this->items, $value); - } else { - $this->items = [$key => $value] + $this->items; - } - } - - /** - * 缁欐瘡涓厓绱犳墽琛屼釜鍥炶皟 - * - * @param callable $callback + * 缁欐暟鎹腑鐨勬瘡涓厓绱犳墽琛屽洖璋 + * @access public + * @param callable $callback 鍥炶皟鍑芥暟 * @return $this */ public function each(callable $callback) { foreach ($this->items as $key => $item) { - if ($callback($item, $key) === false) { + $result = $callback($item, $key); + + if (false === $result) { break; } + + if (!is_object($item)) { + $this->items[$key] = $result; + } } return $this; } /** - * 鐢ㄥ洖璋冨嚱鏁拌繃婊ゆ暟缁勪腑鐨勫厓绱 - * @param callable|null $callback + * 鐢ㄥ洖璋冨嚱鏁拌繃婊ゆ暟鎹腑鐨勫厓绱 + * @access public + * @param callable|null $callback 鍥炶皟鍑芥暟 * @return static */ public function filter(callable $callback = null) { - if ($callback) { - return new static(array_filter($this->items, $callback)); - } - - return new static(array_filter($this->items)); + return new static(array_filter($this->items, $callback ?: null)); } /** - * 杩斿洖鏁扮粍涓寚瀹氱殑涓鍒 - * @param $column_key - * @param null $index_key + * 杩斿洖鏁版嵁涓寚瀹氱殑涓鍒 + * @access public + * @param mixed $columnKey 閿悕 + * @param null $indexKey 浣滀负绱㈠紩鍊肩殑鍒 * @return array */ - public function column($column_key, $index_key = null) + public function column($columnKey, $indexKey = null) { if (function_exists('array_column')) { - return array_column($this->items, $column_key, $index_key); + return array_column($this->items, $columnKey, $indexKey); } $result = []; foreach ($this->items as $row) { - $key = $value = null; + $key = $value = null; $keySet = $valueSet = false; - if (null !== $index_key && array_key_exists($index_key, $row)) { + + if (null !== $indexKey && array_key_exists($indexKey, $row)) { + $key = (string) $row[$indexKey]; $keySet = true; - $key = (string) $row[$index_key]; } - if (null === $column_key) { + + if (null === $columnKey) { $valueSet = true; $value = $row; - } elseif (is_array($row) && array_key_exists($column_key, $row)) { + } elseif (is_array($row) && array_key_exists($columnKey, $row)) { $valueSet = true; - $value = $row[$column_key]; + $value = $row[$columnKey]; } + if ($valueSet) { if ($keySet) { $result[$key] = $value; @@ -246,34 +307,30 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } } } + return $result; } /** - * 瀵规暟缁勬帓搴 - * - * @param callable|null $callback + * 瀵规暟鎹帓搴忥紝骞惰繑鍥炴帓搴忓悗鐨勬暟鎹粍鎴愮殑鏂 Collection 瀹炰緥 + * @access public + * @param callable|null $callback 鍥炶皟鍑芥暟 * @return static */ public function sort(callable $callback = null) { - $items = $this->items; - - $callback ? uasort($items, $callback) : uasort($items, function ($a, $b) { - - if ($a == $b) { - return 0; - } - - return ($a < $b) ? -1 : 1; - }); + $items = $this->items; + $callback = $callback ?: function ($a, $b) { + return $a == $b ? 0 : (($a < $b) ? -1 : 1); + }; + uasort($items, $callback); return new static($items); } /** - * 灏嗘暟缁勬墦涔 - * + * 灏嗘暟鎹墦涔卞悗缁勬垚鏂扮殑 Collection 瀹炰緥 + * @access public * @return static */ public function shuffle() @@ -281,16 +338,15 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria $items = $this->items; shuffle($items); - return new static($items); } /** - * 鎴彇鏁扮粍 - * - * @param int $offset - * @param int $length - * @param bool $preserveKeys + * 鎴彇鏁版嵁骞惰繑鍥炴柊鐨 Collection 瀹炰緥 + * @access public + * @param int $offset 璧峰浣嶇疆 + * @param int $length 鎴彇闀垮害 + * @param bool $preserveKeys 鏄惁淇濇寔鍘熷厛鐨勯敭鍚 * @return static */ public function slice($offset, $length = null, $preserveKeys = false) @@ -298,17 +354,35 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria return new static(array_slice($this->items, $offset, $length, $preserveKeys)); } - // ArrayAccess + /** + * 鎸囧畾鐨勯敭鏄惁瀛樺湪 + * @access public + * @param mixed $offset 閿悕 + * @return bool + */ public function offsetExists($offset) { return array_key_exists($offset, $this->items); } + /** + * 鑾峰彇鎸囧畾閿搴旂殑鍊 + * @access public + * @param mixed $offset 閿悕 + * @return mixed + */ public function offsetGet($offset) { return $this->items[$offset]; } + /** + * 璁剧疆閿 + * @access public + * @param mixed $offset 閿悕 + * @param mixed $value 鍊 + * @return void + */ public function offsetSet($offset, $value) { if (is_null($offset)) { @@ -318,33 +392,51 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } } + /** + * 鍒犻櫎鎸囧畾閿 + * @access public + * @param mixed $offset 閿悕 + * @return void + */ public function offsetUnset($offset) { unset($this->items[$offset]); } - //Countable + /** + * 缁熻鏁版嵁鐨勪釜鏁 + * @access public + * @return int + */ public function count() { return count($this->items); } - //IteratorAggregate + /** + * 鑾峰彇鏁版嵁鐨勮凯浠ｅ櫒 + * @access public + * @return ArrayIterator + */ public function getIterator() { return new ArrayIterator($this->items); } - //JsonSerializable + /** + * 灏嗘暟鎹弽搴忓垪鍖栨垚鏁扮粍 + * @access public + * @return array + */ public function jsonSerialize() { return $this->toArray(); } /** - * 杞崲褰撳墠鏁版嵁闆嗕负JSON瀛楃涓 + * 杞崲褰撳墠鏁版嵁闆嗕负 JSON 瀛楃涓 * @access public - * @param integer $options json鍙傛暟 + * @param integer $options json 鍙傛暟 * @return string */ public function toJson($options = JSON_UNESCAPED_UNICODE) @@ -352,22 +444,24 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria return json_encode($this->toArray(), $options); } + /** + * 灏嗘暟鎹浆鎹㈡垚瀛楃涓 + * @access public + * @return string + */ public function __toString() { return $this->toJson(); } /** - * 杞崲鎴愭暟缁 - * - * @param mixed $items + * 灏嗘暟鎹浆鎹㈡垚鏁扮粍 + * @access protected + * @param mixed $items 鏁版嵁 * @return array */ protected function convertToArray($items) { - if ($items instanceof self) { - return $items->all(); - } - return (array) $items; + return $items instanceof self ? $items->all() : (array) $items; } } diff --git a/thinkphp/library/think/Config.php b/thinkphp/library/think/Config.php index 2b8084349..8fa668d14 100644 --- a/thinkphp/library/think/Config.php +++ b/thinkphp/library/think/Config.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -13,70 +13,88 @@ namespace think; class Config { - // 閰嶇疆鍙傛暟 + /** + * @var array 閰嶇疆鍙傛暟 + */ private static $config = []; - // 鍙傛暟浣滅敤鍩 + + /** + * @var string 鍙傛暟浣滅敤鍩 + */ private static $range = '_sys_'; - // 璁惧畾閰嶇疆鍙傛暟鐨勪綔鐢ㄥ煙 + /** + * 璁惧畾閰嶇疆鍙傛暟鐨勪綔鐢ㄥ煙 + * @access public + * @param string $range 浣滅敤鍩 + * @return void + */ public static function range($range) { self::$range = $range; - if (!isset(self::$config[$range])) { - self::$config[$range] = []; - } + + if (!isset(self::$config[$range])) self::$config[$range] = []; } /** * 瑙ｆ瀽閰嶇疆鏂囦欢鎴栧唴瀹 - * @param string $config 閰嶇疆鏂囦欢璺緞鎴栧唴瀹 - * @param string $type 閰嶇疆瑙ｆ瀽绫诲瀷 - * @param string $name 閰嶇疆鍚嶏紙濡傝缃嵆琛ㄧず浜岀骇閰嶇疆锛 - * @param string $range 浣滅敤鍩 + * @access public + * @param string $config 閰嶇疆鏂囦欢璺緞鎴栧唴瀹 + * @param string $type 閰嶇疆瑙ｆ瀽绫诲瀷 + * @param string $name 閰嶇疆鍚嶏紙濡傝缃嵆琛ㄧず浜岀骇閰嶇疆锛 + * @param string $range 浣滅敤鍩 * @return mixed */ public static function parse($config, $type = '', $name = '', $range = '') { $range = $range ?: self::$range; - if (empty($type)) { - $type = pathinfo($config, PATHINFO_EXTENSION); - } - $class = false !== strpos($type, '\\') ? $type : '\\think\\config\\driver\\' . ucwords($type); + + if (empty($type)) $type = pathinfo($config, PATHINFO_EXTENSION); + + $class = false !== strpos($type, '\\') ? + $type : + '\\think\\config\\driver\\' . ucwords($type); + return self::set((new $class())->parse($config), $name, $range); } /** * 鍔犺浇閰嶇疆鏂囦欢锛圥HP鏍煎紡锛 - * @param string $file 閰嶇疆鏂囦欢鍚 - * @param string $name 閰嶇疆鍚嶏紙濡傝缃嵆琛ㄧず浜岀骇閰嶇疆锛 - * @param string $range 浣滅敤鍩 + * @access public + * @param string $file 閰嶇疆鏂囦欢鍚 + * @param string $name 閰嶇疆鍚嶏紙濡傝缃嵆琛ㄧず浜岀骇閰嶇疆锛 + * @param string $range 浣滅敤鍩 * @return mixed */ public static function load($file, $name = '', $range = '') { $range = $range ?: self::$range; - if (!isset(self::$config[$range])) { - self::$config[$range] = []; - } + + if (!isset(self::$config[$range])) self::$config[$range] = []; + if (is_file($file)) { $name = strtolower($name); $type = pathinfo($file, PATHINFO_EXTENSION); + if ('php' == $type) { return self::set(include $file, $name, $range); - } elseif ('yaml' == $type && function_exists('yaml_parse_file')) { - return self::set(yaml_parse_file($file), $name, $range); - } else { - return self::parse($file, $type, $name, $range); } - } else { - return self::$config[$range]; + + if ('yaml' == $type && function_exists('yaml_parse_file')) { + return self::set(yaml_parse_file($file), $name, $range); + } + + return self::parse($file, $type, $name, $range); } + + return self::$config[$range]; } /** * 妫娴嬮厤缃槸鍚﹀瓨鍦 - * @param string $name 閰嶇疆鍙傛暟鍚嶏紙鏀寔浜岀骇閰嶇疆 .鍙峰垎鍓诧級 - * @param string $range 浣滅敤鍩 + * @access public + * @param string $name 閰嶇疆鍙傛暟鍚嶏紙鏀寔浜岀骇閰嶇疆 . 鍙峰垎鍓诧級 + * @param string $range 浣滅敤鍩 * @return bool */ public static function has($name, $range = '') @@ -85,82 +103,108 @@ class Config if (!strpos($name, '.')) { return isset(self::$config[$range][strtolower($name)]); - } else { - // 浜岀淮鏁扮粍璁剧疆鍜岃幏鍙栨敮鎸 - $name = explode('.', $name, 2); - return isset(self::$config[$range][strtolower($name[0])][$name[1]]); } + + // 浜岀淮鏁扮粍璁剧疆鍜岃幏鍙栨敮鎸 + $name = explode('.', $name, 2); + return isset(self::$config[$range][strtolower($name[0])][$name[1]]); } /** * 鑾峰彇閰嶇疆鍙傛暟 涓虹┖鍒欒幏鍙栨墍鏈夐厤缃 - * @param string $name 閰嶇疆鍙傛暟鍚嶏紙鏀寔浜岀骇閰嶇疆 .鍙峰垎鍓诧級 - * @param string $range 浣滅敤鍩 + * @access public + * @param string $name 閰嶇疆鍙傛暟鍚嶏紙鏀寔浜岀骇閰嶇疆 . 鍙峰垎鍓诧級 + * @param string $range 浣滅敤鍩 * @return mixed */ public static function get($name = null, $range = '') { $range = $range ?: self::$range; + // 鏃犲弬鏁版椂鑾峰彇鎵鏈 if (empty($name) && isset(self::$config[$range])) { return self::$config[$range]; } + // 闈炰簩绾ч厤缃椂鐩存帴杩斿洖 if (!strpos($name, '.')) { $name = strtolower($name); return isset(self::$config[$range][$name]) ? self::$config[$range][$name] : null; - } else { - // 浜岀淮鏁扮粍璁剧疆鍜岃幏鍙栨敮鎸 - $name = explode('.', $name, 2); - $name[0] = strtolower($name[0]); - return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null; } + + // 浜岀淮鏁扮粍璁剧疆鍜岃幏鍙栨敮鎸 + $name = explode('.', $name, 2); + $name[0] = strtolower($name[0]); + + if (!isset(self::$config[$range][$name[0]])) { + // 鍔ㄦ佽浇鍏ラ澶栭厤缃 + $module = Request::instance()->module(); + $file = CONF_PATH . ($module ? $module . DS : '') . 'extra' . DS . $name[0] . CONF_EXT; + + is_file($file) && self::load($file, $name[0]); + } + + return isset(self::$config[$range][$name[0]][$name[1]]) ? + self::$config[$range][$name[0]][$name[1]] : + null; } /** - * 璁剧疆閰嶇疆鍙傛暟 name涓烘暟缁勫垯涓烘壒閲忚缃 - * @param string|array $name 閰嶇疆鍙傛暟鍚嶏紙鏀寔浜岀骇閰嶇疆 .鍙峰垎鍓诧級 - * @param mixed $value 閰嶇疆鍊 - * @param string $range 浣滅敤鍩 + * 璁剧疆閰嶇疆鍙傛暟 name 涓烘暟缁勫垯涓烘壒閲忚缃 + * @access public + * @param string|array $name 閰嶇疆鍙傛暟鍚嶏紙鏀寔浜岀骇閰嶇疆 . 鍙峰垎鍓诧級 + * @param mixed $value 閰嶇疆鍊 + * @param string $range 浣滅敤鍩 * @return mixed */ public static function set($name, $value = null, $range = '') { $range = $range ?: self::$range; - if (!isset(self::$config[$range])) { - self::$config[$range] = []; - } + + if (!isset(self::$config[$range])) self::$config[$range] = []; + + // 瀛楃涓插垯琛ㄧず鍗曚釜閰嶇疆璁剧疆 if (is_string($name)) { if (!strpos($name, '.')) { self::$config[$range][strtolower($name)] = $value; } else { - // 浜岀淮鏁扮粍璁剧疆鍜岃幏鍙栨敮鎸 - $name = explode('.', $name, 2); + // 浜岀淮鏁扮粍 + $name = explode('.', $name, 2); self::$config[$range][strtolower($name[0])][$name[1]] = $value; } - return; - } elseif (is_array($name)) { - // 鎵归噺璁剧疆 + + return $value; + } + + // 鏁扮粍鍒欒〃绀烘壒閲忚缃 + if (is_array($name)) { if (!empty($value)) { self::$config[$range][$value] = isset(self::$config[$range][$value]) ? - array_merge(self::$config[$range][$value], $name) : - self::$config[$range][$value] = $name; + array_merge(self::$config[$range][$value], $name) : + $name; + return self::$config[$range][$value]; - } else { - return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name)); } - } else { - // 涓虹┖鐩存帴杩斿洖 宸叉湁閰嶇疆 - return self::$config[$range]; + + return self::$config[$range] = array_merge( + self::$config[$range], array_change_key_case($name) + ); } + + // 涓虹┖鐩存帴杩斿洖宸叉湁閰嶇疆 + return self::$config[$range]; } /** * 閲嶇疆閰嶇疆鍙傛暟 + * @access public + * @param string $range 浣滅敤鍩 + * @return void */ public static function reset($range = '') { $range = $range ?: self::$range; + if (true === $range) { self::$config = []; } else { diff --git a/thinkphp/library/think/Console.php b/thinkphp/library/think/Console.php index 1d97ab2b7..32b257259 100644 --- a/thinkphp/library/think/Console.php +++ b/thinkphp/library/think/Console.php @@ -20,20 +20,49 @@ use think\console\output\driver\Buffer; class Console { - + /** + * @var string 鍛戒护鍚嶇О + */ private $name; + + /** + * @var string 鍛戒护鐗堟湰 + */ private $version; - /** @var Command[] */ + /** + * @var Command[] 鍛戒护 + */ private $commands = []; + /** + * @var bool 鏄惁闇瑕佸府鍔╀俊鎭 + */ private $wantHelps = false; + /** + * @var bool 鏄惁鎹曡幏寮傚父 + */ private $catchExceptions = true; - private $autoExit = true; + + /** + * @var bool 鏄惁鑷姩閫鍑烘墽琛 + */ + private $autoExit = true; + + /** + * @var InputDefinition 杈撳叆瀹氫箟 + */ private $definition; + + /** + * @var string 榛樿鎵ц鐨勫懡浠 + */ private $defaultCommand; + /** + * @var array 榛樿鎻愪緵鐨勫懡浠 + */ private static $defaultCommands = [ "think\\console\\command\\Help", "think\\console\\command\\Lists", @@ -47,11 +76,22 @@ class Console "think\\console\\command\\optimize\\Schema", ]; - public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN') + /** + * Console constructor. + * @access public + * @param string $name 鍚嶇О + * @param string $version 鐗堟湰 + * @param null|string $user 鎵ц鐢ㄦ埛 + */ + public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN', $user = null) { $this->name = $name; $this->version = $version; + if ($user) { + $this->setUser($user); + } + $this->defaultCommand = 'list'; $this->definition = $this->getDefaultInputDefinition(); @@ -60,38 +100,58 @@ class Console } } - public static function init($run = true) + /** + * 璁剧疆鎵ц鐢ㄦ埛 + * @param $user + */ + public function setUser($user) { - static $console; - if (!$console) { - // 瀹炰緥鍖朿onsole - $console = new self('Think Console', '0.1'); - // 璇诲彇鎸囦护闆 - if (is_file(CONF_PATH . 'command' . EXT)) { - $commands = include CONF_PATH . 'command' . EXT; - if (is_array($commands)) { - foreach ($commands as $command) { - if (class_exists($command) && is_subclass_of($command, "\\think\\console\\Command")) { - // 娉ㄥ唽鎸囦护 - $console->add(new $command()); - } - } - } - } - } - if ($run) { - // 杩愯 - return $console->run(); - } else { - return $console; + $user = posix_getpwnam($user); + if ($user) { + posix_setuid($user['uid']); + posix_setgid($user['gid']); } } /** - * @param $command - * @param array $parameters - * @param string $driver - * @return Output|Buffer + * 鍒濆鍖 Console + * @access public + * @param bool $run 鏄惁杩愯 Console + * @return int|Console + */ + public static function init($run = true) + { + static $console; + + if (!$console) { + $config = Config::get('console'); + // 瀹炰緥鍖 console + $console = new self($config['name'], $config['version'], $config['user']); + + // 璇诲彇鎸囦护闆 + if (is_file(CONF_PATH . 'command' . EXT)) { + $commands = include CONF_PATH . 'command' . EXT; + + if (is_array($commands)) { + foreach ($commands as $command) { + class_exists($command) && + is_subclass_of($command, "\\think\\console\\Command") && + $console->add(new $command()); // 娉ㄥ唽鎸囦护 + } + } + } + } + + return $run ? $console->run() : $console; + } + + /** + * 璋冪敤鍛戒护 + * @access public + * @param string $command + * @param array $parameters + * @param string $driver + * @return Output */ public static function call($command, array $parameters = [], $driver = 'buffer') { @@ -110,9 +170,9 @@ class Console /** * 鎵ц褰撳墠鐨勬寚浠 + * @access public * @return int * @throws \Exception - * @api */ public function run() { @@ -124,27 +184,21 @@ class Console try { $exitCode = $this->doRun($input, $output); } catch (\Exception $e) { - if (!$this->catchExceptions) { - throw $e; - } + if (!$this->catchExceptions) throw $e; $output->renderException($e); $exitCode = $e->getCode(); + if (is_numeric($exitCode)) { - $exitCode = (int) $exitCode; - if (0 === $exitCode) { - $exitCode = 1; - } + $exitCode = ((int) $exitCode) ?: 1; } else { $exitCode = 1; } } if ($this->autoExit) { - if ($exitCode > 255) { - $exitCode = 255; - } + if ($exitCode > 255) $exitCode = 255; exit($exitCode); } @@ -154,12 +208,14 @@ class Console /** * 鎵ц鎸囦护 - * @param Input $input - * @param Output $output + * @access public + * @param Input $input 杈撳叆 + * @param Output $output 杈撳嚭 * @return int */ public function doRun(Input $input, Output $output) { + // 鑾峰彇鐗堟湰淇℃伅 if (true === $input->hasParameterOption(['--version', '-V'])) { $output->writeln($this->getLongVersion()); @@ -168,6 +224,7 @@ class Console $name = $this->getCommandName($input); + // 鑾峰彇甯姪淇℃伅 if (true === $input->hasParameterOption(['--help', '-h'])) { if (!$name) { $name = 'help'; @@ -182,25 +239,26 @@ class Console $input = new Input([$this->defaultCommand]); } - $command = $this->find($name); - - $exitCode = $this->doRunCommand($command, $input, $output); - - return $exitCode; + return $this->doRunCommand($this->find($name), $input, $output); } /** * 璁剧疆杈撳叆鍙傛暟瀹氫箟 - * @param InputDefinition $definition + * @access public + * @param InputDefinition $definition 杈撳叆瀹氫箟 + * @return $this; */ public function setDefinition(InputDefinition $definition) { $this->definition = $definition; + + return $this; } /** * 鑾峰彇杈撳叆鍙傛暟瀹氫箟 - * @return InputDefinition The InputDefinition instance + * @access public + * @return InputDefinition */ public function getDefinition() { @@ -208,8 +266,9 @@ class Console } /** - * Gets the help message. - * @return string A help message. + * 鑾峰彇甯姪淇℃伅 + * @access public + * @return string */ public function getHelp() { @@ -217,27 +276,34 @@ class Console } /** - * 鏄惁鎹曡幏寮傚父 - * @param bool $boolean - * @api + * 璁剧疆鏄惁鎹曡幏寮傚父 + * @access public + * @param bool $boolean 鏄惁鎹曡幏 + * @return $this */ public function setCatchExceptions($boolean) { $this->catchExceptions = (bool) $boolean; + + return $this; } /** - * 鏄惁鑷姩閫鍑 - * @param bool $boolean - * @api + * 璁剧疆鏄惁鑷姩閫鍑 + * @access public + * @param bool $boolean 鏄惁鑷姩閫鍑 + * @return $this */ public function setAutoExit($boolean) { $this->autoExit = (bool) $boolean; + + return $this; } /** * 鑾峰彇鍚嶇О + * @access public * @return string */ public function getName() @@ -247,17 +313,21 @@ class Console /** * 璁剧疆鍚嶇О - * @param string $name + * @access public + * @param string $name 鍚嶇О + * @return $this */ public function setName($name) { $this->name = $name; + + return $this; } /** * 鑾峰彇鐗堟湰 + * @access public * @return string - * @api */ public function getVersion() { @@ -266,21 +336,30 @@ class Console /** * 璁剧疆鐗堟湰 - * @param string $version + * @access public + * @param string $version 鐗堟湰淇℃伅 + * @return $this */ public function setVersion($version) { $this->version = $version; + + return $this; } /** * 鑾峰彇瀹屾暣鐨勭増鏈彿 + * @access public * @return string */ public function getLongVersion() { if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) { - return sprintf('%s version %s', $this->getName(), $this->getVersion()); + return sprintf( + '%s version %s', + $this->getName(), + $this->getVersion() + ); } return 'Console Tool'; @@ -288,7 +367,8 @@ class Console /** * 娉ㄥ唽涓涓寚浠 - * @param string $name + * @access public + * @param string $name 鎸囦护鍚嶇О * @return Command */ public function register($name) @@ -297,32 +377,37 @@ class Console } /** - * 娣诲姞鎸囦护 - * @param Command[] $commands + * 鎵归噺娣诲姞鎸囦护 + * @access public + * @param Command[] $commands 鎸囦护瀹炰緥 + * @return $this */ public function addCommands(array $commands) { - foreach ($commands as $command) { - $this->add($command); - } + foreach ($commands as $command) $this->add($command); + + return $this; } /** * 娣诲姞涓涓寚浠 - * @param Command $command - * @return Command + * @access public + * @param Command $command 鍛戒护瀹炰緥 + * @return Command|bool */ public function add(Command $command) { - $command->setConsole($this); - if (!$command->isEnabled()) { $command->setConsole(null); - return; + return false; } + $command->setConsole($this); + if (null === $command->getDefinition()) { - throw new \LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command))); + throw new \LogicException( + sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command)) + ); } $this->commands[$command->getName()] = $command; @@ -336,14 +421,17 @@ class Console /** * 鑾峰彇鎸囦护 - * @param string $name 鎸囦护鍚嶇О + * @access public + * @param string $name 鎸囦护鍚嶇О * @return Command * @throws \InvalidArgumentException */ public function get($name) { if (!isset($this->commands[$name])) { - throw new \InvalidArgumentException(sprintf('The command "%s" does not exist.', $name)); + throw new \InvalidArgumentException( + sprintf('The command "%s" does not exist.', $name) + ); } $command = $this->commands[$name]; @@ -363,7 +451,8 @@ class Console /** * 鏌愪釜鎸囦护鏄惁瀛樺湪 - * @param string $name 鎸囦护鍚嶇О + * @access public + * @param string $name 鎸囦护鍚嶇О * @return bool */ public function has($name) @@ -373,16 +462,22 @@ class Console /** * 鑾峰彇鎵鏈夌殑鍛藉悕绌洪棿 + * @access public * @return array */ public function getNamespaces() { $namespaces = []; + foreach ($this->commands as $command) { - $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName())); + $namespaces = array_merge( + $namespaces, $this->extractAllNamespaces($command->getName()) + ); foreach ($command->getAliases() as $alias) { - $namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias)); + $namespaces = array_merge( + $namespaces, $this->extractAllNamespaces($alias) + ); } } @@ -390,21 +485,25 @@ class Console } /** - * 鏌ユ壘娉ㄥ唽鍛藉悕绌洪棿涓殑鍚嶇О鎴栫缉鍐欍 + * 鏌ユ壘娉ㄥ唽鍛藉悕绌洪棿涓殑鍚嶇О鎴栫缉鍐 + * @access public * @param string $namespace * @return string * @throws \InvalidArgumentException */ public function findNamespace($namespace) { - $allNamespaces = $this->getNamespaces(); - $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { + $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]) . '[^:]*'; }, $namespace); - $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces); + + $allNamespaces = $this->getNamespaces(); + $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces); if (empty($namespaces)) { - $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace); + $message = sprintf( + 'There are no commands defined in the "%s" namespace.', $namespace + ); if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) { if (1 == count($alternatives)) { @@ -420,8 +519,14 @@ class Console } $exact = in_array($namespace, $namespaces, true); + if (count($namespaces) > 1 && !$exact) { - throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces)))); + throw new \InvalidArgumentException( + sprintf( + 'The namespace "%s" is ambiguous (%s).', + $namespace, + $this->getAbbreviationSuggestions(array_values($namespaces))) + ); } return $exact ? $namespace : reset($namespaces); @@ -429,20 +534,22 @@ class Console /** * 鏌ユ壘鎸囦护 - * @param string $name 鍚嶇О鎴栬呭埆鍚 + * @access public + * @param string $name 鍚嶇О鎴栬呭埆鍚 * @return Command * @throws \InvalidArgumentException */ public function find($name) { - $allCommands = array_keys($this->commands); - $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { + $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]) . '[^:]*'; }, $name); - $commands = preg_grep('{^' . $expr . '}', $allCommands); + + $allCommands = array_keys($this->commands); + $commands = preg_grep('{^' . $expr . '}', $allCommands); if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) { - if (false !== $pos = strrpos($name, ':')) { + if (false !== ($pos = strrpos($name, ':'))) { $this->findNamespace(substr($name, 0, $pos)); } @@ -473,7 +580,9 @@ class Console if (count($commands) > 1 && !$exact) { $suggestions = $this->getAbbreviationSuggestions(array_values($commands)); - throw new \InvalidArgumentException(sprintf('Command "%s" is ambiguous (%s).', $name, $suggestions)); + throw new \InvalidArgumentException( + sprintf('Command "%s" is ambiguous (%s).', $name, $suggestions) + ); } return $this->get($exact ? $name : reset($commands)); @@ -481,21 +590,20 @@ class Console /** * 鑾峰彇鎵鏈夌殑鎸囦护 - * @param string $namespace 鍛藉悕绌洪棿 + * @access public + * @param string $namespace 鍛藉悕绌洪棿 * @return Command[] - * @api */ public function all($namespace = null) { - if (null === $namespace) { - return $this->commands; - } + if (null === $namespace) return $this->commands; $commands = []; + foreach ($this->commands as $name => $command) { - if ($this->extractNamespace($name, substr_count($namespace, ':') + 1) === $namespace) { - $commands[$name] = $command; - } + $ext = $this->extractNamespace($name, substr_count($namespace, ':') + 1); + + if ($ext === $namespace) $commands[$name] = $command; } return $commands; @@ -503,7 +611,8 @@ class Console /** * 鑾峰彇鍙兘鐨勬寚浠ゅ悕 - * @param array $names + * @access public + * @param array $names 鎸囦护鍚 * @return array */ public static function getAbbreviations($names) @@ -520,9 +629,11 @@ class Console } /** - * 閰嶇疆鍩轰簬鐢ㄦ埛鐨勫弬鏁板拰閫夐」鐨勮緭鍏ュ拰杈撳嚭瀹炰緥銆 - * @param Input $input 杈撳叆瀹炰緥 - * @param Output $output 杈撳嚭瀹炰緥 + * 閰嶇疆鍩轰簬鐢ㄦ埛鐨勫弬鏁板拰閫夐」鐨勮緭鍏ュ拰杈撳嚭瀹炰緥 + * @access protected + * @param Input $input 杈撳叆瀹炰緥 + * @param Output $output 杈撳嚭瀹炰緥 + * @return void */ protected function configureIO(Input $input, Output $output) { @@ -551,9 +662,10 @@ class Console /** * 鎵ц鎸囦护 - * @param Command $command 鎸囦护瀹炰緥 - * @param Input $input 杈撳叆瀹炰緥 - * @param Output $output 杈撳嚭瀹炰緥 + * @access protected + * @param Command $command 鎸囦护瀹炰緥 + * @param Input $input 杈撳叆瀹炰緥 + * @param Output $output 杈撳嚭瀹炰緥 * @return int * @throws \Exception */ @@ -563,8 +675,9 @@ class Console } /** - * 鑾峰彇鎸囦护鐨勫熀纭鍚嶇О - * @param Input $input + * 鑾峰彇鎸囦护鐨勫悕绉 + * @access protected + * @param Input $input 杈撳叆瀹炰緥 * @return string */ protected function getCommandName(Input $input) @@ -574,6 +687,7 @@ class Console /** * 鑾峰彇榛樿杈撳叆瀹氫箟 + * @access protected * @return InputDefinition */ protected function getDefaultInputDefinition() @@ -591,41 +705,55 @@ class Console } /** - * 璁剧疆榛樿鍛戒护 - * @return Command[] An array of default Command instances + * 鑾峰彇榛樿鍛戒护 + * @access protected + * @return Command[] */ protected function getDefaultCommands() { $defaultCommands = []; - foreach (self::$defaultCommands as $classname) { - if (class_exists($classname) && is_subclass_of($classname, "think\\console\\Command")) { - $defaultCommands[] = new $classname(); + foreach (self::$defaultCommands as $class) { + if (class_exists($class) && is_subclass_of($class, "think\\console\\Command")) { + $defaultCommands[] = new $class(); } } return $defaultCommands; } - public static function addDefaultCommands(array $classnames) + /** + * 娣诲姞榛樿鎸囦护 + * @access public + * @param array $classes 鎸囦护 + * @return void + */ + public static function addDefaultCommands(array $classes) { - self::$defaultCommands = array_merge(self::$defaultCommands, $classnames); + self::$defaultCommands = array_merge(self::$defaultCommands, $classes); } /** * 鑾峰彇鍙兘鐨勫缓璁 - * @param array $abbrevs + * @access private + * @param array $abbrevs * @return string */ private function getAbbreviationSuggestions($abbrevs) { - return sprintf('%s, %s%s', $abbrevs[0], $abbrevs[1], count($abbrevs) > 2 ? sprintf(' and %d more', count($abbrevs) - 2) : ''); + return sprintf( + '%s, %s%s', + $abbrevs[0], + $abbrevs[1], + count($abbrevs) > 2 ? sprintf(' and %d more', count($abbrevs) - 2) : '' + ); } /** - * 杩斿洖鍛藉悕绌洪棿閮ㄥ垎 - * @param string $name 鎸囦护 - * @param string $limit 閮ㄥ垎鐨勫懡鍚嶇┖闂寸殑鏈澶ф暟閲 + * 杩斿洖鎸囦护鐨勫懡鍚嶇┖闂撮儴鍒 + * @access public + * @param string $name 鎸囦护鍚嶇О + * @param string $limit 閮ㄥ垎鐨勫懡鍚嶇┖闂寸殑鏈澶ф暟閲 * @return string */ public function extractNamespace($name, $limit = null) @@ -638,16 +766,17 @@ class Console /** * 鏌ユ壘鍙浛浠ｇ殑寤鸿 - * @param string $name - * @param array|\Traversable $collection + * @access private + * @param string $name 鎸囦护鍚嶇О + * @param array|\Traversable $collection 寤鸿闆嗗悎 * @return array */ private function findAlternatives($name, $collection) { - $threshold = 1e3; - $alternatives = []; - + $threshold = 1e3; + $alternatives = []; $collectionParts = []; + foreach ($collection as $item) { $collectionParts[$item] = explode(':', $item); } @@ -655,6 +784,7 @@ class Console foreach (explode(':', $name) as $i => $subname) { foreach ($collectionParts as $collectionName => $parts) { $exists = isset($alternatives[$collectionName]); + if (!isset($parts[$i]) && $exists) { $alternatives[$collectionName] += $threshold; continue; @@ -663,8 +793,14 @@ class Console } $lev = levenshtein($subname, $parts[$i]); - if ($lev <= strlen($subname) / 3 || '' !== $subname && false !== strpos($parts[$i], $subname)) { - $alternatives[$collectionName] = $exists ? $alternatives[$collectionName] + $lev : $lev; + + if ($lev <= strlen($subname) / 3 || + '' !== $subname && + false !== strpos($parts[$i], $subname) + ) { + $alternatives[$collectionName] = $exists ? + $alternatives[$collectionName] + $lev : + $lev; } elseif ($exists) { $alternatives[$collectionName] += $threshold; } @@ -673,14 +809,18 @@ class Console foreach ($collection as $item) { $lev = levenshtein($name, $item); + if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) { - $alternatives[$item] = isset($alternatives[$item]) ? $alternatives[$item] - $lev : $lev; + $alternatives[$item] = isset($alternatives[$item]) ? + $alternatives[$item] - $lev : + $lev; } } $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; }); + asort($alternatives); return array_keys($alternatives); @@ -688,24 +828,28 @@ class Console /** * 璁剧疆榛樿鐨勬寚浠 - * @param string $commandName The Command name + * @access public + * @param string $commandName 鎸囦护鍚嶇О + * @return $this */ public function setDefaultCommand($commandName) { $this->defaultCommand = $commandName; + + return $this; } /** * 杩斿洖鎵鏈夌殑鍛藉悕绌洪棿 - * @param string $name + * @access private + * @param string $name 鎸囦护鍚嶇О * @return array */ private function extractAllNamespaces($name) { - $parts = explode(':', $name, -1); $namespaces = []; - foreach ($parts as $part) { + foreach (explode(':', $name, -1) as $part) { if (count($namespaces)) { $namespaces[] = end($namespaces) . ':' . $part; } else { diff --git a/thinkphp/library/think/Controller.php b/thinkphp/library/think/Controller.php index 7aba39cd1..77225b735 100644 --- a/thinkphp/library/think/Controller.php +++ b/thinkphp/library/think/Controller.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -11,46 +11,49 @@ namespace think; -\think\Loader::import('controller/Jump', TRAIT_PATH, EXT); - use think\exception\ValidateException; +use traits\controller\Jump; + +Loader::import('controller/Jump', TRAIT_PATH, EXT); class Controller { - use \traits\controller\Jump; + use Jump; /** * @var \think\View 瑙嗗浘绫诲疄渚 */ protected $view; + /** - * @var \think\Request Request瀹炰緥 + * @var \think\Request Request 瀹炰緥 */ protected $request; - // 楠岃瘉澶辫触鏄惁鎶涘嚭寮傚父 + + /** + * @var bool 楠岃瘉澶辫触鏄惁鎶涘嚭寮傚父 + */ protected $failException = false; - // 鏄惁鎵归噺楠岃瘉 + + /** + * @var bool 鏄惁鎵归噺楠岃瘉 + */ protected $batchValidate = false; /** - * 鍓嶇疆鎿嶄綔鏂规硶鍒楄〃 - * @var array $beforeActionList - * @access protected + * @var array 鍓嶇疆鎿嶄綔鏂规硶鍒楄〃 */ protected $beforeActionList = []; /** * 鏋勯犳柟娉 - * @param Request $request Request瀵硅薄 * @access public + * @param Request $request Request 瀵硅薄 */ public function __construct(Request $request = null) { - if (is_null($request)) { - $request = Request::instance(); - } $this->view = View::instance(Config::get('template'), Config::get('view_replace_str')); - $this->request = $request; + $this->request = is_null($request) ? Request::instance() : $request; // 鎺у埗鍣ㄥ垵濮嬪寲 $this->_initialize(); @@ -65,7 +68,10 @@ class Controller } } - // 鍒濆鍖 + /** + * 鍒濆鍖栨搷浣 + * @access protected + */ protected function _initialize() { } @@ -73,8 +79,9 @@ class Controller /** * 鍓嶇疆鎿嶄綔 * @access protected - * @param string $method 鍓嶇疆鎿嶄綔鏂规硶鍚 - * @param array $options 璋冪敤鍙傛暟 ['only'=>[...]] 鎴栬匸'except'=>[...]] + * @param string $method 鍓嶇疆鎿嶄綔鏂规硶鍚 + * @param array $options 璋冪敤鍙傛暟 ['only'=>[...]] 鎴栬 ['except'=>[...]] + * @return void */ protected function beforeAction($method, $options = []) { @@ -82,6 +89,7 @@ class Controller if (is_string($options['only'])) { $options['only'] = explode(',', $options['only']); } + if (!in_array($this->request->action(), $options['only'])) { return; } @@ -89,6 +97,7 @@ class Controller if (is_string($options['except'])) { $options['except'] = explode(',', $options['except']); } + if (in_array($this->request->action(), $options['except'])) { return; } @@ -100,10 +109,10 @@ class Controller /** * 鍔犺浇妯℃澘杈撳嚭 * @access protected - * @param string $template 妯℃澘鏂囦欢鍚 - * @param array $vars 妯℃澘杈撳嚭鍙橀噺 - * @param array $replace 妯℃澘鏇挎崲 - * @param array $config 妯℃澘鍙傛暟 + * @param string $template 妯℃澘鏂囦欢鍚 + * @param array $vars 妯℃澘杈撳嚭鍙橀噺 + * @param array $replace 妯℃澘鏇挎崲 + * @param array $config 妯℃澘鍙傛暟 * @return mixed */ protected function fetch($template = '', $vars = [], $replace = [], $config = []) @@ -114,10 +123,10 @@ class Controller /** * 娓叉煋鍐呭杈撳嚭 * @access protected - * @param string $content 妯℃澘鍐呭 - * @param array $vars 妯℃澘杈撳嚭鍙橀噺 - * @param array $replace 鏇挎崲鍐呭 - * @param array $config 妯℃澘鍙傛暟 + * @param string $content 妯℃澘鍐呭 + * @param array $vars 妯℃澘杈撳嚭鍙橀噺 + * @param array $replace 鏇挎崲鍐呭 + * @param array $config 妯℃澘鍙傛暟 * @return mixed */ protected function display($content = '', $vars = [], $replace = [], $config = []) @@ -128,24 +137,28 @@ class Controller /** * 妯℃澘鍙橀噺璧嬪 * @access protected - * @param mixed $name 瑕佹樉绀虹殑妯℃澘鍙橀噺 - * @param mixed $value 鍙橀噺鐨勫 - * @return void + * @param mixed $name 瑕佹樉绀虹殑妯℃澘鍙橀噺 + * @param mixed $value 鍙橀噺鐨勫 + * @return $this */ protected function assign($name, $value = '') { $this->view->assign($name, $value); + + return $this; } /** * 鍒濆鍖栨ā鏉垮紩鎿 * @access protected * @param array|string $engine 寮曟搸鍙傛暟 - * @return void + * @return $this */ protected function engine($engine) { $this->view->engine($engine); + + return $this; } /** @@ -157,17 +170,18 @@ class Controller protected function validateFailException($fail = true) { $this->failException = $fail; + return $this; } /** * 楠岃瘉鏁版嵁 * @access protected - * @param array $data 鏁版嵁 - * @param string|array $validate 楠岃瘉鍣ㄥ悕鎴栬呴獙璇佽鍒欐暟缁 - * @param array $message 鎻愮ず淇℃伅 - * @param bool $batch 鏄惁鎵归噺楠岃瘉 - * @param mixed $callback 鍥炶皟鏂规硶锛堥棴鍖咃級 + * @param array $data 鏁版嵁 + * @param string|array $validate 楠岃瘉鍣ㄥ悕鎴栬呴獙璇佽鍒欐暟缁 + * @param array $message 鎻愮ず淇℃伅 + * @param bool $batch 鏄惁鎵归噺楠岃瘉 + * @param mixed $callback 鍥炶皟鏂规硶锛堥棴鍖咃級 * @return array|string|true * @throws ValidateException */ @@ -177,24 +191,27 @@ class Controller $v = Loader::validate(); $v->rule($validate); } else { + // 鏀寔鍦烘櫙 if (strpos($validate, '.')) { - // 鏀寔鍦烘櫙 list($validate, $scene) = explode('.', $validate); } + $v = Loader::validate($validate); - if (!empty($scene)) { - $v->scene($scene); - } + + !empty($scene) && $v->scene($scene); } - // 鏄惁鎵归噺楠岃瘉 + + // 鎵归噺楠岃瘉 if ($batch || $this->batchValidate) { $v->batch(true); } + // 璁剧疆閿欒淇℃伅 if (is_array($message)) { $v->message($message); } + // 浣跨敤鍥炶皟楠岃瘉 if ($callback && is_callable($callback)) { call_user_func_array($callback, [$v, &$data]); } @@ -202,11 +219,11 @@ class Controller if (!$v->check($data)) { if ($this->failException) { throw new ValidateException($v->getError()); - } else { - return $v->getError(); } - } else { - return true; + + return $v->getError(); } + + return true; } } diff --git a/thinkphp/library/think/Cookie.php b/thinkphp/library/think/Cookie.php index 3205fcd9a..61b47cced 100644 --- a/thinkphp/library/think/Cookie.php +++ b/thinkphp/library/think/Cookie.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -13,28 +13,28 @@ namespace think; class Cookie { + /** + * @var array cookie 璁剧疆鍙傛暟 + */ protected static $config = [ - // cookie 鍚嶇О鍓嶇紑 - 'prefix' => '', - // cookie 淇濆瓨鏃堕棿 - 'expire' => 0, - // cookie 淇濆瓨璺緞 - 'path' => '/', - // cookie 鏈夋晥鍩熷悕 - 'domain' => '', - // cookie 鍚敤瀹夊叏浼犺緭 - 'secure' => false, - // httponly璁剧疆 - 'httponly' => '', - // 鏄惁浣跨敤 setcookie - 'setcookie' => true, + 'prefix' => '', // cookie 鍚嶇О鍓嶇紑 + 'expire' => 0, // cookie 淇濆瓨鏃堕棿 + 'path' => '/', // cookie 淇濆瓨璺緞 + 'domain' => '', // cookie 鏈夋晥鍩熷悕 + 'secure' => false, // cookie 鍚敤瀹夊叏浼犺緭 + 'httponly' => false, // httponly 璁剧疆 + 'setcookie' => true, // 鏄惁浣跨敤 setcookie ]; + /** + * @var bool 鏄惁瀹屾垚鍒濆鍖栦簡 + */ protected static $init; /** * Cookie鍒濆鍖 - * @param array $config + * @access public + * @param array $config 閰嶇疆鍙傛暟 * @return void */ public static function init(array $config = []) @@ -42,39 +42,43 @@ class Cookie if (empty($config)) { $config = Config::get('cookie'); } + self::$config = array_merge(self::$config, array_change_key_case($config)); + if (!empty(self::$config['httponly'])) { ini_set('session.cookie_httponly', 1); } + self::$init = true; } /** - * 璁剧疆鎴栬呰幏鍙朿ookie浣滅敤鍩燂紙鍓嶇紑锛 - * @param string $prefix - * @return string|void + * 璁剧疆鎴栬呰幏鍙 cookie 浣滅敤鍩燂紙鍓嶇紑锛 + * @access public + * @param string $prefix 鍓嶇紑 + * @return string| */ public static function prefix($prefix = '') { if (empty($prefix)) { return self::$config['prefix']; } - self::$config['prefix'] = $prefix; + + return self::$config['prefix'] = $prefix; } /** * Cookie 璁剧疆銆佽幏鍙栥佸垹闄 - * - * @param string $name cookie鍚嶇О - * @param mixed $value cookie鍊 - * @param mixed $option 鍙夊弬鏁 鍙兘浼氭槸 null|integer|string - * - * @return mixed - * @internal param mixed $options cookie鍙傛暟 + * @access public + * @param string $name cookie 鍚嶇О + * @param mixed $value cookie 鍊 + * @param mixed $option 鍙夊弬鏁 鍙兘浼氭槸 null|integer|string + * @return void */ public static function set($name, $value = '', $option = null) { !isset(self::$init) && self::init(); + // 鍙傛暟璁剧疆(浼氳鐩栭粰璁よ缃) if (!is_null($option)) { if (is_numeric($option)) { @@ -82,28 +86,40 @@ class Cookie } elseif (is_string($option)) { parse_str($option, $option); } + $config = array_merge(self::$config, array_change_key_case($option)); } else { $config = self::$config; } + $name = $config['prefix'] . $name; - // 璁剧疆cookie + + // 璁剧疆 cookie if (is_array($value)) { array_walk_recursive($value, 'self::jsonFormatProtect', 'encode'); $value = 'think:' . json_encode($value); } - $expire = !empty($config['expire']) ? $_SERVER['REQUEST_TIME'] + intval($config['expire']) : 0; + + $expire = !empty($config['expire']) ? + $_SERVER['REQUEST_TIME'] + intval($config['expire']) : + 0; + if ($config['setcookie']) { - setcookie($name, $value, $expire, $config['path'], $config['domain'], $config['secure'], $config['httponly']); + setcookie( + $name, $value, $expire, $config['path'], $config['domain'], + $config['secure'], $config['httponly'] + ); } + $_COOKIE[$name] = $value; } /** - * 姘镐箙淇濆瓨Cookie鏁版嵁 - * @param string $name cookie鍚嶇О - * @param mixed $value cookie鍊 - * @param mixed $option 鍙夊弬鏁 鍙兘浼氭槸 null|integer|string + * 姘镐箙淇濆瓨 Cookie 鏁版嵁 + * @access public + * @param string $name cookie 鍚嶇О + * @param mixed $value cookie 鍊 + * @param mixed $option 鍙夊弬鏁 鍙兘浼氭槸 null|integer|string * @return void */ public static function forever($name, $value = '', $option = null) @@ -111,33 +127,39 @@ class Cookie if (is_null($option) || is_numeric($option)) { $option = []; } + $option['expire'] = 315360000; + self::set($name, $value, $option); } /** - * 鍒ゆ柇Cookie鏁版嵁 - * @param string $name cookie鍚嶇О - * @param string|null $prefix cookie鍓嶇紑 + * 鍒ゆ柇鏄惁鏈 Cookie 鏁版嵁 + * @access public + * @param string $name cookie 鍚嶇О + * @param string|null $prefix cookie 鍓嶇紑 * @return bool */ public static function has($name, $prefix = null) { !isset(self::$init) && self::init(); + $prefix = !is_null($prefix) ? $prefix : self::$config['prefix']; - $name = $prefix . $name; - return isset($_COOKIE[$name]); + + return isset($_COOKIE[$prefix . $name]); } /** - * Cookie鑾峰彇 - * @param string $name cookie鍚嶇О - * @param string|null $prefix cookie鍓嶇紑 + * 鑾峰彇 Cookie 鐨勫 + * @access public + * @param string $name cookie 鍚嶇О + * @param string|null $prefix cookie 鍓嶇紑 * @return mixed */ public static function get($name = '', $prefix = null) { !isset(self::$init) && self::init(); + $prefix = !is_null($prefix) ? $prefix : self::$config['prefix']; $key = $prefix . $name; @@ -145,80 +167,102 @@ class Cookie // 鑾峰彇鍏ㄩ儴 if ($prefix) { $value = []; + foreach ($_COOKIE as $k => $val) { if (0 === strpos($k, $prefix)) { $value[$k] = $val; } + } } else { $value = $_COOKIE; } } elseif (isset($_COOKIE[$key])) { $value = $_COOKIE[$key]; + if (0 === strpos($value, 'think:')) { - $value = substr($value, 6); - $value = json_decode($value, true); + $value = json_decode(substr($value, 6), true); array_walk_recursive($value, 'self::jsonFormatProtect', 'decode'); } } else { $value = null; } + return $value; } /** - * Cookie鍒犻櫎 - * @param string $name cookie鍚嶇О - * @param string|null $prefix cookie鍓嶇紑 - * @return mixed + * 鍒犻櫎 Cookie + * @access public + * @param string $name cookie 鍚嶇О + * @param string|null $prefix cookie 鍓嶇紑 + * @return void */ public static function delete($name, $prefix = null) { !isset(self::$init) && self::init(); + $config = self::$config; $prefix = !is_null($prefix) ? $prefix : $config['prefix']; $name = $prefix . $name; + if ($config['setcookie']) { - setcookie($name, '', $_SERVER['REQUEST_TIME'] - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']); + setcookie( + $name, '', $_SERVER['REQUEST_TIME'] - 3600, $config['path'], + $config['domain'], $config['secure'], $config['httponly'] + ); } - // 鍒犻櫎鎸囧畾cookie + + // 鍒犻櫎鎸囧畾 cookie unset($_COOKIE[$name]); } /** - * Cookie娓呯┖ - * @param string|null $prefix cookie鍓嶇紑 - * @return mixed + * 娓呴櫎鎸囧畾鍓嶇紑鐨勬墍鏈 cookie + * @access public + * @param string|null $prefix cookie 鍓嶇紑 + * @return void */ public static function clear($prefix = null) { - // 娓呴櫎鎸囧畾鍓嶇紑鐨勬墍鏈塩ookie if (empty($_COOKIE)) { return; } + !isset(self::$init) && self::init(); - // 瑕佸垹闄ょ殑cookie鍓嶇紑锛屼笉鎸囧畾鍒欏垹闄onfig璁剧疆鐨勬寚瀹氬墠缂 + + // 瑕佸垹闄ょ殑 cookie 鍓嶇紑锛屼笉鎸囧畾鍒欏垹闄 config 璁剧疆鐨勬寚瀹氬墠缂 $config = self::$config; $prefix = !is_null($prefix) ? $prefix : $config['prefix']; + if ($prefix) { - // 濡傛灉鍓嶇紑涓虹┖瀛楃涓插皢涓嶄綔澶勭悊鐩存帴杩斿洖 foreach ($_COOKIE as $key => $val) { if (0 === strpos($key, $prefix)) { if ($config['setcookie']) { - setcookie($key, '', $_SERVER['REQUEST_TIME'] - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']); + setcookie( + $key, '', $_SERVER['REQUEST_TIME'] - 3600, $config['path'], + $config['domain'], $config['secure'], $config['httponly'] + ); } + unset($_COOKIE[$key]); } } } - return; } - private static function jsonFormatProtect(&$val, $key, $type = 'encode') + /** + * json 杞崲鏃剁殑鏍煎紡淇濇姢 + * @access protected + * @param mixed $val 瑕佽浆鎹㈢殑鍊 + * @param string $key 閿悕 + * @param string $type 杞崲绫诲埆 + * @return void + */ + protected static function jsonFormatProtect(&$val, $key, $type = 'encode') { if (!empty($val) && true !== $val) { $val = 'decode' == $type ? urldecode($val) : urlencode($val); } } - } diff --git a/thinkphp/library/think/Db.php b/thinkphp/library/think/Db.php index e239fd4e4..80f08d243 100644 --- a/thinkphp/library/think/Db.php +++ b/thinkphp/library/think/Db.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -49,19 +49,26 @@ use think\db\Query; */ class Db { - // 鏁版嵁搴撹繛鎺ュ疄渚 + /** + * @var Connection[] 鏁版嵁搴撹繛鎺ュ疄渚 + */ private static $instance = []; - // 鏌ヨ娆℃暟 + + /** + * @var int 鏌ヨ娆℃暟 + */ public static $queryTimes = 0; - // 鎵ц娆℃暟 + + /** + * @var int 鎵ц娆℃暟 + */ public static $executeTimes = 0; /** - * 鏁版嵁搴撳垵濮嬪寲 骞跺彇寰楁暟鎹簱绫诲疄渚 - * @static + * 鏁版嵁搴撳垵濮嬪寲锛屽苟鍙栧緱鏁版嵁搴撶被瀹炰緥 * @access public - * @param mixed $config 杩炴帴閰嶇疆 - * @param bool|string $name 杩炴帴鏍囪瘑 true 寮哄埗閲嶆柊杩炴帴 + * @param mixed $config 杩炴帴閰嶇疆 + * @param bool|string $name 杩炴帴鏍囪瘑 true 寮哄埗閲嶆柊杩炴帴 * @return Connection * @throws Exception */ @@ -70,31 +77,48 @@ class Db if (false === $name) { $name = md5(serialize($config)); } + if (true === $name || !isset(self::$instance[$name])) { // 瑙ｆ瀽杩炴帴鍙傛暟 鏀寔鏁扮粍鍜屽瓧绗︿覆 $options = self::parseConfig($config); + if (empty($options['type'])) { throw new \InvalidArgumentException('Undefined db type'); } - $class = false !== strpos($options['type'], '\\') ? $options['type'] : '\\think\\db\\connector\\' . ucwords($options['type']); + + $class = false !== strpos($options['type'], '\\') ? + $options['type'] : + '\\think\\db\\connector\\' . ucwords($options['type']); + // 璁板綍鍒濆鍖栦俊鎭 if (App::$debug) { Log::record('[ DB ] INIT ' . $options['type'], 'info'); } + if (true === $name) { - return new $class($options); - } else { - self::$instance[$name] = new $class($options); + $name = md5(serialize($config)); } + + self::$instance[$name] = new $class($options); } + return self::$instance[$name]; } + /** + * 娓呴櫎杩炴帴瀹炰緥 + * @access public + * @return void + */ + public static function clear() + { + self::$instance = []; + } + /** * 鏁版嵁搴撹繛鎺ュ弬鏁拌В鏋 - * @static * @access private - * @param mixed $config + * @param mixed $config 杩炴帴鍙傛暟 * @return array */ private static function parseConfig($config) @@ -102,30 +126,27 @@ class Db if (empty($config)) { $config = Config::get('database'); } elseif (is_string($config) && false === strpos($config, '/')) { - // 鏀寔璇诲彇閰嶇疆鍙傛暟 - $config = Config::get($config); - } - if (is_string($config)) { - return self::parseDsn($config); - } else { - return $config; + $config = Config::get($config); // 鏀寔璇诲彇閰嶇疆鍙傛暟 } + + return is_string($config) ? self::parseDsn($config) : $config; } /** - * DSN瑙ｆ瀽 + * DSN 瑙ｆ瀽 * 鏍煎紡锛 mysql://username:passwd@localhost:3306/DbName?param1=val1¶m2=val2#utf8 - * @static * @access private - * @param string $dsnStr + * @param string $dsnStr 鏁版嵁搴 DSN 瀛楃涓茶В鏋 * @return array */ private static function parseDsn($dsnStr) { $info = parse_url($dsnStr); + if (!$info) { return []; } + $dsn = [ 'type' => $info['scheme'], 'username' => isset($info['user']) ? $info['user'] : '', @@ -141,13 +162,19 @@ class Db } else { $dsn['params'] = []; } + return $dsn; } - // 璋冪敤椹卞姩绫荤殑鏂规硶 + /** + * 璋冪敤椹卞姩绫荤殑鏂规硶 + * @access public + * @param string $method 鏂规硶鍚 + * @param array $params 鍙傛暟 + * @return mixed + */ public static function __callStatic($method, $params) { - // 鑷姩鍒濆鍖栨暟鎹簱 return call_user_func_array([self::connect(), $method], $params); } } diff --git a/thinkphp/library/think/Debug.php b/thinkphp/library/think/Debug.php index 9994e20c8..df487485c 100644 --- a/thinkphp/library/think/Debug.php +++ b/thinkphp/library/think/Debug.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -16,21 +16,27 @@ use think\response\Redirect; class Debug { - // 鍖洪棿鏃堕棿淇℃伅 + /** + * @var array 鍖洪棿鏃堕棿淇℃伅 + */ protected static $info = []; - // 鍖洪棿鍐呭瓨淇℃伅 + + /** + * @var array 鍖洪棿鍐呭瓨淇℃伅 + */ protected static $mem = []; /** * 璁板綍鏃堕棿锛堝井绉掞級鍜屽唴瀛樹娇鐢ㄦ儏鍐 - * @param string $name 鏍囪浣嶇疆 - * @param mixed $value 鏍囪鍊 鐣欑┖鍒欏彇褰撳墠 time 琛ㄧず浠呰褰曟椂闂 鍚﹀垯鍚屾椂璁板綍鏃堕棿鍜屽唴瀛 - * @return mixed + * @access public + * @param string $name 鏍囪浣嶇疆 + * @param mixed $value 鏍囪鍊(鐣欑┖鍒欏彇褰撳墠 time 琛ㄧず浠呰褰曟椂闂 鍚﹀垯鍚屾椂璁板綍鏃堕棿鍜屽唴瀛) + * @return void */ public static function remark($name, $value = '') { - // 璁板綍鏃堕棿鍜屽唴瀛樹娇鐢 self::$info[$name] = is_float($value) ? $value : microtime(true); + if ('time' != $value) { self::$mem['mem'][$name] = is_float($value) ? $value : memory_get_usage(); self::$mem['peak'][$name] = memory_get_peak_usage(); @@ -39,23 +45,26 @@ class Debug /** * 缁熻鏌愪釜鍖洪棿鐨勬椂闂达紙寰锛変娇鐢ㄦ儏鍐 杩斿洖鍊间互绉掍负鍗曚綅 - * @param string $start 寮濮嬫爣绛 - * @param string $end 缁撴潫鏍囩 - * @param integer|string $dec 灏忔暟浣 - * @return integer + * @access public + * @param string $start 寮濮嬫爣绛 + * @param string $end 缁撴潫鏍囩 + * @param integer $dec 灏忔暟浣 + * @return string */ public static function getRangeTime($start, $end, $dec = 6) { if (!isset(self::$info[$end])) { self::$info[$end] = microtime(true); } + return number_format((self::$info[$end] - self::$info[$start]), $dec); } /** * 缁熻浠庡紑濮嬪埌缁熻鏃剁殑鏃堕棿锛堝井绉掞級浣跨敤鎯呭喌 杩斿洖鍊间互绉掍负鍗曚綅 - * @param integer|string $dec 灏忔暟浣 - * @return integer + * @access public + * @param integer $dec 灏忔暟浣 + * @return string */ public static function getUseTime($dec = 6) { @@ -64,6 +73,7 @@ class Debug /** * 鑾峰彇褰撳墠璁块棶鐨勫悶鍚愮巼鎯呭喌 + * @access public * @return string */ public static function getThroughputRate() @@ -73,9 +83,10 @@ class Debug /** * 璁板綍鍖洪棿鐨勫唴瀛樹娇鐢ㄦ儏鍐 - * @param string $start 寮濮嬫爣绛 - * @param string $end 缁撴潫鏍囩 - * @param integer|string $dec 灏忔暟浣 + * @access public + * @param string $start 寮濮嬫爣绛 + * @param string $end 缁撴潫鏍囩 + * @param integer $dec 灏忔暟浣 * @return string */ public static function getRangeMem($start, $end, $dec = 2) @@ -83,19 +94,23 @@ class Debug if (!isset(self::$mem['mem'][$end])) { self::$mem['mem'][$end] = memory_get_usage(); } + $size = self::$mem['mem'][$end] - self::$mem['mem'][$start]; $a = ['B', 'KB', 'MB', 'GB', 'TB']; $pos = 0; + while ($size >= 1024) { $size /= 1024; $pos++; } + return round($size, $dec) . " " . $a[$pos]; } /** * 缁熻浠庡紑濮嬪埌缁熻鏃剁殑鍐呭瓨浣跨敤鎯呭喌 - * @param integer|string $dec 灏忔暟浣 + * @access public + * @param integer $dec 灏忔暟浣 * @return string */ public static function getUseMem($dec = 2) @@ -103,103 +118,128 @@ class Debug $size = memory_get_usage() - THINK_START_MEM; $a = ['B', 'KB', 'MB', 'GB', 'TB']; $pos = 0; + while ($size >= 1024) { $size /= 1024; $pos++; } + return round($size, $dec) . " " . $a[$pos]; } /** * 缁熻鍖洪棿鐨勫唴瀛樺嘲鍊兼儏鍐 - * @param string $start 寮濮嬫爣绛 - * @param string $end 缁撴潫鏍囩 - * @param integer|string $dec 灏忔暟浣 - * @return mixed + * @access public + * @param string $start 寮濮嬫爣绛 + * @param string $end 缁撴潫鏍囩 + * @param integer $dec 灏忔暟浣 + * @return string */ public static function getMemPeak($start, $end, $dec = 2) { if (!isset(self::$mem['peak'][$end])) { self::$mem['peak'][$end] = memory_get_peak_usage(); } + $size = self::$mem['peak'][$end] - self::$mem['peak'][$start]; $a = ['B', 'KB', 'MB', 'GB', 'TB']; $pos = 0; + while ($size >= 1024) { $size /= 1024; $pos++; } + return round($size, $dec) . " " . $a[$pos]; } /** * 鑾峰彇鏂囦欢鍔犺浇淇℃伅 - * @param bool $detail 鏄惁鏄剧ず璇︾粏 + * @access public + * @param bool $detail 鏄惁鏄剧ず璇︾粏 * @return integer|array */ public static function getFile($detail = false) { + $files = get_included_files(); + if ($detail) { - $files = get_included_files(); - $info = []; - foreach ($files as $key => $file) { + $info = []; + + foreach ($files as $file) { $info[] = $file . ' ( ' . number_format(filesize($file) / 1024, 2) . ' KB )'; } + return $info; } - return count(get_included_files()); + + return count($files); } /** * 娴忚鍣ㄥ弸濂界殑鍙橀噺杈撳嚭 - * @param mixed $var 鍙橀噺 - * @param boolean $echo 鏄惁杈撳嚭 榛樿涓簍rue 濡傛灉涓篺alse 鍒欒繑鍥炶緭鍑哄瓧绗︿覆 - * @param string $label 鏍囩 榛樿涓虹┖ - * @param integer $flags htmlspecialchars flags - * @return void|string + * @access public + * @param mixed $var 鍙橀噺 + * @param boolean $echo 鏄惁杈撳嚭(榛樿涓 true锛屼负 false 鍒欒繑鍥炶緭鍑哄瓧绗︿覆) + * @param string|null $label 鏍囩(榛樿涓虹┖) + * @param integer $flags htmlspecialchars 鐨勬爣蹇 + * @return null|string */ public static function dump($var, $echo = true, $label = null, $flags = ENT_SUBSTITUTE) { $label = (null === $label) ? '' : rtrim($label) . ':'; + ob_start(); var_dump($var); - $output = ob_get_clean(); - $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output); + $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', ob_get_clean()); + if (IS_CLI) { $output = PHP_EOL . $label . $output . PHP_EOL; } else { if (!extension_loaded('xdebug')) { $output = htmlspecialchars($output, $flags); } + $output = '
' . $label . $output . '
'; } + if ($echo) { echo($output); return; - } else { - return $output; } + + return $output; } + /** + * 璋冭瘯淇℃伅娉ㄥ叆鍒板搷搴斾腑 + * @access public + * @param Response $response 鍝嶅簲瀹炰緥 + * @param string $content 杩斿洖鐨勫瓧绗︿覆 + * @return void + */ public static function inject(Response $response, &$content) { - $config = Config::get('trace'); - $type = isset($config['type']) ? $config['type'] : 'Html'; - $request = Request::instance(); - $class = false !== strpos($type, '\\') ? $type : '\\think\\debug\\' . ucwords($type); + $config = Config::get('trace'); + $type = isset($config['type']) ? $config['type'] : 'Html'; + $class = false !== strpos($type, '\\') ? $type : '\\think\\debug\\' . ucwords($type); + unset($config['type']); - if (class_exists($class)) { - $trace = new $class($config); - } else { + + if (!class_exists($class)) { throw new ClassNotFoundException('class not exists:' . $class, $class); } + /** @var \think\debug\Console|\think\debug\Html $trace */ + $trace = new $class($config); + if ($response instanceof Redirect) { - //TODO 璁板綍 + // TODO 璁板綍 } else { $output = $trace->output($response, Log::getLog()); + if (is_string($output)) { - // trace璋冭瘯淇℃伅娉ㄥ叆 + // trace 璋冭瘯淇℃伅娉ㄥ叆 $pos = strripos($content, ''); if (false !== $pos) { $content = substr($content, 0, $pos) . $output . substr($content, $pos); diff --git a/thinkphp/library/think/Env.php b/thinkphp/library/think/Env.php index fa87897ca..0a8b25097 100644 --- a/thinkphp/library/think/Env.php +++ b/thinkphp/library/think/Env.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -15,22 +15,25 @@ class Env { /** * 鑾峰彇鐜鍙橀噺鍊 - * @param string $name 鐜鍙橀噺鍚嶏紙鏀寔浜岀骇 .鍙峰垎鍓诧級 - * @param string $default 榛樿鍊 + * @access public + * @param string $name 鐜鍙橀噺鍚嶏紙鏀寔浜岀骇 . 鍙峰垎鍓诧級 + * @param string $default 榛樿鍊 * @return mixed */ public static function get($name, $default = null) { $result = getenv(ENV_PREFIX . strtoupper(str_replace('.', '_', $name))); + if (false !== $result) { if ('false' === $result) { $result = false; } elseif ('true' === $result) { $result = true; } + return $result; - } else { - return $default; } + + return $default; } } diff --git a/thinkphp/library/think/Error.php b/thinkphp/library/think/Error.php index c17292bf5..5f361d589 100644 --- a/thinkphp/library/think/Error.php +++ b/thinkphp/library/think/Error.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -20,6 +20,7 @@ class Error { /** * 娉ㄥ唽寮傚父澶勭悊 + * @access public * @return void */ public static function register() @@ -31,8 +32,10 @@ class Error } /** - * Exception Handler - * @param \Exception|\Throwable $e + * 寮傚父澶勭悊 + * @access public + * @param \Exception|\Throwable $e 寮傚父 + * @return void */ public static function appException($e) { @@ -40,44 +43,50 @@ class Error $e = new ThrowableError($e); } - self::getExceptionHandler()->report($e); + $handler = self::getExceptionHandler(); + $handler->report($e); + if (IS_CLI) { - self::getExceptionHandler()->renderForConsole(new ConsoleOutput, $e); + $handler->renderForConsole(new ConsoleOutput, $e); } else { - self::getExceptionHandler()->render($e)->send(); + $handler->render($e)->send(); } } /** - * Error Handler - * @param integer $errno 閿欒缂栧彿 - * @param integer $errstr 璇︾粏閿欒淇℃伅 - * @param string $errfile 鍑洪敊鐨勬枃浠 - * @param integer $errline 鍑洪敊琛屽彿 - * @param array $errcontext + * 閿欒澶勭悊 + * @access public + * @param integer $errno 閿欒缂栧彿 + * @param integer $errstr 璇︾粏閿欒淇℃伅 + * @param string $errfile 鍑洪敊鐨勬枃浠 + * @param integer $errline 鍑洪敊琛屽彿 + * @return void * @throws ErrorException */ - public static function appError($errno, $errstr, $errfile = '', $errline = 0, $errcontext = []) + public static function appError($errno, $errstr, $errfile = '', $errline = 0) { - $exception = new ErrorException($errno, $errstr, $errfile, $errline, $errcontext); + $exception = new ErrorException($errno, $errstr, $errfile, $errline); + + // 绗﹀悎寮傚父澶勭悊鐨勫垯灏嗛敊璇俊鎭墭绠¤嚦 think\exception\ErrorException if (error_reporting() & $errno) { - // 灏嗛敊璇俊鎭墭绠¤嚦 think\exception\ErrorException throw $exception; - } else { - self::getExceptionHandler()->report($exception); } + + self::getExceptionHandler()->report($exception); } /** - * Shutdown Handler + * 寮傚父涓澶勭悊 + * @access public + * @return void */ public static function appShutdown() { + // 灏嗛敊璇俊鎭墭绠¤嚦 think\ErrorException if (!is_null($error = error_get_last()) && self::isFatal($error['type'])) { - // 灏嗛敊璇俊鎭墭绠¤嚦think\ErrorException - $exception = new ErrorException($error['type'], $error['message'], $error['file'], $error['line']); - - self::appException($exception); + self::appException(new ErrorException( + $error['type'], $error['message'], $error['file'], $error['line'] + )); } // 鍐欏叆鏃ュ織 @@ -86,8 +95,8 @@ class Error /** * 纭畾閿欒绫诲瀷鏄惁鑷村懡 - * - * @param int $type + * @access protected + * @param int $type 閿欒绫诲瀷 * @return bool */ protected static function isFatal($type) @@ -96,22 +105,32 @@ class Error } /** - * Get an instance of the exception handler. - * + * 鑾峰彇寮傚父澶勭悊鐨勫疄渚 + * @access public * @return Handle */ public static function getExceptionHandler() { static $handle; + if (!$handle) { - // 寮傚父澶勭悊handle + // 寮傚父澶勭悊 handle $class = Config::get('exception_handle'); - if ($class && class_exists($class) && is_subclass_of($class, "\\think\\exception\\Handle")) { + + if ($class && is_string($class) && class_exists($class) && + is_subclass_of($class, "\\think\\exception\\Handle") + ) { $handle = new $class; } else { $handle = new Handle; + + if ($class instanceof \Closure) { + $handle->setRender($class); + } + } } + return $handle; } } diff --git a/thinkphp/library/think/Exception.php b/thinkphp/library/think/Exception.php index 034c85b64..1ef06bdbd 100644 --- a/thinkphp/library/think/Exception.php +++ b/thinkphp/library/think/Exception.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -13,15 +13,13 @@ namespace think; class Exception extends \Exception { - /** - * 淇濆瓨寮傚父椤甸潰鏄剧ず鐨勯澶朌ebug鏁版嵁 - * @var array + * @var array 淇濆瓨寮傚父椤甸潰鏄剧ず鐨勯澶 Debug 鏁版嵁 */ protected $data = []; /** - * 璁剧疆寮傚父棰濆鐨凞ebug鏁版嵁 + * 璁剧疆寮傚父棰濆鐨 Debug 鏁版嵁 * 鏁版嵁灏嗕細鏄剧ず涓轰笅闈㈢殑鏍煎紡 * * Exception Data @@ -33,8 +31,10 @@ class Exception extends \Exception * key1 value1 * key2 value2 * - * @param string $label 鏁版嵁鍒嗙被锛岀敤浜庡紓甯搁〉闈㈡樉绀 - * @param array $data 闇瑕佹樉绀虹殑鏁版嵁锛屽繀椤讳负鍏宠仈鏁扮粍 + * @access protected + * @param string $label 鏁版嵁鍒嗙被锛岀敤浜庡紓甯搁〉闈㈡樉绀 + * @param array $data 闇瑕佹樉绀虹殑鏁版嵁锛屽繀椤讳负鍏宠仈鏁扮粍 + * @return void */ final protected function setData($label, array $data) { @@ -42,13 +42,14 @@ class Exception extends \Exception } /** - * 鑾峰彇寮傚父棰濆Debug鏁版嵁 + * 鑾峰彇寮傚父棰濆 Debug 鏁版嵁 * 涓昏鐢ㄤ簬杈撳嚭鍒板紓甯搁〉闈究浜庤皟璇 - * @return array 鐢眘etData璁剧疆鐨凞ebug鏁版嵁 + * @access public + * @return array */ final public function getData() { return $this->data; } - + } diff --git a/thinkphp/library/think/File.php b/thinkphp/library/think/File.php index 636a3430a..d2ed22083 100644 --- a/thinkphp/library/think/File.php +++ b/thinkphp/library/think/File.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -16,25 +16,51 @@ use SplFileObject; class File extends SplFileObject { /** - * 閿欒淇℃伅 - * @var string + * @var string 閿欒淇℃伅 */ private $error = ''; - // 褰撳墠瀹屾暣鏂囦欢鍚 + + /** + * @var string 褰撳墠瀹屾暣鏂囦欢鍚 + */ protected $filename; - // 涓婁紶鏂囦欢鍚 + + /** + * @var string 涓婁紶鏂囦欢鍚 + */ protected $saveName; - // 鏂囦欢涓婁紶鍛藉悕瑙勫垯 + + /** + * @var string 鏂囦欢涓婁紶鍛藉悕瑙勫垯 + */ protected $rule = 'date'; - // 鏂囦欢涓婁紶楠岃瘉瑙勫垯 + + /** + * @var array 鏂囦欢涓婁紶楠岃瘉瑙勫垯 + */ protected $validate = []; - // 鍗曞厓娴嬭瘯 + + /** + * @var bool 鍗曞厓娴嬭瘯 + */ protected $isTest; - // 涓婁紶鏂囦欢淇℃伅 + + /** + * @var array 涓婁紶鏂囦欢淇℃伅 + */ protected $info; - // 鏂囦欢hash淇℃伅 + + /** + * @var array 鏂囦欢 hash 淇℃伅 + */ protected $hash = []; + /** + * File constructor. + * @access public + * @param string $filename 鏂囦欢鍚嶇О + * @param string $mode 璁块棶妯″紡 + */ public function __construct($filename, $mode = 'r') { parent::__construct($filename, $mode); @@ -42,30 +68,35 @@ class File extends SplFileObject } /** - * 鏄惁娴嬭瘯 - * @param bool $test 鏄惁娴嬭瘯 + * 璁剧疆鏄惁鏄崟鍏冩祴璇 + * @access public + * @param bool $test 鏄惁鏄祴璇 * @return $this */ public function isTest($test = false) { $this->isTest = $test; + return $this; } /** * 璁剧疆涓婁紶淇℃伅 - * @param array $info 涓婁紶鏂囦欢淇℃伅 + * @access public + * @param array $info 涓婁紶鏂囦欢淇℃伅 * @return $this */ public function setUploadInfo($info) { $this->info = $info; + return $this; } /** * 鑾峰彇涓婁紶鏂囦欢鐨勪俊鎭 - * @param string $name + * @access public + * @param string $name 淇℃伅鍚嶇О * @return array|string */ public function getInfo($name = '') @@ -75,6 +106,7 @@ class File extends SplFileObject /** * 鑾峰彇涓婁紶鏂囦欢鐨勬枃浠跺悕 + * @access public * @return string */ public function getSaveName() @@ -84,93 +116,101 @@ class File extends SplFileObject /** * 璁剧疆涓婁紶鏂囦欢鐨勪繚瀛樻枃浠跺悕 - * @param string $saveName + * @access public + * @param string $saveName 淇濆瓨鍚嶇О * @return $this */ public function setSaveName($saveName) { $this->saveName = $saveName; + return $this; } /** * 鑾峰彇鏂囦欢鐨勫搱甯屾暎鍒楀 - * @return $string + * @access public + * @param string $type 绫诲瀷 + * @return string */ public function hash($type = 'sha1') { if (!isset($this->hash[$type])) { $this->hash[$type] = hash_file($type, $this->filename); } + return $this->hash[$type]; } /** * 妫鏌ョ洰褰曟槸鍚﹀彲鍐 - * @param string $path 鐩綍 + * @access protected + * @param string $path 鐩綍 * @return boolean */ protected function checkPath($path) { - if (is_dir($path)) { + if (is_dir($path) || mkdir($path, 0755, true)) { return true; } - if (mkdir($path, 0755, true)) { - return true; - } else { - $this->error = "鐩綍 {$path} 鍒涘缓澶辫触锛"; - return false; - } + $this->error = ['directory {:path} creation failed', ['path' => $path]]; + + return false; } /** * 鑾峰彇鏂囦欢绫诲瀷淇℃伅 + * @access public * @return string */ public function getMime() { $finfo = finfo_open(FILEINFO_MIME_TYPE); + return finfo_file($finfo, $this->filename); } /** * 璁剧疆鏂囦欢鐨勫懡鍚嶈鍒 - * @param string $rule 鏂囦欢鍛藉悕瑙勫垯 + * @access public + * @param string $rule 鏂囦欢鍛藉悕瑙勫垯 * @return $this */ public function rule($rule) { $this->rule = $rule; + return $this; } /** * 璁剧疆涓婁紶鏂囦欢鐨勯獙璇佽鍒 - * @param array $rule 楠岃瘉瑙勫垯 + * @access public + * @param array $rule 楠岃瘉瑙勫垯 * @return $this */ - public function validate($rule = []) + public function validate(array $rule = []) { $this->validate = $rule; + return $this; } /** * 妫娴嬫槸鍚﹀悎娉曠殑涓婁紶鏂囦欢 + * @access public * @return bool */ public function isValid() { - if ($this->isTest) { - return is_file($this->filename); - } - return is_uploaded_file($this->filename); + return $this->isTest ? is_file($this->filename) : is_uploaded_file($this->filename); } /** * 妫娴嬩笂浼犳枃浠 - * @param array $rule 楠岃瘉瑙勫垯 + * @access public + * @param array $rule 楠岃瘉瑙勫垯 * @return bool */ public function check($rule = []) @@ -179,25 +219,25 @@ class File extends SplFileObject /* 妫鏌ユ枃浠跺ぇ灏 */ if (isset($rule['size']) && !$this->checkSize($rule['size'])) { - $this->error = '涓婁紶鏂囦欢澶у皬涓嶇锛'; + $this->error = 'filesize not match'; return false; } - /* 妫鏌ユ枃浠禡ime绫诲瀷 */ + /* 妫鏌ユ枃浠 Mime 绫诲瀷 */ if (isset($rule['type']) && !$this->checkMime($rule['type'])) { - $this->error = '涓婁紶鏂囦欢MIME绫诲瀷涓嶅厑璁革紒'; + $this->error = 'mimetype to upload is not allowed'; return false; } /* 妫鏌ユ枃浠跺悗缂 */ if (isset($rule['ext']) && !$this->checkExt($rule['ext'])) { - $this->error = '涓婁紶鏂囦欢鍚庣紑涓嶅厑璁'; + $this->error = 'extensions to upload is not allowed'; return false; } /* 妫鏌ュ浘鍍忔枃浠 */ if (!$this->checkImg()) { - $this->error = '闈炴硶鍥惧儚鏂囦欢锛'; + $this->error = 'illegal image files'; return false; } @@ -206,7 +246,8 @@ class File extends SplFileObject /** * 妫娴嬩笂浼犳枃浠跺悗缂 - * @param array|string $ext 鍏佽鍚庣紑 + * @access public + * @param array|string $ext 鍏佽鍚庣紑 * @return bool */ public function checkExt($ext) @@ -214,73 +255,76 @@ class File extends SplFileObject if (is_string($ext)) { $ext = explode(',', $ext); } + $extension = strtolower(pathinfo($this->getInfo('name'), PATHINFO_EXTENSION)); - if (!in_array($extension, $ext)) { - return false; - } - return true; + + return in_array($extension, $ext); } /** * 妫娴嬪浘鍍忔枃浠 + * @access public * @return bool */ public function checkImg() { $extension = strtolower(pathinfo($this->getInfo('name'), PATHINFO_EXTENSION)); - /* 瀵瑰浘鍍忔枃浠惰繘琛屼弗鏍兼娴 */ - if (in_array($extension, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'swf']) && !in_array($this->getImageType($this->filename), [1, 2, 3, 4, 6])) { - return false; - } - return true; + + // 濡傛灉涓婁紶鐨勪笉鏄浘鐗囷紝鎴栬呮槸鍥剧墖鑰屼笖鍚庣紑纭疄绗﹀悎鍥剧墖绫诲瀷鍒欒繑鍥 true + return !in_array($extension, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'swf']) || in_array($this->getImageType($this->filename), [1, 2, 3, 4, 6, 13]); } - // 鍒ゆ柇鍥惧儚绫诲瀷 + /** + * 鍒ゆ柇鍥惧儚绫诲瀷 + * @access protected + * @param string $image 鍥剧墖鍚嶇О + * @return bool|int + */ protected function getImageType($image) { if (function_exists('exif_imagetype')) { return exif_imagetype($image); - } else { + } + + try { $info = getimagesize($image); - return $info[2]; + return $info ? $info[2] : false; + } catch (\Exception $e) { + return false; } } /** * 妫娴嬩笂浼犳枃浠跺ぇ灏 - * @param integer $size 鏈澶уぇ灏 + * @access public + * @param integer $size 鏈澶уぇ灏 * @return bool */ public function checkSize($size) { - if ($this->getSize() > $size) { - return false; - } - return true; + return $this->getSize() <= $size; } /** * 妫娴嬩笂浼犳枃浠剁被鍨 - * @param array|string $mime 鍏佽绫诲瀷 + * @access public + * @param array|string $mime 鍏佽绫诲瀷 * @return bool */ public function checkMime($mime) { - if (is_string($mime)) { - $mime = explode(',', $mime); - } - if (!in_array(strtolower($this->getMime()), $mime)) { - return false; - } - return true; + $mime = is_string($mime) ? explode(',', $mime) : $mime; + + return in_array(strtolower($this->getMime()), $mime); } /** * 绉诲姩鏂囦欢 - * @param string $path 淇濆瓨璺緞 - * @param string|bool $savename 淇濆瓨鐨勬枃浠跺悕 榛樿鑷姩鐢熸垚 - * @param boolean $replace 鍚屽悕鏂囦欢鏄惁瑕嗙洊 - * @return false|File false-澶辫触 鍚﹀垯杩斿洖File瀹炰緥 + * @access public + * @param string $path 淇濆瓨璺緞 + * @param string|bool $savename 淇濆瓨鐨勬枃浠跺悕 榛樿鑷姩鐢熸垚 + * @param boolean $replace 鍚屽悕鏂囦欢鏄惁瑕嗙洊 + * @return false|File */ public function move($path, $savename = true, $replace = true) { @@ -292,7 +336,7 @@ class File extends SplFileObject // 妫娴嬪悎娉曟 if (!$this->isValid()) { - $this->error = '闈炴硶涓婁紶鏂囦欢'; + $this->error = 'upload illegal files'; return false; } @@ -300,6 +344,7 @@ class File extends SplFileObject if (!$this->check()) { return false; } + $path = rtrim($path, DS) . DS; // 鏂囦欢淇濆瓨鍛藉悕瑙勫垯 $saveName = $this->buildSaveName($savename); @@ -310,9 +355,9 @@ class File extends SplFileObject return false; } - /* 涓嶈鐩栧悓鍚嶆枃浠 */ + // 涓嶈鐩栧悓鍚嶆枃浠 if (!$replace && is_file($filename)) { - $this->error = '瀛樺湪鍚屽悕鏂囦欢' . $filename; + $this->error = ['has the same filename: {:filename}', ['filename' => $filename]]; return false; } @@ -320,25 +365,27 @@ class File extends SplFileObject if ($this->isTest) { rename($this->filename, $filename); } elseif (!move_uploaded_file($this->filename, $filename)) { - $this->error = '鏂囦欢涓婁紶淇濆瓨閿欒锛'; + $this->error = 'upload write error'; return false; } - // 杩斿洖 File瀵硅薄瀹炰緥 + + // 杩斿洖 File 瀵硅薄瀹炰緥 $file = new self($filename); - $file->setSaveName($saveName); - $file->setUploadInfo($this->info); + $file->setSaveName($saveName)->setUploadInfo($this->info); + return $file; } /** * 鑾峰彇淇濆瓨鏂囦欢鍚 - * @param string|bool $savename 淇濆瓨鐨勬枃浠跺悕 榛樿鑷姩鐢熸垚 + * @access protected + * @param string|bool $savename 淇濆瓨鐨勬枃浠跺悕 榛樿鑷姩鐢熸垚 * @return string */ protected function buildSaveName($savename) { + // 鑷姩鐢熸垚鏂囦欢鍚 if (true === $savename) { - // 鑷姩鐢熸垚鏂囦欢鍚 if ($this->rule instanceof \Closure) { $savename = call_user_func_array($this->rule, [$this]); } else { @@ -357,52 +404,73 @@ class File extends SplFileObject } } } - } elseif ('' === $savename) { + } elseif ('' === $savename || false === $savename) { $savename = $this->getInfo('name'); } + if (!strpos($savename, '.')) { $savename .= '.' . pathinfo($this->getInfo('name'), PATHINFO_EXTENSION); } + return $savename; } /** * 鑾峰彇閿欒浠ｇ爜淇℃伅 - * @param int $errorNo 閿欒鍙 + * @access private + * @param int $errorNo 閿欒鍙 + * @return $this */ private function error($errorNo) { switch ($errorNo) { case 1: case 2: - $this->error = '涓婁紶鏂囦欢澶у皬瓒呰繃浜嗘渶澶у硷紒'; + $this->error = 'upload File size exceeds the maximum value'; break; case 3: - $this->error = '鏂囦欢鍙湁閮ㄥ垎琚笂浼狅紒'; + $this->error = 'only the portion of file is uploaded'; break; case 4: - $this->error = '娌℃湁鏂囦欢琚笂浼狅紒'; + $this->error = 'no file to uploaded'; break; case 6: - $this->error = '鎵句笉鍒颁复鏃舵枃浠跺す锛'; + $this->error = 'upload temp dir not found'; break; case 7: - $this->error = '鏂囦欢鍐欏叆澶辫触锛'; + $this->error = 'file write error'; break; default: - $this->error = '鏈煡涓婁紶閿欒锛'; + $this->error = 'unknown upload error'; } + + return $this; } /** - * 鑾峰彇閿欒淇℃伅 - * @return mixed + * 鑾峰彇閿欒淇℃伅锛堟敮鎸佸璇█锛 + * @access public + * @return string */ public function getError() { - return $this->error; + if (is_array($this->error)) { + list($msg, $vars) = $this->error; + } else { + $msg = $this->error; + $vars = []; + } + + return Lang::has($msg) ? Lang::get($msg, $vars) : $msg; } + /** + * 榄旀硶鏂规硶锛岃幏鍙栨枃浠剁殑 hash 鍊 + * @access public + * @param string $method 鏂规硶鍚 + * @param mixed $args 璋冪敤鍙傛暟 + * @return string + */ public function __call($method, $args) { return $this->hash($method); diff --git a/thinkphp/library/think/Hook.php b/thinkphp/library/think/Hook.php index f06196e4d..a69ce546d 100644 --- a/thinkphp/library/think/Hook.php +++ b/thinkphp/library/think/Hook.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -13,19 +13,23 @@ namespace think; class Hook { - + /** + * @var array 鏍囩 + */ private static $tags = []; /** * 鍔ㄦ佹坊鍔犺涓烘墿灞曞埌鏌愪釜鏍囩 - * @param string $tag 鏍囩鍚嶇О - * @param mixed $behavior 琛屼负鍚嶇О - * @param bool $first 鏄惁鏀惧埌寮澶存墽琛 + * @access public + * @param string $tag 鏍囩鍚嶇О + * @param mixed $behavior 琛屼负鍚嶇О + * @param bool $first 鏄惁鏀惧埌寮澶存墽琛 * @return void */ public static function add($tag, $behavior, $first = false) { isset(self::$tags[$tag]) || self::$tags[$tag] = []; + if (is_array($behavior) && !is_callable($behavior)) { if (!array_key_exists('_overlay', $behavior) || !$behavior['_overlay']) { unset($behavior['_overlay']); @@ -43,8 +47,10 @@ class Hook /** * 鎵归噺瀵煎叆鎻掍欢 - * @param array $tags 鎻掍欢淇℃伅 - * @param boolean $recursive 鏄惁閫掑綊鍚堝苟 + * @access public + * @param array $tags 鎻掍欢淇℃伅 + * @param boolean $recursive 鏄惁閫掑綊鍚堝苟 + * @return void */ public static function import(array $tags, $recursive = true) { @@ -59,55 +65,59 @@ class Hook /** * 鑾峰彇鎻掍欢淇℃伅 - * @param string $tag 鎻掍欢浣嶇疆 鐣欑┖鑾峰彇鍏ㄩ儴 + * @access public + * @param string $tag 鎻掍欢浣嶇疆(鐣欑┖鑾峰彇鍏ㄩ儴) * @return array */ public static function get($tag = '') { if (empty($tag)) { - //鑾峰彇鍏ㄩ儴鐨勬彃浠朵俊鎭 return self::$tags; - } else { - return array_key_exists($tag, self::$tags) ? self::$tags[$tag] : []; } + + return array_key_exists($tag, self::$tags) ? self::$tags[$tag] : []; } /** * 鐩戝惉鏍囩鐨勮涓 - * @param string $tag 鏍囩鍚嶇О - * @param mixed $params 浼犲叆鍙傛暟 - * @param mixed $extra 棰濆鍙傛暟 - * @param bool $once 鍙幏鍙栦竴涓湁鏁堣繑鍥炲 + * @access public + * @param string $tag 鏍囩鍚嶇О + * @param mixed $params 浼犲叆鍙傛暟 + * @param mixed $extra 棰濆鍙傛暟 + * @param bool $once 鍙幏鍙栦竴涓湁鏁堣繑鍥炲 * @return mixed */ public static function listen($tag, &$params = null, $extra = null, $once = false) { $results = []; - $tags = static::get($tag); - foreach ($tags as $key => $name) { + + foreach (static::get($tag) as $key => $name) { $results[$key] = self::exec($name, $tag, $params, $extra); - if (false === $results[$key]) { - // 濡傛灉杩斿洖false 鍒欎腑鏂涓烘墽琛 - break; - } elseif (!is_null($results[$key]) && $once) { + + // 濡傛灉杩斿洖 false锛屾垨鑰呬粎鑾峰彇涓涓湁鏁堣繑鍥炲垯涓柇琛屼负鎵ц + if (false === $results[$key] || (!is_null($results[$key]) && $once)) { break; } } + return $once ? end($results) : $results; } /** * 鎵ц鏌愪釜琛屼负 - * @param mixed $class 瑕佹墽琛岀殑琛屼负 - * @param string $tag 鏂规硶鍚嶏紙鏍囩鍚嶏級 - * @param Mixed $params 浼犱汉鐨勫弬鏁 - * @param mixed $extra 棰濆鍙傛暟 + * @access public + * @param mixed $class 瑕佹墽琛岀殑琛屼负 + * @param string $tag 鏂规硶鍚嶏紙鏍囩鍚嶏級 + * @param mixed $params 浼犱汉鐨勫弬鏁 + * @param mixed $extra 棰濆鍙傛暟 * @return mixed */ public static function exec($class, $tag = '', &$params = null, $extra = null) { App::$debug && Debug::remark('behavior_start', 'time'); + $method = Loader::parseName($tag, 1, false); + if ($class instanceof \Closure) { $result = call_user_func_array($class, [ & $params, $extra]); $class = 'Closure'; @@ -126,10 +136,12 @@ class Hook $method = ($tag && is_callable([$obj, $method])) ? $method : 'run'; $result = $obj->$method($params, $extra); } + if (App::$debug) { Debug::remark('behavior_end', 'time'); Log::record('[ BEHAVIOR ] Run ' . $class . ' @' . $tag . ' [ RunTime:' . Debug::getRangeTime('behavior_start', 'behavior_end') . 's ]', 'info'); } + return $result; } diff --git a/thinkphp/library/think/Lang.php b/thinkphp/library/think/Lang.php index 2df3767cc..a50d838de 100644 --- a/thinkphp/library/think/Lang.php +++ b/thinkphp/library/think/Lang.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -13,114 +13,148 @@ namespace think; class Lang { - // 璇█鏁版嵁 + /** + * @var array 璇█鏁版嵁 + */ private static $lang = []; - // 璇█浣滅敤鍩 - private static $range = 'zh-cn'; - // 璇█鑷姩渚︽祴鐨勫彉閲 - protected static $langDetectVar = 'lang'; - // 璇█Cookie鍙橀噺 - protected static $langCookieVar = 'think_var'; - // 璇█Cookie鐨勮繃鏈熸椂闂 - protected static $langCookieExpire = 3600; - // 鍏佽璇█鍒楄〃 - protected static $allowLangList = []; - // Accept-Language杞箟涓哄搴旇瑷鍖呭悕绉 绯荤粺榛樿閰嶇疆 - protected static $acceptLanguage = [ - 'zh-hans-cn' => 'zh-cn', - ]; - // 璁惧畾褰撳墠鐨勮瑷 + /** + * @var string 璇█浣滅敤鍩 + */ + private static $range = 'zh-cn'; + + /** + * @var string 璇█鑷姩渚︽祴鐨勫彉閲 + */ + protected static $langDetectVar = 'lang'; + + /** + * @var string 璇█ Cookie 鍙橀噺 + */ + protected static $langCookieVar = 'think_var'; + + /** + * @var int 璇█ Cookie 鐨勮繃鏈熸椂闂 + */ + protected static $langCookieExpire = 3600; + + /** + * @var array 鍏佽璇█鍒楄〃 + */ + protected static $allowLangList = []; + + /** + * @var array Accept-Language 杞箟涓哄搴旇瑷鍖呭悕绉 绯荤粺榛樿閰嶇疆 + */ + protected static $acceptLanguage = ['zh-hans-cn' => 'zh-cn']; + + /** + * 璁惧畾褰撳墠鐨勮瑷 + * @access public + * @param string $range 璇█浣滅敤鍩 + * @return string + */ public static function range($range = '') { - if ('' == $range) { - return self::$range; - } else { + if ($range) { self::$range = $range; } + return self::$range; } /** * 璁剧疆璇█瀹氫箟(涓嶅尯鍒嗗ぇ灏忓啓) - * @param string|array $name 璇█鍙橀噺 - * @param string $value 璇█鍊 - * @param string $range 璇█浣滅敤鍩 + * @access public + * @param string|array $name 璇█鍙橀噺 + * @param string $value 璇█鍊 + * @param string $range 璇█浣滅敤鍩 * @return mixed */ public static function set($name, $value = null, $range = '') { $range = $range ?: self::$range; - // 鎵归噺瀹氫箟 + if (!isset(self::$lang[$range])) { self::$lang[$range] = []; } + if (is_array($name)) { return self::$lang[$range] = array_change_key_case($name) + self::$lang[$range]; - } else { - return self::$lang[$range][strtolower($name)] = $value; } + + return self::$lang[$range][strtolower($name)] = $value; } /** * 鍔犺浇璇█瀹氫箟(涓嶅尯鍒嗗ぇ灏忓啓) - * @param string $file 璇█鏂囦欢 - * @param string $range 璇█浣滅敤鍩 + * @access public + * @param array|string $file 璇█鏂囦欢 + * @param string $range 璇█浣滅敤鍩 * @return mixed */ public static function load($file, $range = '') { $range = $range ?: self::$range; + $file = is_string($file) ? [$file] : $file; + if (!isset(self::$lang[$range])) { self::$lang[$range] = []; } - // 鎵归噺瀹氫箟 - if (is_string($file)) { - $file = [$file]; - } + $lang = []; + foreach ($file as $_file) { if (is_file($_file)) { // 璁板綍鍔犺浇淇℃伅 App::$debug && Log::record('[ LANG ] ' . $_file, 'info'); + $_lang = include $_file; + if (is_array($_lang)) { $lang = array_change_key_case($_lang) + $lang; } } } + if (!empty($lang)) { self::$lang[$range] = $lang + self::$lang[$range]; } + return self::$lang[$range]; } /** * 鑾峰彇璇█瀹氫箟(涓嶅尯鍒嗗ぇ灏忓啓) - * @param string|null $name 璇█鍙橀噺 - * @param string $range 璇█浣滅敤鍩 + * @access public + * @param string|null $name 璇█鍙橀噺 + * @param string $range 璇█浣滅敤鍩 * @return mixed */ public static function has($name, $range = '') { $range = $range ?: self::$range; + return isset(self::$lang[$range][strtolower($name)]); } /** * 鑾峰彇璇█瀹氫箟(涓嶅尯鍒嗗ぇ灏忓啓) - * @param string|null $name 璇█鍙橀噺 - * @param array $vars 鍙橀噺鏇挎崲 - * @param string $range 璇█浣滅敤鍩 + * @access public + * @param string|null $name 璇█鍙橀噺 + * @param array $vars 鍙橀噺鏇挎崲 + * @param string $range 璇█浣滅敤鍩 * @return mixed */ public static function get($name = null, $vars = [], $range = '') { $range = $range ?: self::$range; + // 绌哄弬鏁拌繑鍥炴墍鏈夊畾涔 if (empty($name)) { return self::$lang[$range]; } + $key = strtolower($name); $value = isset(self::$lang[$range][$key]) ? self::$lang[$range][$key] : $name; @@ -145,42 +179,50 @@ class Lang } } + return $value; } /** * 鑷姩渚︽祴璁剧疆鑾峰彇璇█閫夋嫨 + * @access public * @return string */ public static function detect() { - // 鑷姩渚︽祴璁剧疆鑾峰彇璇█閫夋嫨 $langSet = ''; if (isset($_GET[self::$langDetectVar])) { - // url涓缃簡璇█鍙橀噺 + // url 涓缃簡璇█鍙橀噺 $langSet = strtolower($_GET[self::$langDetectVar]); + } elseif (isset($_COOKIE[self::$langCookieVar])) { + // Cookie 涓缃簡璇█鍙橀噺 + $langSet = strtolower($_COOKIE[self::$langCookieVar]); } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { // 鑷姩渚︽祴娴忚鍣ㄨ瑷 preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches); $langSet = strtolower($matches[1]); $acceptLangs = Config::get('header_accept_lang'); + if (isset($acceptLangs[$langSet])) { $langSet = $acceptLangs[$langSet]; } elseif (isset(self::$acceptLanguage[$langSet])) { $langSet = self::$acceptLanguage[$langSet]; } } + + // 鍚堟硶鐨勮瑷 if (empty(self::$allowLangList) || in_array($langSet, self::$allowLangList)) { - // 鍚堟硶鐨勮瑷 self::$range = $langSet ?: self::$range; } + return self::$range; } /** * 璁剧疆璇█鑷姩渚︽祴鐨勫彉閲 - * @param string $var 鍙橀噺鍚嶇О + * @access public + * @param string $var 鍙橀噺鍚嶇О * @return void */ public static function setLangDetectVar($var) @@ -189,8 +231,9 @@ class Lang } /** - * 璁剧疆璇█鐨刢ookie淇濆瓨鍙橀噺 - * @param string $var 鍙橀噺鍚嶇О + * 璁剧疆璇█鐨 cookie 淇濆瓨鍙橀噺 + * @access public + * @param string $var 鍙橀噺鍚嶇О * @return void */ public static function setLangCookieVar($var) @@ -199,8 +242,9 @@ class Lang } /** - * 璁剧疆璇█鐨刢ookie鐨勮繃鏈熸椂闂 - * @param string $expire 杩囨湡鏃堕棿 + * 璁剧疆璇█鐨 cookie 鐨勮繃鏈熸椂闂 + * @access public + * @param string $expire 杩囨湡鏃堕棿 * @return void */ public static function setLangCookieExpire($expire) @@ -210,7 +254,8 @@ class Lang /** * 璁剧疆鍏佽鐨勮瑷鍒楄〃 - * @param array $list 璇█鍒楄〃 + * @access public + * @param array $list 璇█鍒楄〃 * @return void */ public static function setAllowLangList($list) diff --git a/thinkphp/library/think/Loader.php b/thinkphp/library/think/Loader.php index a0727fef5..d813a5d7b 100644 --- a/thinkphp/library/think/Loader.php +++ b/thinkphp/library/think/Loader.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -15,26 +15,57 @@ use think\exception\ClassNotFoundException; class Loader { + /** + * @var array 瀹炰緥鏁扮粍 + */ protected static $instance = []; - // 绫诲悕鏄犲皠 - protected static $map = []; - // 鍛藉悕绌洪棿鍒悕 + /** + * @var array 绫诲悕鏄犲皠 + */ + protected static $classMap = []; + + /** + * @var array 鍛藉悕绌洪棿鍒悕 + */ protected static $namespaceAlias = []; - // PSR-4 + /** + * @var array PSR-4 鍛藉悕绌洪棿鍓嶇紑闀垮害鏄犲皠 + */ private static $prefixLengthsPsr4 = []; - private static $prefixDirsPsr4 = []; - private static $fallbackDirsPsr4 = []; - // PSR-0 - private static $prefixesPsr0 = []; + /** + * @var array PSR-4 鐨勫姞杞界洰褰 + */ + private static $prefixDirsPsr4 = []; + + /** + * @var array PSR-4 鍔犺浇澶辫触鐨勫洖閫鐩綍 + */ + private static $fallbackDirsPsr4 = []; + + /** + * @var array PSR-0 鍛藉悕绌洪棿鍓嶇紑鏄犲皠 + */ + private static $prefixesPsr0 = []; + + /** + * @var array PSR-0 鍔犺浇澶辫触鐨勫洖閫鐩綍 + */ private static $fallbackDirsPsr0 = []; - // 鑷姩鍔犺浇鐨勬枃浠 - private static $autoloadFiles = []; + /** + * @var array 闇瑕佸姞杞界殑鏂囦欢 + */ + private static $files = []; - // 鑷姩鍔犺浇 + /** + * 鑷姩鍔犺浇 + * @access public + * @param string $class 绫诲悕 + * @return bool + */ public static function autoload($class) { // 妫娴嬪懡鍚嶇┖闂村埆鍚 @@ -49,33 +80,33 @@ class Loader } if ($file = self::findFile($class)) { - - // Win鐜涓ユ牸鍖哄垎澶у皬鍐 - if (IS_WIN && pathinfo($file, PATHINFO_FILENAME) != pathinfo(realpath($file), PATHINFO_FILENAME)) { - return false; + // 闈 Win 鐜涓嶄弗鏍煎尯鍒嗗ぇ灏忓啓 + if (!IS_WIN || pathinfo($file, PATHINFO_FILENAME) == pathinfo(realpath($file), PATHINFO_FILENAME)) { + __include_file($file); + return true; } - - __include_file($file); - return true; } + + return false; } /** * 鏌ユ壘鏂囦欢 - * @param $class - * @return bool + * @access private + * @param string $class 绫诲悕 + * @return bool|string */ private static function findFile($class) { - if (!empty(self::$map[$class])) { - // 绫诲簱鏄犲皠 - return self::$map[$class]; + // 绫诲簱鏄犲皠 + if (!empty(self::$classMap[$class])) { + return self::$classMap[$class]; } // 鏌ユ壘 PSR-4 $logicalPathPsr4 = strtr($class, '\\', DS) . EXT; + $first = $class[0]; - $first = $class[0]; if (isset(self::$prefixLengthsPsr4[$first])) { foreach (self::$prefixLengthsPsr4[$first] as $prefix => $length) { if (0 === strpos($class, $prefix)) { @@ -97,7 +128,7 @@ class Loader // 鏌ユ壘 PSR-0 if (false !== $pos = strrpos($class, '\\')) { - // namespaced class name + // namespace class name $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) . strtr(substr($logicalPathPsr4, $pos + 1), '_', DS); } else { @@ -124,20 +155,33 @@ class Loader } } - return self::$map[$class] = false; + // 鎵句笉鍒板垯璁剧疆鏄犲皠涓 false 骞惰繑鍥 + return self::$classMap[$class] = false; } - // 娉ㄥ唽classmap + /** + * 娉ㄥ唽 classmap + * @access public + * @param string|array $class 绫诲悕 + * @param string $map 鏄犲皠 + * @return void + */ public static function addClassMap($class, $map = '') { if (is_array($class)) { - self::$map = array_merge(self::$map, $class); + self::$classMap = array_merge(self::$classMap, $class); } else { - self::$map[$class] = $map; + self::$classMap[$class] = $map; } } - // 娉ㄥ唽鍛藉悕绌洪棿 + /** + * 娉ㄥ唽鍛藉悕绌洪棿 + * @access public + * @param string|array $namespace 鍛藉悕绌洪棿 + * @param string $path 璺緞 + * @return void + */ public static function addNamespace($namespace, $path = '') { if (is_array($namespace)) { @@ -149,84 +193,77 @@ class Loader } } - // 娣诲姞Ps0绌洪棿 + /** + * 娣诲姞 PSR-0 鍛藉悕绌洪棿 + * @access private + * @param array|string $prefix 绌洪棿鍓嶇紑 + * @param array $paths 璺緞 + * @param bool $prepend 棰勫厛璁剧疆鐨勪紭鍏堢骇鏇撮珮 + * @return void + */ private static function addPsr0($prefix, $paths, $prepend = false) { if (!$prefix) { - if ($prepend) { - self::$fallbackDirsPsr0 = array_merge( - (array) $paths, - self::$fallbackDirsPsr0 - ); - } else { - self::$fallbackDirsPsr0 = array_merge( - self::$fallbackDirsPsr0, - (array) $paths - ); - } - - return; - } - - $first = $prefix[0]; - if (!isset(self::$prefixesPsr0[$first][$prefix])) { - self::$prefixesPsr0[$first][$prefix] = (array) $paths; - - return; - } - if ($prepend) { - self::$prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, - self::$prefixesPsr0[$first][$prefix] - ); + self::$fallbackDirsPsr0 = $prepend ? + array_merge((array) $paths, self::$fallbackDirsPsr0) : + array_merge(self::$fallbackDirsPsr0, (array) $paths); } else { - self::$prefixesPsr0[$first][$prefix] = array_merge( - self::$prefixesPsr0[$first][$prefix], - (array) $paths - ); + $first = $prefix[0]; + + if (!isset(self::$prefixesPsr0[$first][$prefix])) { + self::$prefixesPsr0[$first][$prefix] = (array) $paths; + } else { + self::$prefixesPsr0[$first][$prefix] = $prepend ? + array_merge((array) $paths, self::$prefixesPsr0[$first][$prefix]) : + array_merge(self::$prefixesPsr0[$first][$prefix], (array) $paths); + } } } - // 娣诲姞Psr4绌洪棿 + /** + * 娣诲姞 PSR-4 绌洪棿 + * @access private + * @param array|string $prefix 绌洪棿鍓嶇紑 + * @param string $paths 璺緞 + * @param bool $prepend 棰勫厛璁剧疆鐨勪紭鍏堢骇鏇撮珮 + * @return void + */ private static function addPsr4($prefix, $paths, $prepend = false) { if (!$prefix) { // Register directories for the root namespace. - if ($prepend) { - self::$fallbackDirsPsr4 = array_merge( - (array) $paths, - self::$fallbackDirsPsr4 - ); - } else { - self::$fallbackDirsPsr4 = array_merge( - self::$fallbackDirsPsr4, - (array) $paths - ); - } + self::$fallbackDirsPsr4 = $prepend ? + array_merge((array) $paths, self::$fallbackDirsPsr4) : + array_merge(self::$fallbackDirsPsr4, (array) $paths); + } elseif (!isset(self::$prefixDirsPsr4[$prefix])) { // Register directories for a new namespace. $length = strlen($prefix); if ('\\' !== $prefix[$length - 1]) { - throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + throw new \InvalidArgumentException( + "A non-empty PSR-4 prefix must end with a namespace separator." + ); } + self::$prefixLengthsPsr4[$prefix[0]][$prefix] = $length; self::$prefixDirsPsr4[$prefix] = (array) $paths; - } elseif ($prepend) { - // Prepend directories for an already registered namespace. - self::$prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, - self::$prefixDirsPsr4[$prefix] - ); + } else { + self::$prefixDirsPsr4[$prefix] = $prepend ? + // Prepend directories for an already registered namespace. + array_merge((array) $paths, self::$prefixDirsPsr4[$prefix]) : // Append directories for an already registered namespace. - self::$prefixDirsPsr4[$prefix] = array_merge( - self::$prefixDirsPsr4[$prefix], - (array) $paths - ); + array_merge(self::$prefixDirsPsr4[$prefix], (array) $paths); } } - // 娉ㄥ唽鍛藉悕绌洪棿鍒悕 + /** + * 娉ㄥ唽鍛藉悕绌洪棿鍒悕 + * @access public + * @param array|string $namespace 鍛藉悕绌洪棿 + * @param string $original 婧愭枃浠 + * @return void + */ public static function addNamespaceAlias($namespace, $original = '') { if (is_array($namespace)) { @@ -236,32 +273,58 @@ class Loader } } - // 娉ㄥ唽鑷姩鍔犺浇鏈哄埗 - public static function register($autoload = '') + /** + * 娉ㄥ唽鑷姩鍔犺浇鏈哄埗 + * @access public + * @param callable $autoload 鑷姩鍔犺浇澶勭悊鏂规硶 + * @return void + */ + public static function register($autoload = null) { // 娉ㄥ唽绯荤粺鑷姩鍔犺浇 spl_autoload_register($autoload ?: 'think\\Loader::autoload', true, true); + + // Composer 鑷姩鍔犺浇鏀寔 + if (is_dir(VENDOR_PATH . 'composer')) { + if (PHP_VERSION_ID >= 50600 && is_file(VENDOR_PATH . 'composer' . DS . 'autoload_static.php')) { + require VENDOR_PATH . 'composer' . DS . 'autoload_static.php'; + + $declaredClass = get_declared_classes(); + $composerClass = array_pop($declaredClass); + + foreach (['prefixLengthsPsr4', 'prefixDirsPsr4', 'fallbackDirsPsr4', 'prefixesPsr0', 'fallbackDirsPsr0', 'classMap', 'files'] as $attr) { + if (property_exists($composerClass, $attr)) { + self::${$attr} = $composerClass::${$attr}; + } + } + } else { + self::registerComposerLoader(); + } + } + // 娉ㄥ唽鍛藉悕绌洪棿瀹氫箟 self::addNamespace([ 'think' => LIB_PATH . 'think' . DS, 'behavior' => LIB_PATH . 'behavior' . DS, 'traits' => LIB_PATH . 'traits' . DS, ]); + // 鍔犺浇绫诲簱鏄犲皠鏂囦欢 if (is_file(RUNTIME_PATH . 'classmap' . EXT)) { self::addClassMap(__include_file(RUNTIME_PATH . 'classmap' . EXT)); } - // Composer鑷姩鍔犺浇鏀寔 - if (is_dir(VENDOR_PATH . 'composer')) { - self::registerComposerLoader(); - } + self::loadComposerAutoloadFiles(); - // 鑷姩鍔犺浇extend鐩綍 + // 鑷姩鍔犺浇 extend 鐩綍 self::$fallbackDirsPsr4[] = rtrim(EXTEND_PATH, DS); } - // 娉ㄥ唽composer鑷姩鍔犺浇 + /** + * 娉ㄥ唽 composer 鑷姩鍔犺浇 + * @access private + * @return void + */ private static function registerComposerLoader() { if (is_file(VENDOR_PATH . 'composer/autoload_namespaces.php')) { @@ -286,28 +349,36 @@ class Loader } if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) { - $includeFiles = require VENDOR_PATH . 'composer/autoload_files.php'; - foreach ($includeFiles as $fileIdentifier => $file) { - if (empty(self::$autoloadFiles[$fileIdentifier])) { - __require_file($file); - self::$autoloadFiles[$fileIdentifier] = true; - } + self::$files = require VENDOR_PATH . 'composer/autoload_files.php'; + } + } + + // 鍔犺浇composer autofile鏂囦欢 + public static function loadComposerAutoloadFiles() + { + foreach (self::$files as $fileIdentifier => $file) { + if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { + __require_file($file); + + $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; } } } /** - * 瀵煎叆鎵闇鐨勭被搴 鍚宩ava鐨処mport 鏈嚱鏁版湁缂撳瓨鍔熻兘 - * @param string $class 绫诲簱鍛藉悕绌洪棿瀛楃涓 - * @param string $baseUrl 璧峰璺緞 - * @param string $ext 瀵煎叆鐨勬枃浠舵墿灞曞悕 - * @return boolean + * 瀵煎叆鎵闇鐨勭被搴 鍚 Java 鐨 Import 鏈嚱鏁版湁缂撳瓨鍔熻兘 + * @access public + * @param string $class 绫诲簱鍛藉悕绌洪棿瀛楃涓 + * @param string $baseUrl 璧峰璺緞 + * @param string $ext 瀵煎叆鐨勬枃浠舵墿灞曞悕 + * @return bool */ public static function import($class, $baseUrl = '', $ext = EXT) { static $_file = []; $key = $class . $baseUrl; $class = str_replace(['.', '#'], [DS, '.'], $class); + if (isset($_file[$key])) { return true; } @@ -319,7 +390,7 @@ class Loader // 娉ㄥ唽鐨勫懡鍚嶇┖闂 $baseUrl = self::$prefixDirsPsr4[$name . '\\']; } elseif ('@' == $name) { - //鍔犺浇褰撳墠妯″潡搴旂敤绫诲簱 + // 鍔犺浇褰撳墠妯″潡搴旂敤绫诲簱 $baseUrl = App::$modulePath; } elseif (is_dir(EXTEND_PATH . $name)) { $baseUrl = EXTEND_PATH . $name . DS; @@ -330,11 +401,11 @@ class Loader } elseif (substr($baseUrl, -1) != DS) { $baseUrl .= DS; } - // 濡傛灉绫诲瓨鍦 鍒欏鍏ョ被搴撴枃浠 + + // 濡傛灉绫诲瓨鍦ㄥ垯瀵煎叆绫诲簱鏂囦欢 if (is_array($baseUrl)) { foreach ($baseUrl as $path) { - $filename = $path . DS . $class . $ext; - if (is_file($filename)) { + if (is_file($filename = $path . DS . $class . $ext)) { break; } } @@ -342,135 +413,154 @@ class Loader $filename = $baseUrl . $class . $ext; } - if (!empty($filename) && is_file($filename)) { - // 寮鍚皟璇曟ā寮廤in鐜涓ユ牸鍖哄垎澶у皬鍐 - if (IS_WIN && pathinfo($filename, PATHINFO_FILENAME) != pathinfo(realpath($filename), PATHINFO_FILENAME)) { - return false; - } + if (!empty($filename) && + is_file($filename) && + (!IS_WIN || pathinfo($filename, PATHINFO_FILENAME) == pathinfo(realpath($filename), PATHINFO_FILENAME)) + ) { __include_file($filename); $_file[$key] = true; + return true; } + return false; } /** * 瀹炰緥鍖栵紙鍒嗗眰锛夋ā鍨 - * @param string $name Model鍚嶇О - * @param string $layer 涓氬姟灞傚悕绉 - * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 - * @param string $common 鍏叡妯″潡鍚 - * @return Object + * @access public + * @param string $name Model鍚嶇О + * @param string $layer 涓氬姟灞傚悕绉 + * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 + * @param string $common 鍏叡妯″潡鍚 + * @return object * @throws ClassNotFoundException */ public static function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common') { - $guid = $name . $layer; - if (isset(self::$instance[$guid])) { - return self::$instance[$guid]; - } - if (false !== strpos($name, '\\')) { - $class = $name; - $module = Request::instance()->module(); - } else { - if (strpos($name, '/')) { - list($module, $name) = explode('/', $name, 2); - } else { - $module = Request::instance()->module(); - } - $class = self::parseClass($module, $layer, $name, $appendSuffix); + $uid = $name . $layer; + + if (isset(self::$instance[$uid])) { + return self::$instance[$uid]; } + + list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix); + if (class_exists($class)) { $model = new $class(); } else { $class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class); + if (class_exists($class)) { $model = new $class(); } else { throw new ClassNotFoundException('class not exists:' . $class, $class); } } - self::$instance[$guid] = $model; - return $model; + + return self::$instance[$uid] = $model; } /** * 瀹炰緥鍖栵紙鍒嗗眰锛夋帶鍒跺櫒 鏍煎紡锛歔妯″潡鍚/]鎺у埗鍣ㄥ悕 - * @param string $name 璧勬簮鍦板潃 - * @param string $layer 鎺у埗灞傚悕绉 - * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 - * @param string $empty 绌烘帶鍒跺櫒鍚嶇О - * @return Object|false + * @access public + * @param string $name 璧勬簮鍦板潃 + * @param string $layer 鎺у埗灞傚悕绉 + * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 + * @param string $empty 绌烘帶鍒跺櫒鍚嶇О + * @return object * @throws ClassNotFoundException */ public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '') { - if (false !== strpos($name, '\\')) { - $class = $name; - $module = Request::instance()->module(); - } else { - if (strpos($name, '/')) { - list($module, $name) = explode('/', $name); - } else { - $module = Request::instance()->module(); - } - $class = self::parseClass($module, $layer, $name, $appendSuffix); - } + list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix); + if (class_exists($class)) { return App::invokeClass($class); - } elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) { - return new $emptyClass(Request::instance()); } + + if ($empty) { + $emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix); + + if (class_exists($emptyClass)) { + return new $emptyClass(Request::instance()); + } + } + + throw new ClassNotFoundException('class not exists:' . $class, $class); } /** * 瀹炰緥鍖栭獙璇佺被 鏍煎紡锛歔妯″潡鍚/]楠岃瘉鍣ㄥ悕 - * @param string $name 璧勬簮鍦板潃 - * @param string $layer 楠岃瘉灞傚悕绉 - * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 - * @param string $common 鍏叡妯″潡鍚 - * @return Object|false + * @access public + * @param string $name 璧勬簮鍦板潃 + * @param string $layer 楠岃瘉灞傚悕绉 + * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 + * @param string $common 鍏叡妯″潡鍚 + * @return object|false * @throws ClassNotFoundException */ public static function validate($name = '', $layer = 'validate', $appendSuffix = false, $common = 'common') { $name = $name ?: Config::get('default_validate'); + if (empty($name)) { return new Validate; } - $guid = $name . $layer; - if (isset(self::$instance[$guid])) { - return self::$instance[$guid]; - } - if (false !== strpos($name, '\\')) { - $class = $name; - $module = Request::instance()->module(); - } else { - if (strpos($name, '/')) { - list($module, $name) = explode('/', $name); - } else { - $module = Request::instance()->module(); - } - $class = self::parseClass($module, $layer, $name, $appendSuffix); + + $uid = $name . $layer; + if (isset(self::$instance[$uid])) { + return self::$instance[$uid]; } + + list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix); + if (class_exists($class)) { $validate = new $class; } else { $class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class); + if (class_exists($class)) { $validate = new $class; } else { throw new ClassNotFoundException('class not exists:' . $class, $class); } } - self::$instance[$guid] = $validate; - return $validate; + + return self::$instance[$uid] = $validate; + } + + /** + * 瑙ｆ瀽妯″潡鍜岀被鍚 + * @access protected + * @param string $name 璧勬簮鍦板潃 + * @param string $layer 楠岃瘉灞傚悕绉 + * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 + * @return array + */ + protected static function getModuleAndClass($name, $layer, $appendSuffix) + { + if (false !== strpos($name, '\\')) { + $module = Request::instance()->module(); + $class = $name; + } else { + if (strpos($name, '/')) { + list($module, $name) = explode('/', $name, 2); + } else { + $module = Request::instance()->module(); + } + + $class = self::parseClass($module, $layer, $name, $appendSuffix); + } + + return [$module, $class]; } /** * 鏁版嵁搴撳垵濮嬪寲 骞跺彇寰楁暟鎹簱绫诲疄渚 - * @param mixed $config 鏁版嵁搴撻厤缃 - * @param bool|string $name 杩炴帴鏍囪瘑 true 寮哄埗閲嶆柊杩炴帴 + * @access public + * @param mixed $config 鏁版嵁搴撻厤缃 + * @param bool|string $name 杩炴帴鏍囪瘑 true 寮哄埗閲嶆柊杩炴帴 * @return \think\db\Connection */ public static function db($config = [], $name = false) @@ -480,10 +570,11 @@ class Loader /** * 杩滅▼璋冪敤妯″潡鐨勬搷浣滄柟娉 鍙傛暟鏍煎紡 [妯″潡/鎺у埗鍣/]鎿嶄綔 - * @param string $url 璋冪敤鍦板潃 - * @param string|array $vars 璋冪敤鍙傛暟 鏀寔瀛楃涓插拰鏁扮粍 - * @param string $layer 瑕佽皟鐢ㄧ殑鎺у埗灞傚悕绉 - * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 + * @access public + * @param string $url 璋冪敤鍦板潃 + * @param string|array $vars 璋冪敤鍙傛暟 鏀寔瀛楃涓插拰鏁扮粍 + * @param string $layer 瑕佽皟鐢ㄧ殑鎺у埗灞傚悕绉 + * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 * @return mixed */ public static function action($url, $vars = [], $layer = 'controller', $appendSuffix = false) @@ -492,6 +583,7 @@ class Loader $action = $info['basename']; $module = '.' != $info['dirname'] ? $info['dirname'] : Request::instance()->controller(); $class = self::controller($module, $layer, $appendSuffix); + if ($class) { if (is_scalar($vars)) { if (strpos($vars, '=')) { @@ -500,16 +592,20 @@ class Loader $vars = [$vars]; } } + return App::invokeMethod([$class, $action . Config::get('action_suffix')], $vars); } + + return false; } /** * 瀛楃涓插懡鍚嶉鏍艰浆鎹 - * type 0 灏咼ava椋庢牸杞崲涓篊鐨勯鏍 1 灏咰椋庢牸杞崲涓篔ava鐨勯鏍 - * @param string $name 瀛楃涓 - * @param integer $type 杞崲绫诲瀷 - * @param bool $ucfirst 棣栧瓧姣嶆槸鍚﹀ぇ鍐欙紙椹煎嘲瑙勫垯锛 + * type 0 灏 Java 椋庢牸杞崲涓 C 鐨勯鏍 1 灏 C 椋庢牸杞崲涓 Java 鐨勯鏍 + * @access public + * @param string $name 瀛楃涓 + * @param integer $type 杞崲绫诲瀷 + * @param bool $ucfirst 棣栧瓧姣嶆槸鍚﹀ぇ鍐欙紙椹煎嘲瑙勫垯锛 * @return string */ public static function parseName($name, $type = 0, $ucfirst = true) @@ -518,31 +614,38 @@ class Loader $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) { return strtoupper($match[1]); }, $name); + return $ucfirst ? ucfirst($name) : lcfirst($name); - } else { - return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_")); } + + return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_")); } /** * 瑙ｆ瀽搴旂敤绫荤殑绫诲悕 - * @param string $module 妯″潡鍚 - * @param string $layer 灞傚悕 controller model ... - * @param string $name 绫诲悕 - * @param bool $appendSuffix + * @access public + * @param string $module 妯″潡鍚 + * @param string $layer 灞傚悕 controller model ... + * @param string $name 绫诲悕 + * @param bool $appendSuffix 鏄惁娣诲姞绫诲悕鍚庣紑 * @return string */ public static function parseClass($module, $layer, $name, $appendSuffix = false) { - $name = str_replace(['/', '.'], '\\', $name); - $array = explode('\\', $name); - $class = self::parseName(array_pop($array), 1) . (App::$suffix || $appendSuffix ? ucfirst($layer) : ''); + + $array = explode('\\', str_replace(['/', '.'], '\\', $name)); + $class = self::parseName(array_pop($array), 1); + $class = $class . (App::$suffix || $appendSuffix ? ucfirst($layer) : ''); $path = $array ? implode('\\', $array) . '\\' : ''; - return App::$namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $path . $class; + + return App::$namespace . '\\' . + ($module ? $module . '\\' : '') . + $layer . '\\' . $path . $class; } /** * 鍒濆鍖栫被鐨勫疄渚 + * @access public * @return void */ public static function clearInstance() @@ -551,10 +654,11 @@ class Loader } } +// 浣滅敤鑼冨洿闅旂 + /** - * 浣滅敤鑼冨洿闅旂 - * - * @param $file + * include + * @param string $file 鏂囦欢璺緞 * @return mixed */ function __include_file($file) @@ -562,6 +666,11 @@ function __include_file($file) return include $file; } +/** + * require + * @param string $file 鏂囦欢璺緞 + * @return mixed + */ function __require_file($file) { return require $file; diff --git a/thinkphp/library/think/Log.php b/thinkphp/library/think/Log.php index a20ab2629..c064306c0 100644 --- a/thinkphp/library/think/Log.php +++ b/thinkphp/library/think/Log.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -17,12 +17,12 @@ use think\exception\ClassNotFoundException; * Class Log * @package think * - * @method void log($msg) static - * @method void error($msg) static - * @method void info($msg) static - * @method void sql($msg) static - * @method void notice($msg) static - * @method void alert($msg) static + * @method void log($msg) static 璁板綍涓鑸棩蹇 + * @method void error($msg) static 璁板綍閿欒鏃ュ織 + * @method void info($msg) static 璁板綍涓鑸俊鎭棩蹇 + * @method void sql($msg) static 璁板綍 SQL 鏌ヨ鏃ュ織 + * @method void notice($msg) static 璁板綍鎻愮ず鏃ュ織 + * @method void alert($msg) static 璁板綍鎶ヨ鏃ュ織 */ class Log { @@ -34,41 +34,60 @@ class Log const ALERT = 'alert'; const DEBUG = 'debug'; - // 鏃ュ織淇℃伅 + /** + * @var array 鏃ュ織淇℃伅 + */ protected static $log = []; - // 閰嶇疆鍙傛暟 + + /** + * @var array 閰嶇疆鍙傛暟 + */ protected static $config = []; - // 鏃ュ織绫诲瀷 + + /** + * @var array 鏃ュ織绫诲瀷 + */ protected static $type = ['log', 'error', 'info', 'sql', 'notice', 'alert', 'debug']; - // 鏃ュ織鍐欏叆椹卞姩 + + /** + * @var log\driver\File|log\driver\Test|log\driver\Socket 鏃ュ織鍐欏叆椹卞姩 + */ protected static $driver; - // 褰撳墠鏃ュ織鎺堟潈key + /** + * @var string 褰撳墠鏃ュ織鎺堟潈 key + */ protected static $key; /** * 鏃ュ織鍒濆鍖 - * @param array $config + * @access public + * @param array $config 閰嶇疆鍙傛暟 + * @return void */ public static function init($config = []) { - $type = isset($config['type']) ? $config['type'] : 'File'; - $class = false !== strpos($type, '\\') ? $type : '\\think\\log\\driver\\' . ucwords($type); + $type = isset($config['type']) ? $config['type'] : 'File'; + $class = false !== strpos($type, '\\') ? $type : '\\think\\log\\driver\\' . ucwords($type); + self::$config = $config; unset($config['type']); + if (class_exists($class)) { self::$driver = new $class($config); } else { throw new ClassNotFoundException('class not exists:' . $class, $class); } + // 璁板綍鍒濆鍖栦俊鎭 App::$debug && Log::record('[ LOG ] INIT ' . $type, 'info'); } /** * 鑾峰彇鏃ュ織淇℃伅 - * @param string $type 淇℃伅绫诲瀷 - * @return array + * @access public + * @param string $type 淇℃伅绫诲瀷 + * @return array|string */ public static function getLog($type = '') { @@ -77,21 +96,22 @@ class Log /** * 璁板綍璋冭瘯淇℃伅 - * @param mixed $msg 璋冭瘯淇℃伅 - * @param string $type 淇℃伅绫诲瀷 + * @access public + * @param mixed $msg 璋冭瘯淇℃伅 + * @param string $type 淇℃伅绫诲瀷 * @return void */ public static function record($msg, $type = 'log') { self::$log[$type][] = $msg; - if (IS_CLI) { - // 鍛戒护琛屼笅闈㈡棩蹇楀啓鍏ユ敼杩 - self::save(); - } + + // 鍛戒护琛屼笅闈㈡棩蹇楀啓鍏ユ敼杩 + IS_CLI && self::save(); } /** * 娓呯┖鏃ュ織淇℃伅 + * @access public * @return void */ public static function clear() @@ -100,8 +120,9 @@ class Log } /** - * 褰撳墠鏃ュ織璁板綍鐨勬巿鏉僰ey - * @param string $key 鎺堟潈key + * 璁剧疆褰撳墠鏃ュ織璁板綍鐨勬巿鏉 key + * @access public + * @param string $key 鎺堟潈 key * @return void */ public static function key($key) @@ -111,102 +132,105 @@ class Log /** * 妫鏌ユ棩蹇楀啓鍏ユ潈闄 - * @param array $config 褰撳墠鏃ュ織閰嶇疆鍙傛暟 + * @access public + * @param array $config 褰撳墠鏃ュ織閰嶇疆鍙傛暟 * @return bool */ public static function check($config) { - if (self::$key && !empty($config['allow_key']) && !in_array(self::$key, $config['allow_key'])) { - return false; - } - return true; + return !self::$key || empty($config['allow_key']) || in_array(self::$key, $config['allow_key']); } /** * 淇濆瓨璋冭瘯淇℃伅 + * @access public * @return bool */ public static function save() { - if (!empty(self::$log)) { - if (is_null(self::$driver)) { - self::init(Config::get('log')); - } - - if (!self::check(self::$config)) { - // 妫娴嬫棩蹇楀啓鍏ユ潈闄 - return false; - } - - if (empty(self::$config['level'])) { - // 鑾峰彇鍏ㄩ儴鏃ュ織 - $log = self::$log; - if (!App::$debug && isset($log['debug'])) { - unset($log['debug']); - } - } else { - // 璁板綍鍏佽绾у埆 - $log = []; - foreach (self::$config['level'] as $level) { - if (isset(self::$log[$level])) { - $log[$level] = self::$log[$level]; - } - } - } - - $result = self::$driver->save($log); - if ($result) { - self::$log = []; - } - Hook::listen('log_write_done', $log); - return $result; + // 娌℃湁闇瑕佷繚瀛樼殑璁板綍鍒欑洿鎺ヨ繑鍥 + if (empty(self::$log)) { + return true; } - return true; + + is_null(self::$driver) && self::init(Config::get('log')); + + // 妫娴嬫棩蹇楀啓鍏ユ潈闄 + if (!self::check(self::$config)) { + return false; + } + + if (empty(self::$config['level'])) { + // 鑾峰彇鍏ㄩ儴鏃ュ織 + $log = self::$log; + if (!App::$debug && isset($log['debug'])) { + unset($log['debug']); + } + } else { + // 璁板綍鍏佽绾у埆 + $log = []; + foreach (self::$config['level'] as $level) { + if (isset(self::$log[$level])) { + $log[$level] = self::$log[$level]; + } + } + } + + if ($result = self::$driver->save($log, true)) { + self::$log = []; + } + + Hook::listen('log_write_done', $log); + + return $result; } /** * 瀹炴椂鍐欏叆鏃ュ織淇℃伅 骞舵敮鎸佽涓 - * @param mixed $msg 璋冭瘯淇℃伅 - * @param string $type 淇℃伅绫诲瀷 - * @param bool $force 鏄惁寮哄埗鍐欏叆 + * @access public + * @param mixed $msg 璋冭瘯淇℃伅 + * @param string $type 淇℃伅绫诲瀷 + * @param bool $force 鏄惁寮哄埗鍐欏叆 * @return bool */ public static function write($msg, $type = 'log', $force = false) { $log = self::$log; - // 灏佽鏃ュ織淇℃伅 - if (true === $force || empty(self::$config['level'])) { - $log[$type][] = $msg; - } elseif (in_array($type, self::$config['level'])) { - $log[$type][] = $msg; - } else { + + // 濡傛灉涓嶆槸寮哄埗鍐欏叆锛岃屼笖淇℃伅绫诲瀷涓嶅湪鍙褰曠殑绫诲埆涓垯鐩存帴杩斿洖 false 涓嶅仛璁板綍 + if (true !== $force && !empty(self::$config['level']) && !in_array($type, self::$config['level'])) { return false; } - // 鐩戝惉log_write + // 灏佽鏃ュ織淇℃伅 + $log[$type][] = $msg; + + // 鐩戝惉 log_write Hook::listen('log_write', $log); - if (is_null(self::$driver)) { - self::init(Config::get('log')); - } + + is_null(self::$driver) && self::init(Config::get('log')); + // 鍐欏叆鏃ュ織 - $result = self::$driver->save($log); - if ($result) { + if ($result = self::$driver->save($log, false)) { self::$log = []; } + return $result; } /** - * 闈欐佽皟鐢 - * @param $method - * @param $args - * @return mixed + * 闈欐佹柟娉曡皟鐢 + * @access public + * @param string $method 璋冪敤鏂规硶 + * @param mixed $args 鍙傛暟 + * @return void */ public static function __callStatic($method, $args) { if (in_array($method, self::$type)) { array_push($args, $method); - return call_user_func_array('\\think\\Log::record', $args); + + call_user_func_array('\\think\\Log::record', $args); } } diff --git a/thinkphp/library/think/Model.php b/thinkphp/library/think/Model.php index 1e76f3f90..2dc27b48a 100644 --- a/thinkphp/library/think/Model.php +++ b/thinkphp/library/think/Model.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -11,6 +11,7 @@ namespace think; +use BadMethodCallException; use InvalidArgumentException; use think\db\Query; use think\exception\ValidateException; @@ -56,6 +57,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess protected $pk; // 鏁版嵁琛ㄥ瓧娈典俊鎭 鐣欑┖鍒欒嚜鍔ㄨ幏鍙 protected $field = []; + // 鏁版嵁鎺掗櫎瀛楁 + protected $except = []; + // 鏁版嵁搴熷純瀛楁 + protected $disuse = []; // 鍙瀛楁 protected $readonly = []; // 鏄剧ず灞炴 @@ -89,6 +94,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess protected $type = []; // 鏄惁涓烘洿鏂版暟鎹 protected $isUpdate = false; + // 鏄惁浣跨敤Replace + protected $replace = false; + // 鏄惁寮哄埗鏇存柊鎵鏈夋暟鎹 + protected $force = false; // 鏇存柊鏉′欢 protected $updateWhere; // 楠岃瘉澶辫触鏄惁鎶涘嚭寮傚父 @@ -109,6 +118,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess */ protected static $initialized = []; + /** + * 鏄惁浠庝富搴撹鍙栵紙涓讳粠鍒嗗竷寮忔湁鏁堬級 + * @var array + */ + protected static $readMaster; + /** * 鏋勯犳柟娉 * @access public @@ -121,6 +136,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess } else { $this->data = $data; } + + if ($this->disuse) { + // 搴熷純瀛楁 + foreach ((array) $this->disuse as $key) { + if (array_key_exists($key, $this->data)) { + unset($this->data[$key]); + } + } + } + // 璁板綍鍘熷鏁版嵁 $this->origin = $this->data; @@ -154,6 +179,20 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $this->initialize(); } + /** + * 鏄惁浠庝富搴撹鍙栨暟鎹紙涓讳粠鍒嗗竷鏈夋晥锛 + * @access public + * @param bool $all 鏄惁鎵鏈夋ā鍨嬬敓鏁 + * @return $this + */ + public function readMaster($all = false) + { + $model = $all ? '*' : $this->class; + + static::$readMaster[$model] = true; + return $this; + } + /** * 鍒涘缓妯″瀷鐨勬煡璇㈠璞 * @access protected @@ -175,7 +214,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $con = Db::connect($connection); // 璁剧疆褰撳墠妯″瀷 纭繚鏌ヨ杩斿洖妯″瀷瀵硅薄 $queryClass = $this->query ?: $con->getConfig('query'); - $query = new $queryClass($con, $this->class); + $query = new $queryClass($con, $this); + + if (isset(static::$readMaster['*']) || isset(static::$readMaster[$this->class])) { + $query->master(true); + } // 璁剧疆褰撳墠鏁版嵁琛ㄥ拰妯″瀷鍚 if (!empty($this->table)) { @@ -191,6 +234,19 @@ abstract class Model implements \JsonSerializable, \ArrayAccess return $query; } + /** + * 鍒涘缓鏂扮殑妯″瀷瀹炰緥 + * @access public + * @param array|object $data 鏁版嵁 + * @param bool $isUpdate 鏄惁涓烘洿鏂 + * @param mixed $where 鏇存柊鏉′欢 + * @return Model + */ + public function newInstance($data = [], $isUpdate = false, $where = null) + { + return (new static($data))->isUpdate($isUpdate, $where); + } + /** * 鑾峰彇褰撳墠妯″瀷鐨勬煡璇㈠璞 * @access public @@ -261,7 +317,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess public function setParent($model) { $this->parent = $model; - return $this; } @@ -336,6 +391,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess return $this; } + /** + * 鏇存柊鏄惁寮哄埗鍐欏叆鏁版嵁 鑰屼笉鍋氭瘮杈 + * @access public + * @param bool $force + * @return $this + */ + public function force($force = true) + { + $this->force = $force; + return $this; + } + /** * 淇敼鍣 璁剧疆鏁版嵁瀵硅薄鍊 * @access public @@ -567,14 +634,19 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @access public * @param Relation $modelRelation 妯″瀷鍏宠仈瀵硅薄 * @return mixed + * @throws BadMethodCallException */ protected function getRelationData(Relation $modelRelation) { - if ($this->parent && get_class($this->parent) == $modelRelation->getModel()) { + if ($this->parent && !$modelRelation->isSelfRelation() && get_class($modelRelation->getModel()) == get_class($this->parent)) { $value = $this->parent; } else { // 棣栧厛鑾峰彇鍏宠仈鏁版嵁 - $value = $modelRelation->getRelation(); + if (method_exists($modelRelation, 'getRelation')) { + $value = $modelRelation->getRelation(); + } else { + throw new BadMethodCallException('method not exists:' . get_class($modelRelation) . '-> getRelation'); + } } return $value; } @@ -633,7 +705,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $value = empty($value) ? new \stdClass() : json_decode($value); break; case 'serialize': - $value = unserialize($value); + try { + $value = unserialize($value); + } catch (\Exception $e) { + $value = null; + } break; default: if (false !== strpos($type, '\\')) { @@ -686,7 +762,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess if (isset($this->data[$key])) { throw new Exception('bind attr has exists:' . $key); } else { - $this->data[$key] = $model->$attr; + $this->data[$key] = $model->getAttr($attr); } } } @@ -820,7 +896,29 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $relation = $this->getAttr($key); $item[$key] = $relation->append([$attr])->toArray(); } else { - $item[$name] = $this->getAttr($name); + $relation = Loader::parseName($name, 1, false); + if (method_exists($this, $relation)) { + $modelRelation = $this->$relation(); + $value = $this->getRelationData($modelRelation); + + if (method_exists($modelRelation, 'getBindAttr')) { + $bindAttr = $modelRelation->getBindAttr(); + if ($bindAttr) { + foreach ($bindAttr as $key => $attr) { + $key = is_numeric($key) ? $attr : $key; + if (isset($this->data[$key])) { + throw new Exception('bind attr has exists:' . $key); + } else { + $item[$key] = $value ? $value->getAttr($attr) : null; + } + } + continue; + } + } + $item[$name] = $value; + } else { + $item[$name] = $this->getAttr($name); + } } } } @@ -917,6 +1015,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess return false; } + /** + * 鏂板鏁版嵁鏄惁浣跨敤Replace + * @access public + * @param bool $replace + * @return $this + */ + public function replace($replace = true) + { + $this->replace = $replace; + return $this; + } + /** * 淇濆瓨褰撳墠鏁版嵁瀵硅薄 * @access public @@ -927,18 +1037,26 @@ abstract class Model implements \JsonSerializable, \ArrayAccess */ public function save($data = [], $where = [], $sequence = null) { + if (is_string($data)) { + $sequence = $data; + $data = []; + } + + // 鏁版嵁鑷姩楠岃瘉 if (!empty($data)) { - // 鏁版嵁鑷姩楠岃瘉 if (!$this->validateData($data)) { return false; } + // 鏁版嵁瀵硅薄璧嬪 foreach ($data as $key => $value) { $this->setAttr($key, $value, $data); } - if (!empty($where)) { - $this->isUpdate = true; - } + } + + if (!empty($where)) { + $this->isUpdate = true; + $this->updateWhere = $where; } // 鑷姩鍏宠仈鍐欏叆 @@ -1009,12 +1127,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess } } - if (is_string($pk) && isset($data[$pk])) { - if (!isset($where[$pk])) { - unset($where); - $where[$pk] = $data[$pk]; + $array = []; + + foreach ((array) $pk as $key) { + if (isset($data[$key])) { + $array[$key] = $data[$key]; + unset($data[$key]); } - unset($data[$pk]); + } + + if (!empty($array)) { + $where = $array; } // 妫娴嬪瓧娈 @@ -1056,16 +1179,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess // 妫娴嬪瓧娈 $allowFields = $this->checkAllowField(array_merge($this->auto, $this->insert)); if (!empty($allowFields)) { - $result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data); + $result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data, $this->replace, false, $sequence); } else { - $result = $this->getQuery()->insert($this->data); + $result = $this->getQuery()->insert($this->data, $this->replace, false, $sequence); } // 鑾峰彇鑷姩澧為暱涓婚敭 - if ($result && is_string($pk) && (!isset($this->data[$pk]) || '' == $this->data[$pk])) { - $insertId = $this->getQuery()->getLastInsID($sequence); - if ($insertId) { - $this->data[$pk] = $insertId; + if ($result && $insertId = $this->getQuery()->getLastInsID($sequence)) { + foreach ((array) $pk as $key) { + if (!isset($this->data[$key]) || '' == $this->data[$key]) { + $this->data[$key] = $insertId; + } } } @@ -1099,11 +1223,21 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $field = $this->field; } elseif (!empty($this->field)) { $field = array_merge($this->field, $auto); + if ($this->autoWriteTimestamp) { + array_push($field, $this->createTime, $this->updateTime); + } + } elseif (!empty($this->except)) { + $fields = $this->getQuery()->getTableInfo('', 'fields'); + $field = array_diff($fields, (array) $this->except); + $this->field = $field; } else { $field = []; - } + if ($this->disuse) { + // 搴熷純瀛楁 + $field = array_diff($field, (array) $this->disuse); + } return $field; } @@ -1129,12 +1263,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess */ public function getChangedData() { - $data = array_udiff_assoc($this->data, $this->origin, function ($a, $b) { - if ((empty($b) || empty($b)) && $a !== $b) { - return 1; - } - return is_object($a) || $a != $b ? 1 : 0; - }); + if ($this->force) { + $data = $this->data; + } else { + $data = array_udiff_assoc($this->data, $this->origin, function ($a, $b) { + if ((empty($a) || empty($b)) && $a !== $b) { + return 1; + } + return is_object($a) || $a != $b ? 1 : 0; + }); + } if (!empty($this->readonly)) { // 鍙瀛楁涓嶅厑璁告洿鏂 @@ -1159,16 +1297,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess */ public function setInc($field, $step = 1, $lazyTime = 0) { - // 鍒犻櫎鏉′欢 - $pk = $this->getPk(); - - if (is_string($pk) && isset($this->data[$pk])) { - $where = [$pk => $this->data[$pk]]; - } elseif (!empty($this->updateWhere)) { - $where = $this->updateWhere; - } else { - $where = null; - } + // 鏇存柊鏉′欢 + $where = $this->getWhere(); $result = $this->getQuery()->where($where)->setInc($field, $step, $lazyTime); if (true !== $result) { @@ -1188,6 +1318,23 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @throws Exception */ public function setDec($field, $step = 1, $lazyTime = 0) + { + // 鏇存柊鏉′欢 + $where = $this->getWhere(); + $result = $this->getQuery()->where($where)->setDec($field, $step, $lazyTime); + if (true !== $result) { + $this->data[$field] -= $step; + } + + return $result; + } + + /** + * 鑾峰彇鏇存柊鏉′欢 + * @access protected + * @return mixed + */ + protected function getWhere() { // 鍒犻櫎鏉′欢 $pk = $this->getPk(); @@ -1199,13 +1346,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess } else { $where = null; } - - $result = $this->getQuery()->where($where)->setDec($field, $step, $lazyTime); - if (true !== $result) { - $this->data[$field] -= $step; - } - - return $result; + return $where; } /** @@ -1237,14 +1378,14 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $auto = true; } foreach ($dataSet as $key => $data) { - if (!empty($auto) && isset($data[$pk])) { + if ($this->isUpdate || (!empty($auto) && isset($data[$pk]))) { $result[$key] = self::update($data, [], $this->field); } else { $result[$key] = self::create($data, $this->field); } } $db->commit(); - return $result; + return $this->toCollection($result); } catch (\Exception $e) { $db->rollback(); throw $e; @@ -1254,7 +1395,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess /** * 璁剧疆鍏佽鍐欏叆鐨勫瓧娈 * @access public - * @param mixed $field 鍏佽鍐欏叆鐨勫瓧娈 濡傛灉涓簍rue鍙厑璁稿啓鍏ユ暟鎹〃瀛楁 + * @param string|array $field 鍏佽鍐欏叆鐨勫瓧娈 濡傛灉涓簍rue鍙厑璁稿啓鍏ユ暟鎹〃瀛楁 * @return $this */ public function allowField($field) @@ -1266,6 +1407,21 @@ abstract class Model implements \JsonSerializable, \ArrayAccess return $this; } + /** + * 璁剧疆鎺掗櫎鍐欏叆鐨勫瓧娈 + * @access public + * @param string|array $field 鎺掗櫎鍏佽鍐欏叆鐨勫瓧娈 + * @return $this + */ + public function except($field) + { + if (is_string($field)) { + $field = explode(',', $field); + } + $this->except = $field; + return $this; + } + /** * 璁剧疆鍙瀛楁 * @access public @@ -1333,14 +1489,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess } // 鍒犻櫎鏉′欢 - $pk = $this->getPk(); - if (is_string($pk) && isset($this->data[$pk])) { - $where = [$pk => $this->data[$pk]]; - } elseif (!empty($this->updateWhere)) { - $where = $this->updateWhere; - } else { - $where = null; - } + $where = $this->getWhere(); // 鍒犻櫎褰撳墠妯″瀷鏁版嵁 $result = $this->getQuery()->where($where)->delete(); @@ -1611,14 +1760,14 @@ abstract class Model implements \JsonSerializable, \ArrayAccess { $model = new static(); $query = $model->db(); - if (is_array($data) && key($data) !== 0) { + if (empty($data) && 0 !== $data) { + return 0; + } elseif (is_array($data) && key($data) !== 0) { $query->where($data); $data = null; } elseif ($data instanceof \Closure) { call_user_func_array($data, [ & $query]); $data = null; - } elseif (empty($data) && 0 !== $data) { - return 0; } $resultSet = $query->select($data); $count = 0; @@ -1665,7 +1814,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * 璁剧疆鏄惁浣跨敤鍏ㄥ眬鏌ヨ鑼冨洿 * @param bool $use 鏄惁鍚敤鍏ㄥ眬鏌ヨ鑼冨洿 * @access public - * @return Model + * @return Query */ public static function useGlobalScope($use) { @@ -1694,13 +1843,14 @@ abstract class Model implements \JsonSerializable, \ArrayAccess /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param string $relation 鍏宠仈鏂规硶鍚 - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param string $relation 鍏宠仈鏂规硶鍚 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Relation|Query */ - public static function hasWhere($relation, $where = []) + public static function hasWhere($relation, $where = [], $fields = null) { - return (new static())->$relation()->hasWhere($where); + return (new static())->$relation()->hasWhere($where, $fields); } /** @@ -1857,7 +2007,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @access public * @param string $model 妯″瀷鍚 * @param string $foreignKey 鍏宠仈澶栭敭 - * @param string $localKey 鍏宠仈涓婚敭 + * @param string $localKey 褰撳墠妯″瀷涓婚敭 * @param array $alias 鍒悕瀹氫箟锛堝凡缁忓簾寮冿級 * @param string $joinType JOIN绫诲瀷 * @return HasOne @@ -1897,7 +2047,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @access public * @param string $model 妯″瀷鍚 * @param string $foreignKey 鍏宠仈澶栭敭 - * @param string $localKey 鍏宠仈涓婚敭 + * @param string $localKey 褰撳墠妯″瀷涓婚敭 * @return HasMany */ public function hasMany($model, $foreignKey = '', $localKey = '') @@ -1916,7 +2066,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @param string $through 涓棿妯″瀷鍚 * @param string $foreignKey 鍏宠仈澶栭敭 * @param string $throughKey 鍏宠仈澶栭敭 - * @param string $localKey 鍏宠仈涓婚敭 + * @param string $localKey 褰撳墠妯″瀷涓婚敭 * @return HasManyThrough */ public function hasManyThrough($model, $through, $foreignKey = '', $throughKey = '', $localKey = '') @@ -1966,7 +2116,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $trace = debug_backtrace(false, 2); $morph = Loader::parseName($trace[1]['function']); } - $type = $type ?: Loader::parseName($this->name); + $type = $type ?: get_class($this); if (is_array($morph)) { list($morphType, $foreignKey) = $morph; } else { @@ -1992,7 +2142,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $trace = debug_backtrace(false, 2); $morph = Loader::parseName($trace[1]['function']); } - $type = $type ?: Loader::parseName($this->name); + $type = $type ?: get_class($this); if (is_array($morph)) { list($morphType, $foreignKey) = $morph; } else { @@ -2030,7 +2180,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess public function __call($method, $args) { $query = $this->db(true, false); - if (method_exists($this, 'scope' . $method)) { // 鍔ㄦ佽皟鐢ㄥ懡鍚嶈寖鍥 $method = 'scope' . $method; @@ -2046,7 +2195,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess { $model = new static(); $query = $model->db(); - if (method_exists($model, 'scope' . $method)) { // 鍔ㄦ佽皟鐢ㄥ懡鍚嶈寖鍥 $method = 'scope' . $method; diff --git a/thinkphp/library/think/Paginator.php b/thinkphp/library/think/Paginator.php index 5a8fa20e0..365556784 100644 --- a/thinkphp/library/think/Paginator.php +++ b/thinkphp/library/think/Paginator.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -49,6 +49,9 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J 'fragment' => '', ]; + /** @var mixed simple妯″紡涓嬬殑涓嬩釜鍏冪礌 */ + protected $nextItem; + public function __construct($items, $listRows, $currentPage = null, $total = null, $simple = false, $options = []) { $this->options = array_merge($this->options, $options); @@ -65,7 +68,10 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J if ($simple) { $this->currentPage = $this->setCurrentPage($currentPage); $this->hasMore = count($items) > ($this->listRows); - $items = $items->slice(0, $this->listRows); + if ($this->hasMore) { + $this->nextItem = $items->slice($this->listRows, 1); + } + $items = $items->slice(0, $this->listRows); } else { $this->total = $total; $this->lastPage = (int) ceil($total / $listRows); @@ -122,7 +128,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J } $url = $path; if (!empty($parameters)) { - $url .= '?' . urldecode(http_build_query($parameters, null, '&')); + $url .= '?' . http_build_query($parameters, null, '&'); } return $url . $this->buildFragment(); } @@ -135,9 +141,9 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J */ public static function getCurrentPage($varPage = 'page', $default = 1) { - $page = Request::instance()->request($varPage); + $page = (int) Request::instance()->param($varPage); - if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int) $page >= 1) { + if (filter_var($page, FILTER_VALIDATE_INT) !== false && $page >= 1) { return $page; } @@ -282,8 +288,11 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J public function each(callable $callback) { foreach ($this->items as $key => $item) { - if ($callback($item, $key) === false) { + $result = $callback($item, $key); + if (false === $result) { break; + } elseif (!is_object($item)) { + $this->items[$key] = $result; } } @@ -356,19 +365,24 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J public function toArray() { - try { - $total = $this->total(); - } catch (\DomainException $e) { - $total = null; + if ($this->simple) { + return [ + 'per_page' => $this->listRows, + 'current_page' => $this->currentPage, + 'has_more' => $this->hasMore, + 'next_item' => $this->nextItem, + 'data' => $this->items->toArray(), + ]; + } else { + return [ + 'total' => $this->total, + 'per_page' => $this->listRows, + 'current_page' => $this->currentPage, + 'last_page' => $this->lastPage, + 'data' => $this->items->toArray(), + ]; } - return [ - 'total' => $total, - 'per_page' => $this->listRows(), - 'current_page' => $this->currentPage(), - 'last_page' => $this->lastPage, - 'data' => $this->items->toArray(), - ]; } /** @@ -381,7 +395,15 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J public function __call($name, $arguments) { - return call_user_func_array([$this->getCollection(), $name], $arguments); + $collection = $this->getCollection(); + + $result = call_user_func_array([$collection, $name], $arguments); + + if ($result === $collection) { + return $this; + } + + return $result; } } diff --git a/thinkphp/library/think/Request.php b/thinkphp/library/think/Request.php index 7e9949a8e..5997a763a 100644 --- a/thinkphp/library/think/Request.php +++ b/thinkphp/library/think/Request.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -59,6 +59,11 @@ class Request */ protected $routeInfo = []; + /** + * @var array 鐜鍙橀噺 + */ + protected $env; + /** * @var array 褰撳墠璋冨害淇℃伅 */ @@ -116,6 +121,11 @@ class Request protected $cache; // 缂撳瓨鏄惁妫鏌 protected $isCheckCache; + /** + * 鏄惁鍚堝苟Param + * @var bool + */ + protected $mergeParam = false; /** * 鏋勯犲嚱鏁 @@ -150,8 +160,8 @@ class Request /** * Hook 鏂规硶娉ㄥ叆 * @access public - * @param string|array $method 鏂规硶鍚 - * @param mixed $callback callable + * @param string|array $method 鏂规硶鍚 + * @param mixed $callback callable * @return void */ public static function hook($method, $callback = null) @@ -177,16 +187,28 @@ class Request return self::$instance; } + /** + * 閿姣佸綋鍓嶈姹傚璞 + * @access public + * @return void + */ + public static function destroy() + { + if (!is_null(self::$instance)) { + self::$instance = null; + } + } + /** * 鍒涘缓涓涓猆RL璇锋眰 * @access public - * @param string $uri URL鍦板潃 - * @param string $method 璇锋眰绫诲瀷 - * @param array $params 璇锋眰鍙傛暟 - * @param array $cookie - * @param array $files - * @param array $server - * @param string $content + * @param string $uri URL鍦板潃 + * @param string $method 璇锋眰绫诲瀷 + * @param array $params 璇锋眰鍙傛暟 + * @param array $cookie + * @param array $files + * @param array $server + * @param string $content * @return \think\Request */ public static function create($uri, $method = 'GET', $params = [], $cookie = [], $files = [], $server = [], $content = null) @@ -227,7 +249,7 @@ class Request parse_str(html_entity_decode($info['query']), $query); if (!empty($params)) { $params = array_replace($query, $params); - $queryString = http_build_query($query, '', '&'); + $queryString = http_build_query($params, '', '&'); } else { $params = $query; $queryString = $info['query']; @@ -474,8 +496,8 @@ class Request /** * 璁剧疆璧勬簮绫诲瀷 * @access public - * @param string|array $type 璧勬簮绫诲瀷鍚 - * @param string $val 璧勬簮绫诲瀷 + * @param string|array $type 璧勬簮绫诲瀷鍚 + * @param string $val 璧勬簮绫诲瀷 * @return void */ public function mimeType($type, $val = '') @@ -490,22 +512,28 @@ class Request /** * 褰撳墠鐨勮姹傜被鍨 * @access public - * @param bool $method true 鑾峰彇鍘熷璇锋眰绫诲瀷 + * @param bool $method true 鑾峰彇鍘熷璇锋眰绫诲瀷 * @return string */ public function method($method = false) { if (true === $method) { // 鑾峰彇鍘熷璇锋眰绫诲瀷 - return IS_CLI ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']); + return $this->server('REQUEST_METHOD') ?: 'GET'; } elseif (!$this->method) { if (isset($_POST[Config::get('var_method')])) { - $this->method = strtoupper($_POST[Config::get('var_method')]); - $this->{$this->method}($_POST); + $method = strtoupper($_POST[Config::get('var_method')]); + if (in_array($method, ['GET', 'POST', 'DELETE', 'PUT', 'PATCH'])) { + $this->method = $method; + $this->{$this->method}($_POST); + } else { + $this->method = 'POST'; + } + unset($_POST[Config::get('var_method')]); } elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) { $this->method = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']); } else { - $this->method = IS_CLI ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']); + $this->method = $this->server('REQUEST_METHOD') ?: 'GET'; } } return $this->method; @@ -604,14 +632,14 @@ class Request /** * 鑾峰彇褰撳墠璇锋眰鐨勫弬鏁 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function param($name = '', $default = null, $filter = '') { - if (empty($this->param)) { + if (empty($this->mergeParam)) { $method = $this->method(true); // 鑷姩鑾峰彇璇锋眰鍙橀噺 switch ($method) { @@ -627,7 +655,8 @@ class Request $vars = []; } // 褰撳墠璇锋眰鍙傛暟鍜孶RL鍦板潃涓殑鍙傛暟鍚堝苟 - $this->param = array_merge($this->get(false), $vars, $this->route(false)); + $this->param = array_merge($this->param, $this->get(false), $vars, $this->route(false)); + $this->mergeParam = true; } if (true === $name) { // 鑾峰彇鍖呭惈鏂囦欢涓婁紶淇℃伅鐨勬暟缁 @@ -641,15 +670,16 @@ class Request /** * 璁剧疆鑾峰彇璺敱鍙傛暟 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function route($name = '', $default = null, $filter = '') { if (is_array($name)) { $this->param = []; + $this->mergeParam = false; return $this->route = array_merge($this->route, $name); } return $this->input($this->route, $name, $default, $filter); @@ -658,9 +688,9 @@ class Request /** * 璁剧疆鑾峰彇GET鍙傛暟 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function get($name = '', $default = null, $filter = '') @@ -670,6 +700,7 @@ class Request } if (is_array($name)) { $this->param = []; + $this->mergeParam = false; return $this->get = array_merge($this->get, $name); } return $this->input($this->get, $name, $default, $filter); @@ -678,9 +709,9 @@ class Request /** * 璁剧疆鑾峰彇POST鍙傛暟 * @access public - * @param string $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function post($name = '', $default = null, $filter = '') @@ -695,6 +726,7 @@ class Request } if (is_array($name)) { $this->param = []; + $this->mergeParam = false; return $this->post = array_merge($this->post, $name); } return $this->input($this->post, $name, $default, $filter); @@ -703,9 +735,9 @@ class Request /** * 璁剧疆鑾峰彇PUT鍙傛暟 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function put($name = '', $default = null, $filter = '') @@ -720,6 +752,7 @@ class Request } if (is_array($name)) { $this->param = []; + $this->mergeParam = false; return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name); } @@ -729,9 +762,9 @@ class Request /** * 璁剧疆鑾峰彇DELETE鍙傛暟 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function delete($name = '', $default = null, $filter = '') @@ -742,9 +775,9 @@ class Request /** * 璁剧疆鑾峰彇PATCH鍙傛暟 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鍙橀噺鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function patch($name = '', $default = null, $filter = '') @@ -754,9 +787,9 @@ class Request /** * 鑾峰彇request鍙橀噺 - * @param string $name 鏁版嵁鍚嶇О - * @param string $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string $name 鏁版嵁鍚嶇О + * @param string $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function request($name = '', $default = null, $filter = '') @@ -766,6 +799,7 @@ class Request } if (is_array($name)) { $this->param = []; + $this->mergeParam = false; return $this->request = array_merge($this->request, $name); } return $this->input($this->request, $name, $default, $filter); @@ -774,9 +808,9 @@ class Request /** * 鑾峰彇session鏁版嵁 * @access public - * @param string|array $name 鏁版嵁鍚嶇О - * @param string $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鏁版嵁鍚嶇О + * @param string $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function session($name = '', $default = null, $filter = '') @@ -793,9 +827,9 @@ class Request /** * 鑾峰彇cookie鍙傛暟 * @access public - * @param string|array $name 鏁版嵁鍚嶇О - * @param string $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鏁版嵁鍚嶇О + * @param string $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function cookie($name = '', $default = null, $filter = '') @@ -826,9 +860,9 @@ class Request /** * 鑾峰彇server鍙傛暟 * @access public - * @param string|array $name 鏁版嵁鍚嶇О - * @param string $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鏁版嵁鍚嶇О + * @param string $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function server($name = '', $default = null, $filter = '') @@ -904,9 +938,9 @@ class Request /** * 鑾峰彇鐜鍙橀噺 - * @param string|array $name 鏁版嵁鍚嶇О - * @param string $default 榛樿鍊 - * @param string|array $filter 杩囨护鏂规硶 + * @param string|array $name 鏁版嵁鍚嶇О + * @param string $default 榛樿鍊 + * @param string|array $filter 杩囨护鏂规硶 * @return mixed */ public function env($name = '', $default = null, $filter = '') @@ -923,8 +957,8 @@ class Request /** * 璁剧疆鎴栬呰幏鍙栧綋鍓嶇殑Header * @access public - * @param string|array $name header鍚嶇О - * @param string $default 榛樿鍊 + * @param string|array $name header鍚嶇О + * @param string $default 榛樿鍊 * @return string */ public function header($name = '', $default = null) @@ -962,10 +996,10 @@ class Request /** * 鑾峰彇鍙橀噺 鏀寔杩囨护鍜岄粯璁ゅ - * @param array $data 鏁版嵁婧 - * @param string|false $name 瀛楁鍚 - * @param mixed $default 榛樿鍊 - * @param string|array $filter 杩囨护鍑芥暟 + * @param array $data 鏁版嵁婧 + * @param string|false $name 瀛楁鍚 + * @param mixed $default 榛樿鍊 + * @param string|array $filter 杩囨护鍑芥暟 * @return mixed */ public function input($data = [], $name = '', $default = null, $filter = '') @@ -1046,9 +1080,9 @@ class Request /** * 閫掑綊杩囨护缁欏畾鐨勫 - * @param mixed $value 閿 - * @param mixed $key 閿悕 - * @param array $filters 杩囨护鏂规硶+榛樿鍊 + * @param mixed $value 閿 + * @param mixed $key 閿悕 + * @param array $filters 杩囨护鏂规硶+榛樿鍊 * @return mixed */ private function filterValue(&$value, $key, $filters) @@ -1088,7 +1122,7 @@ class Request public function filterExp(&$value) { // 杩囨护鏌ヨ鐗规畩瀛楃 - if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) { + if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT LIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOT EXISTS|NOTEXISTS|EXISTS|NOT NULL|NOTNULL|NULL|BETWEEN TIME|NOT BETWEEN TIME|NOTBETWEEN TIME|NOTIN|NOT IN|IN)$/i', $value)) { $value .= ' '; } // TODO 鍏朵粬瀹夊叏杩囨护 @@ -1133,9 +1167,9 @@ class Request /** * 鏄惁瀛樺湪鏌愪釜璇锋眰鍙傛暟 * @access public - * @param string $name 鍙橀噺鍚 - * @param string $type 鍙橀噺绫诲瀷 - * @param bool $checkEmpty 鏄惁妫娴嬬┖鍊 + * @param string $name 鍙橀噺鍚 + * @param string $type 鍙橀噺绫诲瀷 + * @param bool $checkEmpty 鏄惁妫娴嬬┖鍊 * @return mixed */ public function has($name, $type = 'param', $checkEmpty = false) @@ -1159,8 +1193,8 @@ class Request /** * 鑾峰彇鎸囧畾鐨勫弬鏁 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param string $type 鍙橀噺绫诲瀷 + * @param string|array $name 鍙橀噺鍚 + * @param string $type 鍙橀噺绫诲瀷 * @return mixed */ public function only($name, $type = 'param') @@ -1181,8 +1215,8 @@ class Request /** * 鎺掗櫎鎸囧畾鍙傛暟鑾峰彇 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param string $type 鍙橀噺绫诲瀷 + * @param string|array $name 鍙橀噺鍚 + * @param string $type 鍙橀噺绫诲瀷 * @return mixed */ public function except($name, $type = 'param') @@ -1224,7 +1258,7 @@ class Request /** * 褰撳墠鏄惁Ajax璇锋眰 * @access public - * @param bool $ajax true 鑾峰彇鍘熷ajax璇锋眰 + * @param bool $ajax true 鑾峰彇鍘熷ajax璇锋眰 * @return bool */ public function isAjax($ajax = false) @@ -1234,14 +1268,16 @@ class Request if (true === $ajax) { return $result; } else { - return $this->param(Config::get('var_ajax')) ? true : $result; + $result = $this->param(Config::get('var_ajax')) ? true : $result; + $this->mergeParam = false; + return $result; } } /** * 褰撳墠鏄惁Pjax璇锋眰 * @access public - * @param bool $pjax true 鑾峰彇鍘熷pjax璇锋眰 + * @param bool $pjax true 鑾峰彇鍘熷pjax璇锋眰 * @return bool */ public function isPjax($pjax = false) @@ -1250,17 +1286,19 @@ class Request if (true === $pjax) { return $result; } else { - return $this->param(Config::get('var_pjax')) ? true : $result; + $result = $this->param(Config::get('var_pjax')) ? true : $result; + $this->mergeParam = false; + return $result; } } /** * 鑾峰彇瀹㈡埛绔疘P鍦板潃 - * @param integer $type 杩斿洖绫诲瀷 0 杩斿洖IP鍦板潃 1 杩斿洖IPV4鍦板潃鏁板瓧 - * @param boolean $adv 鏄惁杩涜楂樼骇妯″紡鑾峰彇锛堟湁鍙兘琚吉瑁咃級 + * @param integer $type 杩斿洖绫诲瀷 0 杩斿洖IP鍦板潃 1 杩斿洖IPV4鍦板潃鏁板瓧 + * @param boolean $adv 鏄惁杩涜楂樼骇妯″紡鑾峰彇锛堟湁鍙兘琚吉瑁咃級 * @return mixed */ - public function ip($type = 0, $adv = false) + public function ip($type = 0, $adv = true) { $type = $type ? 1 : 0; static $ip = null; @@ -1268,7 +1306,11 @@ class Request return $ip[$type]; } - if ($adv) { + $httpAgentIp = Config::get('http_agent_ip'); + + if ($httpAgentIp && isset($_SERVER[$httpAgentIp])) { + $ip = $_SERVER[$httpAgentIp]; + } elseif ($adv) { if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); $pos = array_search('unknown', $arr); @@ -1333,11 +1375,18 @@ class Request /** * 褰撳墠璇锋眰鐨刪ost * @access public + * @param bool $strict true 浠呬粎鑾峰彇HOST * @return string */ - public function host() + public function host($strict = false) { - return $this->server('HTTP_HOST'); + if (isset($_SERVER['HTTP_X_REAL_HOST'])) { + $host = $_SERVER['HTTP_X_REAL_HOST']; + } else { + $host = $this->server('HTTP_HOST'); + } + + return true === $strict && strpos($host, ':') ? strstr($host, ':', true) : $host; } /** @@ -1407,7 +1456,7 @@ class Request /** * 璁剧疆鎴栬呰幏鍙栧綋鍓嶈姹傜殑璋冨害淇℃伅 * @access public - * @param array $dispatch 璋冨害淇℃伅 + * @param array $dispatch 璋冨害淇℃伅 * @return array */ public function dispatch($dispatch = null) @@ -1458,11 +1507,12 @@ class Request */ public function action($action = null) { - if (!is_null($action)) { + if (!is_null($action) && !is_bool($action)) { $this->action = $action; return $this; } else { - return $this->action ?: ''; + $name = $this->action ?: ''; + return true === $action ? $name : strtolower($name); } } @@ -1526,13 +1576,19 @@ class Request /** * 璁剧疆褰撳墠鍦板潃鐨勮姹傜紦瀛 * @access public - * @param string $key 缂撳瓨鏍囪瘑锛屾敮鎸佸彉閲忚鍒 锛屼緥濡 item/:name/:id + * @param string $key 缂撳瓨鏍囪瘑锛屾敮鎸佸彉閲忚鍒 锛屼緥濡 item/:name/:id * @param mixed $expire 缂撳瓨鏈夋晥鏈 * @param array $except 缂撳瓨鎺掗櫎 + * @param string $tag 缂撳瓨鏍囩 * @return void */ - public function cache($key, $expire = null, $except = []) + public function cache($key, $expire = null, $except = [], $tag = null) { + if (!is_array($except)) { + $tag = $except; + $except = []; + } + if (false !== $key && $this->isGet() && !$this->isCheckCache) { // 鏍囪璇锋眰缂撳瓨妫鏌 $this->isCheckCache = true; @@ -1586,7 +1642,7 @@ class Request $response = Response::create($content)->header($header); throw new \think\exception\HttpResponseException($response); } else { - $this->cache = [$key, $expire]; + $this->cache = [$key, $expire, $tag]; } } } @@ -1604,8 +1660,8 @@ class Request /** * 璁剧疆褰撳墠璇锋眰缁戝畾鐨勫璞″疄渚 * @access public - * @param string $name 缁戝畾鐨勫璞℃爣璇 - * @param mixed $obj 缁戝畾鐨勫璞″疄渚 + * @param string|array $name 缁戝畾鐨勫璞℃爣璇 + * @param mixed $obj 缁戝畾鐨勫璞″疄渚 * @return mixed */ public function bind($name, $obj = null) diff --git a/thinkphp/library/think/Response.php b/thinkphp/library/think/Response.php index 7ae9fed7c..c5c152093 100644 --- a/thinkphp/library/think/Response.php +++ b/thinkphp/library/think/Response.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -69,9 +69,7 @@ class Response */ public static function create($data = '', $type = '', $code = 200, array $header = [], $options = []) { - $type = empty($type) ? 'null' : strtolower($type); - - $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst($type); + $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type)); if (class_exists($class)) { $response = new $class($data, $code, $header, $options); } else { @@ -106,7 +104,7 @@ class Response $this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate'; $this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT'; $this->header['Expires'] = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT'; - Cache::set($cache[0], [$data, $this->header], $cache[1]); + Cache::tag($cache[2])->set($cache[0], [$data, $this->header], $cache[1]); } } diff --git a/thinkphp/library/think/Route.php b/thinkphp/library/think/Route.php index 59b154328..ab53aa200 100644 --- a/thinkphp/library/think/Route.php +++ b/thinkphp/library/think/Route.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -68,8 +68,8 @@ class Route /** * 娉ㄥ唽鍙橀噺瑙勫垯 * @access public - * @param string|array $name 鍙橀噺鍚 - * @param string $rule 鍙橀噺瑙勫垯 + * @param string|array $name 鍙橀噺鍚 + * @param string $rule 鍙橀噺瑙勫垯 * @return void */ public static function pattern($name = null, $rule = '') @@ -84,10 +84,10 @@ class Route /** * 娉ㄥ唽瀛愬煙鍚嶉儴缃茶鍒 * @access public - * @param string|array $domain 瀛愬煙鍚 - * @param mixed $rule 璺敱瑙勫垯 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $domain 瀛愬煙鍚 + * @param mixed $rule 璺敱瑙勫垯 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function domain($domain, $rule = '', $option = [], $pattern = []) @@ -121,8 +121,8 @@ class Route /** * 璁剧疆璺敱缁戝畾 * @access public - * @param mixed $bind 缁戝畾淇℃伅 - * @param string $type 缁戝畾绫诲瀷 榛樿涓簃odule 鏀寔 namespace class controller + * @param mixed $bind 缁戝畾淇℃伅 + * @param string $type 缁戝畾绫诲瀷 榛樿涓簃odule 鏀寔 namespace class controller * @return mixed */ public static function bind($bind, $type = 'module') @@ -133,8 +133,8 @@ class Route /** * 璁剧疆鎴栬呰幏鍙栬矾鐢辨爣璇 * @access public - * @param string|array $name 璺敱鍛藉悕鏍囪瘑 鏁扮粍琛ㄧず鎵归噺璁剧疆 - * @param array $value 璺敱鍦板潃鍙婂彉閲忎俊鎭 + * @param string|array $name 璺敱鍛藉悕鏍囪瘑 鏁扮粍琛ㄧず鎵归噺璁剧疆 + * @param array $value 璺敱鍦板潃鍙婂彉閲忎俊鎭 * @return array */ public static function name($name = '', $value = null) @@ -154,7 +154,7 @@ class Route /** * 璇诲彇璺敱缁戝畾 * @access public - * @param string $type 缁戝畾绫诲瀷 + * @param string $type 缁戝畾绫诲瀷 * @return mixed */ public static function getBind($type) @@ -165,8 +165,8 @@ class Route /** * 瀵煎叆閰嶇疆鏂囦欢鐨勮矾鐢辫鍒 * @access public - * @param array $rule 璺敱瑙勫垯 - * @param string $type 璇锋眰绫诲瀷 + * @param array $rule 璺敱瑙勫垯 + * @param string $type 璇锋眰绫诲瀷 * @return void */ public static function import(array $rule, $type = '*') @@ -222,11 +222,11 @@ class Route /** * 娉ㄥ唽璺敱瑙勫垯 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param string $type 璇锋眰绫诲瀷 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param string $type 璇锋眰绫诲瀷 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = []) @@ -255,9 +255,11 @@ class Route $option1 = array_merge($option, $val[1]); $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []); } else { - $route = $val; + $option1 = null; + $pattern1 = null; + $route = $val; } - self::setRule($key, $route, $type, isset($option1) ? $option1 : $option, isset($pattern1) ? $pattern1 : $pattern, $group); + self::setRule($key, $route, $type, !is_null($option1) ? $option1 : $option, !is_null($pattern1) ? $pattern1 : $pattern, $group); } } else { self::setRule($rule, $route, $type, $option, $pattern, $group); @@ -268,12 +270,12 @@ class Route /** * 璁剧疆璺敱瑙勫垯 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param string $type 璇锋眰绫诲瀷 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 - * @param string $group 鎵灞炲垎缁 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param string $type 璇锋眰绫诲瀷 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 + * @param string $group 鎵灞炲垎缁 * @return void */ protected static function setRule($rule, $route, $type = '*', $option = [], $pattern = [], $group = '') @@ -333,9 +335,9 @@ class Route if ('*' == $type) { // 娉ㄥ唽璺敱蹇嵎鏂瑰紡 foreach (['get', 'post', 'put', 'delete', 'patch', 'head', 'options'] as $method) { - if (self::$domain) { + if (self::$domain && !isset(self::$rules['domain'][self::$domain][$method][$rule])) { self::$rules['domain'][self::$domain][$method][$rule] = true; - } else { + } elseif (!self::$domain && !isset(self::$rules[$method][$rule])) { self::$rules[$method][$rule] = true; } } @@ -346,7 +348,7 @@ class Route /** * 璁剧疆褰撳墠鎵ц鐨勫弬鏁颁俊鎭 * @access public - * @param array $options 鍙傛暟淇℃伅 + * @param array $options 鍙傛暟淇℃伅 * @return mixed */ protected static function setOption($options = []) @@ -367,7 +369,7 @@ class Route /** * 鑾峰彇褰撳墠鐨勫垎缁勪俊鎭 * @access public - * @param string $type 鍒嗙粍淇℃伅鍚嶇О name option pattern + * @param string $type 鍒嗙粍淇℃伅鍚嶇О name option pattern * @return mixed */ public static function getGroup($type) @@ -382,9 +384,9 @@ class Route /** * 璁剧疆褰撳墠鐨勮矾鐢卞垎缁 * @access public - * @param string $name 鍒嗙粍鍚嶇О - * @param array $option 鍒嗙粍璺敱鍙傛暟 - * @param array $pattern 鍒嗙粍鍙橀噺瑙勫垯 + * @param string $name 鍒嗙粍鍚嶇О + * @param array $option 鍒嗙粍璺敱鍙傛暟 + * @param array $pattern 鍒嗙粍鍙橀噺瑙勫垯 * @return void */ public static function setGroup($name, $option = [], $pattern = []) @@ -397,10 +399,10 @@ class Route /** * 娉ㄥ唽璺敱鍒嗙粍 * @access public - * @param string|array $name 鍒嗙粍鍚嶇О鎴栬呭弬鏁 - * @param array|\Closure $routes 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $name 鍒嗙粍鍚嶇О鎴栬呭弬鏁 + * @param array|\Closure $routes 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function group($name, $routes, $option = [], $pattern = []) @@ -428,7 +430,8 @@ class Route self::$rules['*'][$name]['pattern'] = $pattern; } } else { - $item = []; + $item = []; + $completeMatch = Config::get('route_complete_match'); foreach ($routes as $key => $val) { if (is_numeric($key)) { $key = array_shift($val); @@ -447,6 +450,8 @@ class Route // 鏄惁瀹屾暣鍖归厤 $options['complete_match'] = true; $key = substr($key, 0, -1); + } elseif ($completeMatch) { + $options['complete_match'] = true; } $key = trim($key, '/'); $vars = self::parseVar($key); @@ -482,10 +487,10 @@ class Route /** * 娉ㄥ唽璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function any($rule, $route = '', $option = [], $pattern = []) @@ -496,10 +501,10 @@ class Route /** * 娉ㄥ唽GET璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function get($rule, $route = '', $option = [], $pattern = []) @@ -510,10 +515,10 @@ class Route /** * 娉ㄥ唽POST璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function post($rule, $route = '', $option = [], $pattern = []) @@ -524,10 +529,10 @@ class Route /** * 娉ㄥ唽PUT璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function put($rule, $route = '', $option = [], $pattern = []) @@ -538,10 +543,10 @@ class Route /** * 娉ㄥ唽DELETE璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function delete($rule, $route = '', $option = [], $pattern = []) @@ -552,10 +557,10 @@ class Route /** * 娉ㄥ唽PATCH璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function patch($rule, $route = '', $option = [], $pattern = []) @@ -566,10 +571,10 @@ class Route /** * 娉ㄥ唽璧勬簮璺敱 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string|array $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function resource($rule, $route = '', $option = [], $pattern = []) @@ -613,10 +618,10 @@ class Route /** * 娉ㄥ唽鎺у埗鍣ㄨ矾鐢 鎿嶄綔鏂规硶瀵瑰簲涓嶅悓鐨勮姹傚悗缂 * @access public - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $pattern 鍙橀噺瑙勫垯 * @return void */ public static function controller($rule, $route = '', $option = [], $pattern = []) @@ -629,9 +634,9 @@ class Route /** * 娉ㄥ唽鍒悕璺敱 * @access public - * @param string|array $rule 璺敱鍒悕 - * @param string $route 璺敱鍦板潃 - * @param array $option 璺敱鍙傛暟 + * @param string|array $rule 璺敱鍒悕 + * @param string $route 璺敱鍦板潃 + * @param array $option 璺敱鍙傛暟 * @return void */ public static function alias($rule = null, $route = '', $option = []) @@ -646,8 +651,8 @@ class Route /** * 璁剧疆涓嶅悓璇锋眰绫诲瀷涓嬮潰鐨勬柟娉曞墠缂 * @access public - * @param string $method 璇锋眰绫诲瀷 - * @param string $prefix 绫诲瀷鍓嶇紑 + * @param string $method 璇锋眰绫诲瀷 + * @param string $prefix 绫诲瀷鍓嶇紑 * @return void */ public static function setMethodPrefix($method, $prefix = '') @@ -662,8 +667,8 @@ class Route /** * rest鏂规硶瀹氫箟鍜屼慨鏀 * @access public - * @param string $name 鏂规硶鍚嶇О - * @param array|bool $resource 璧勬簮 + * @param string|array $name 鏂规硶鍚嶇О + * @param array|bool $resource 璧勬簮 * @return void */ public static function rest($name, $resource = []) @@ -678,9 +683,9 @@ class Route /** * 娉ㄥ唽鏈尮閰嶈矾鐢辫鍒欏悗鐨勫鐞 * @access public - * @param string $route 璺敱鍦板潃 - * @param string $method 璇锋眰绫诲瀷 - * @param array $option 璺敱鍙傛暟 + * @param string $route 璺敱鍦板潃 + * @param string $method 璇锋眰绫诲瀷 + * @param array $option 璺敱鍙傛暟 * @return void */ public static function miss($route, $method = '*', $option = []) @@ -691,7 +696,7 @@ class Route /** * 娉ㄥ唽涓涓嚜鍔ㄨВ鏋愮殑URL璺敱 * @access public - * @param string $route 璺敱鍦板潃 + * @param string $route 璺敱鍦板潃 * @return void */ public static function auto($route) @@ -721,9 +726,9 @@ class Route /** * 妫娴嬪瓙鍩熷悕閮ㄧ讲 * @access public - * @param Request $request Request璇锋眰瀵硅薄 - * @param array $currentRules 褰撳墠璺敱瑙勫垯 - * @param string $method 璇锋眰绫诲瀷 + * @param Request $request Request璇锋眰瀵硅薄 + * @param array $currentRules 褰撳墠璺敱瑙勫垯 + * @param string $method 璇锋眰绫诲瀷 * @return void */ public static function checkDomain($request, &$currentRules, $method = 'get') @@ -732,7 +737,7 @@ class Route $rules = self::$rules['domain']; // 寮鍚瓙鍩熷悕閮ㄧ讲 鏀寔浜岀骇鍜屼笁绾у煙鍚 if (!empty($rules)) { - $host = $request->host(); + $host = $request->host(true); if (isset($rules[$host])) { // 瀹屾暣鍩熷悕鎴栬匢P閰嶇疆 $item = $rules[$host]; @@ -822,14 +827,23 @@ class Route /** * 妫娴婾RL璺敱 * @access public - * @param Request $request Request璇锋眰瀵硅薄 - * @param string $url URL鍦板潃 - * @param string $depr URL鍒嗛殧绗 - * @param bool $checkDomain 鏄惁妫娴嬪煙鍚嶈鍒 + * @param Request $request Request璇锋眰瀵硅薄 + * @param string $url URL鍦板潃 + * @param string $depr URL鍒嗛殧绗 + * @param bool $checkDomain 鏄惁妫娴嬪煙鍚嶈鍒 * @return false|array */ public static function check($request, $url, $depr = '/', $checkDomain = false) { + //妫鏌ヨВ鏋愮紦瀛 + if (!App::$debug && Config::get('route_check_cache')) { + $key = self::getCheckCacheKey($request); + if (Cache::has($key)) { + list($rule, $route, $pathinfo, $option, $matches) = Cache::get($key); + return self::parseRule($rule, $route, $pathinfo, $option, $matches, true); + } + } + // 鍒嗛殧绗︽浛鎹 纭繚璺敱瀹氫箟浣跨敤缁熶竴鐨勫垎闅旂 $url = str_replace($depr, '|', $url); @@ -883,12 +897,12 @@ class Route /** * 妫娴嬭矾鐢辫鍒 * @access private - * @param Request $request - * @param array $rules 璺敱瑙勫垯 - * @param string $url URL鍦板潃 - * @param string $depr URL鍒嗗壊绗 - * @param string $group 璺敱鍒嗙粍鍚 - * @param array $options 璺敱鍙傛暟锛堝垎缁勶級 + * @param Request $request + * @param array $rules 璺敱瑙勫垯 + * @param string $url URL鍦板潃 + * @param string $depr URL鍒嗗壊绗 + * @param string $group 璺敱鍒嗙粍鍚 + * @param array $options 璺敱鍙傛暟锛堝垎缁勶級 * @return mixed */ private static function checkRoute($request, $rules, $url, $depr = '/', $group = '', $options = []) @@ -966,9 +980,9 @@ class Route /** * 妫娴嬭矾鐢卞埆鍚 * @access private - * @param Request $request - * @param string $url URL鍦板潃 - * @param string $depr URL鍒嗛殧绗 + * @param Request $request + * @param string $url URL鍦板潃 + * @param string $depr URL鍒嗛殧绗 * @return mixed */ private static function checkRouteAlias($request, $url, $depr) @@ -1013,9 +1027,9 @@ class Route /** * 妫娴婾RL缁戝畾 * @access private - * @param string $url URL鍦板潃 - * @param array $rules 璺敱瑙勫垯 - * @param string $depr URL鍒嗛殧绗 + * @param string $url URL鍦板潃 + * @param array $rules 璺敱瑙勫垯 + * @param string $depr URL鍒嗛殧绗 * @return mixed */ private static function checkUrlBind(&$url, &$rules, $depr = '/') @@ -1044,9 +1058,9 @@ class Route /** * 缁戝畾鍒扮被 * @access public - * @param string $url URL鍦板潃 - * @param string $class 绫诲悕锛堝甫鍛藉悕绌洪棿锛 - * @param string $depr URL鍒嗛殧绗 + * @param string $url URL鍦板潃 + * @param string $class 绫诲悕锛堝甫鍛藉悕绌洪棿锛 + * @param string $depr URL鍒嗛殧绗 * @return array */ public static function bindToClass($url, $class, $depr = '/') @@ -1063,9 +1077,9 @@ class Route /** * 缁戝畾鍒板懡鍚嶇┖闂 * @access public - * @param string $url URL鍦板潃 - * @param string $namespace 鍛藉悕绌洪棿 - * @param string $depr URL鍒嗛殧绗 + * @param string $url URL鍦板潃 + * @param string $namespace 鍛藉悕绌洪棿 + * @param string $depr URL鍒嗛殧绗 * @return array */ public static function bindToNamespace($url, $namespace, $depr = '/') @@ -1083,9 +1097,9 @@ class Route /** * 缁戝畾鍒版帶鍒跺櫒绫 * @access public - * @param string $url URL鍦板潃 - * @param string $controller 鎺у埗鍣ㄥ悕 锛堟敮鎸佸甫妯″潡鍚 index/user 锛 - * @param string $depr URL鍒嗛殧绗 + * @param string $url URL鍦板潃 + * @param string $controller 鎺у埗鍣ㄥ悕 锛堟敮鎸佸甫妯″潡鍚 index/user 锛 + * @param string $depr URL鍒嗛殧绗 * @return array */ public static function bindToController($url, $controller, $depr = '/') @@ -1102,9 +1116,9 @@ class Route /** * 缁戝畾鍒版ā鍧/鎺у埗鍣 * @access public - * @param string $url URL鍦板潃 - * @param string $controller 鎺у埗鍣ㄧ被鍚嶏紙甯﹀懡鍚嶇┖闂达級 - * @param string $depr URL鍒嗛殧绗 + * @param string $url URL鍦板潃 + * @param string $controller 鎺у埗鍣ㄧ被鍚嶏紙甯﹀懡鍚嶇┖闂达級 + * @param string $depr URL鍒嗛殧绗 * @return array */ public static function bindToModule($url, $controller, $depr = '/') @@ -1121,8 +1135,8 @@ class Route /** * 璺敱鍙傛暟鏈夋晥鎬ф鏌 * @access private - * @param array $option 璺敱鍙傛暟 - * @param Request $request Request瀵硅薄 + * @param array $option 璺敱鍙傛暟 + * @param Request $request Request瀵硅薄 * @return bool */ private static function checkOption($option, $request) @@ -1148,12 +1162,12 @@ class Route /** * 妫娴嬭矾鐢辫鍒 * @access private - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param string $url URL鍦板潃 - * @param array $pattern 鍙橀噺瑙勫垯 - * @param array $option 璺敱鍙傛暟 - * @param string $depr URL鍒嗛殧绗︼紙鍏ㄥ眬锛 + * @param string $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param string $url URL鍦板潃 + * @param array $pattern 鍙橀噺瑙勫垯 + * @param array $option 璺敱鍙傛暟 + * @param string $depr URL鍒嗛殧绗︼紙鍏ㄥ眬锛 * @return array|false */ private static function checkRule($rule, $route, $url, $pattern, $option, $depr) @@ -1195,9 +1209,9 @@ class Route /** * 瑙ｆ瀽妯″潡鐨刄RL鍦板潃 [妯″潡/鎺у埗鍣/鎿嶄綔?]鍙傛暟1=鍊1&鍙傛暟2=鍊2... * @access public - * @param string $url URL鍦板潃 - * @param string $depr URL鍒嗛殧绗 - * @param bool $autoSearch 鏄惁鑷姩娣卞害鎼滅储鎺у埗鍣 + * @param string $url URL鍦板潃 + * @param string $depr URL鍒嗛殧绗 + * @param bool $autoSearch 鏄惁鑷姩娣卞害鎼滅储鎺у埗鍣 * @return array */ public static function parseUrl($url, $depr = '/', $autoSearch = false) @@ -1264,7 +1278,7 @@ class Route /** * 瑙ｆ瀽URL鐨刾athinfo鍙傛暟鍜屽彉閲 * @access private - * @param string $url URL鍦板潃 + * @param string $url URL鍦板潃 * @return array */ private static function parseUrlPath($url) @@ -1290,9 +1304,9 @@ class Route /** * 妫娴婾RL鍜岃鍒欒矾鐢辨槸鍚﹀尮閰 * @access private - * @param string $url URL鍦板潃 - * @param string $rule 璺敱瑙勫垯 - * @param array $pattern 鍙橀噺瑙勫垯 + * @param string $url URL鍦板潃 + * @param string $rule 璺敱瑙勫垯 + * @param array $pattern 鍙橀噺瑙勫垯 * @return array|false */ private static function match($url, $rule, $pattern) @@ -1365,16 +1379,28 @@ class Route /** * 瑙ｆ瀽瑙勫垯璺敱 * @access private - * @param string $rule 璺敱瑙勫垯 - * @param string $route 璺敱鍦板潃 - * @param string $pathinfo URL鍦板潃 - * @param array $option 璺敱鍙傛暟 - * @param array $matches 鍖归厤鐨勫彉閲 + * @param string $rule 璺敱瑙勫垯 + * @param string $route 璺敱鍦板潃 + * @param string $pathinfo URL鍦板潃 + * @param array $option 璺敱鍙傛暟 + * @param array $matches 鍖归厤鐨勫彉閲 + * @param bool $fromCache 閫氳繃缂撳瓨瑙ｆ瀽 * @return array */ - private static function parseRule($rule, $route, $pathinfo, $option = [], $matches = []) + private static function parseRule($rule, $route, $pathinfo, $option = [], $matches = [], $fromCache = false) { $request = Request::instance(); + + //淇濆瓨瑙ｆ瀽缂撳瓨 + if (Config::get('route_check_cache') && !$fromCache) { + try { + $key = self::getCheckCacheKey($request); + Cache::tag('route_check')->set($key, [$rule, $route, $pathinfo, $option, $matches]); + } catch (\Exception $e) { + + } + } + // 瑙ｆ瀽璺敱瑙勫垯 if ($rule) { $rule = explode('/', $rule); @@ -1501,18 +1527,19 @@ class Route App::$modulePath = APP_PATH . (Config::get('app_multi_module') ? $request->module() . DS : ''); } else { // 璺敱鍒版ā鍧/鎺у埗鍣/鎿嶄綔 - $result = self::parseModule($route); + $result = self::parseModule($route, isset($option['convert']) ? $option['convert'] : false); } // 寮鍚姹傜紦瀛 if ($request->isGet() && isset($option['cache'])) { $cache = $option['cache']; if (is_array($cache)) { - list($key, $expire) = $cache; + list($key, $expire, $tag) = array_pad($cache, 3, null); } else { $key = str_replace('|', '/', $pathinfo); $expire = $cache; + $tag = null; } - $request->cache($key, $expire); + $request->cache($key, $expire, $tag); } return $result; } @@ -1520,10 +1547,11 @@ class Route /** * 瑙ｆ瀽URL鍦板潃涓 妯″潡/鎺у埗鍣/鎿嶄綔 * @access private - * @param string $url URL鍦板潃 + * @param string $url URL鍦板潃 + * @param bool $convert 鏄惁鑷姩杞崲URL鍦板潃 * @return array */ - private static function parseModule($url) + private static function parseModule($url, $convert = false) { list($path, $var) = self::parseUrlPath($url); $action = array_pop($path); @@ -1537,14 +1565,14 @@ class Route // 璁剧疆褰撳墠璇锋眰鐨勮矾鐢卞彉閲 Request::instance()->route($var); // 璺敱鍒版ā鍧/鎺у埗鍣/鎿嶄綔 - return ['type' => 'module', 'module' => [$module, $controller, $action], 'convert' => false]; + return ['type' => 'module', 'module' => [$module, $controller, $action], 'convert' => $convert]; } /** * 瑙ｆ瀽URL鍦板潃涓殑鍙傛暟Request瀵硅薄 * @access private - * @param string $rule 璺敱瑙勫垯 - * @param array $var 鍙橀噺 + * @param string $url 璺敱瑙勫垯 + * @param array $var 鍙橀噺 * @return void */ private static function parseUrlParams($url, &$var = []) @@ -1594,4 +1622,24 @@ class Route } return $var; } + + /** + * 鑾峰彇璺敱瑙ｆ瀽缂撳瓨鐨刱ey + * @param Request $request + * @return string + */ + private static function getCheckCacheKey(Request $request) + { + static $key; + + if (empty($key)) { + if ($callback = Config::get('route_check_cache_key')) { + $key = call_user_func($callback, $request); + } else { + $key = "{$request->host(true)}|{$request->method()}|{$request->path()}"; + } + } + + return $key; + } } diff --git a/thinkphp/library/think/Session.php b/thinkphp/library/think/Session.php index d5a6a5a5a..61150bcad 100644 --- a/thinkphp/library/think/Session.php +++ b/thinkphp/library/think/Session.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -25,6 +25,7 @@ class Session */ public static function prefix($prefix = '') { + empty(self::$init) && self::boot(); if (empty($prefix) && null !== $prefix) { return self::$prefix; } else { @@ -56,7 +57,7 @@ class Session $isDoStart = true; } - if (isset($config['prefix']) && (self::$prefix === '' || self::$prefix === null)) { + if (isset($config['prefix']) && ('' === self::$prefix || null === self::$prefix)) { self::$prefix = $config['prefix']; } if (isset($config['var_session_id']) && isset($_REQUEST[$config['var_session_id']])) { @@ -347,7 +348,7 @@ class Session * @param bool $delete 鏄惁鍒犻櫎鍏宠仈浼氳瘽鏂囦欢 * @return void */ - private static function regenerate($delete = false) + public static function regenerate($delete = false) { session_regenerate_id($delete); } diff --git a/thinkphp/library/think/Template.php b/thinkphp/library/think/Template.php index 4abf21ce7..9ba0ff35b 100644 --- a/thinkphp/library/think/Template.php +++ b/thinkphp/library/think/Template.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -12,6 +12,7 @@ namespace think; use think\exception\TemplateNotFoundException; +use think\template\TagLib; /** * ThinkPHP鍒嗙鍑烘潵鐨勬ā鏉垮紩鎿 @@ -59,15 +60,20 @@ class Template /** * 鏋勯犲嚱鏁 * @access public + * @param array $config */ public function __construct(array $config = []) { - $this->config['cache_path'] = TEMP_PATH; - $this->config = array_merge($this->config, $config); - $this->config['taglib_begin'] = $this->stripPreg($this->config['taglib_begin']); - $this->config['taglib_end'] = $this->stripPreg($this->config['taglib_end']); - $this->config['tpl_begin'] = $this->stripPreg($this->config['tpl_begin']); - $this->config['tpl_end'] = $this->stripPreg($this->config['tpl_end']); + $this->config['cache_path'] = TEMP_PATH; + $this->config = array_merge($this->config, $config); + + $this->config['taglib_begin_origin'] = $this->config['taglib_begin']; + $this->config['taglib_end_origin'] = $this->config['taglib_end']; + + $this->config['taglib_begin'] = preg_quote($this->config['taglib_begin'], '/'); + $this->config['taglib_end'] = preg_quote($this->config['taglib_end'], '/'); + $this->config['tpl_begin'] = preg_quote($this->config['tpl_begin'], '/'); + $this->config['tpl_end'] = preg_quote($this->config['tpl_end'], '/'); // 鍒濆鍖栨ā鏉跨紪璇戝瓨鍌ㄥ櫒 $type = $this->config['compile_type'] ? $this->config['compile_type'] : 'File'; @@ -75,20 +81,6 @@ class Template $this->storage = new $class(); } - /** - * 瀛楃涓叉浛鎹 閬垮厤姝ｅ垯娣锋穯 - * @access private - * @param string $str - * @return string - */ - private function stripPreg($str) - { - return str_replace( - ['{', '}', '(', ')', '|', '[', ']', '-', '+', '*', '.', '^', '?'], - ['\{', '\}', '\(', '\)', '\|', '\[', '\]', '\-', '\+', '\*', '\.', '\^', '\?'], - $str); - } - /** * 妯℃澘鍙橀噺璧嬪 * @access public @@ -120,7 +112,7 @@ class Template * 妯℃澘寮曟搸閰嶇疆椤 * @access public * @param array|string $config - * @return void|array + * @return string|void|array */ public function config($config) { @@ -183,7 +175,7 @@ class Template } $template = $this->parseTemplateFile($template); if ($template) { - $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($template) . '.' . ltrim($this->config['cache_suffix'], '.'); + $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($this->config['layout_name'] . $template) . '.' . ltrim($this->config['cache_suffix'], '.'); if (!$this->checkCache($cacheFile)) { // 缂撳瓨鏃犳晥 閲嶆柊妯℃澘缂栬瘧 $content = file_get_contents($template); @@ -234,7 +226,7 @@ class Template * @access public * @param mixed $name 甯冨眬妯℃澘鍚嶇О false 鍒欏叧闂竷灞 * @param string $replace 甯冨眬妯℃澘鍐呭鏇挎崲鏍囪瘑 - * @return object + * @return Template */ public function layout($name, $replace = '') { @@ -688,6 +680,7 @@ class Template } else { $className = '\\think\\template\\taglib\\' . ucwords($tagLib); } + /** @var Taglib $tLib */ $tLib = new $className($this); $tLib->parseTag($content, $hide ? '' : $tagLib); return; @@ -763,31 +756,26 @@ class Template } else { if (isset($array[1])) { $this->parseVar($array[2]); - $_name = ' && ' . $name . $array[1] . $array[2]; + $express = $name . $array[1] . $array[2]; } else { - $_name = ''; + $express = false; } // $name涓烘暟缁 switch ($first) { case '?': // {$varname??'xxx'} $varname鏈夊畾涔夊垯杈撳嚭$varname,鍚﹀垯杈撳嚭xxx - $str = ''; + $str = ''; break; case '=': // {$varname?='xxx'} $varname涓虹湡鏃舵墠杈撳嚭xxx - $str = ''; + $str = ''; break; case ':': // {$varname?:'xxx'} $varname涓虹湡鏃惰緭鍑$varname,鍚﹀垯杈撳嚭xxx - $str = ''; + $str = ''; break; default: - if (strpos($str, ':')) { - // {$varname ? 'a' : 'b'} $varname涓虹湡鏃惰緭鍑篴,鍚﹀垯杈撳嚭b - $str = ''; - } else { - $str = ''; - } + $str = ''; } } } else { @@ -1075,7 +1063,7 @@ class Template } else { $path = isset($module) ? APP_PATH . $module . DS . basename($this->config['view_path']) . DS : $this->config['view_path']; } - $template = $path . $template . '.' . ltrim($this->config['view_suffix'], '.'); + $template = realpath($path . $template . '.' . ltrim($this->config['view_suffix'], '.')); } if (is_file($template)) { diff --git a/thinkphp/library/think/Url.php b/thinkphp/library/think/Url.php index 9f725e2c3..53a545f92 100644 --- a/thinkphp/library/think/Url.php +++ b/thinkphp/library/think/Url.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -118,7 +118,7 @@ class Url $type = Route::getBind('type'); if ($type) { $bind = Route::getBind($type); - if (0 === strpos($url, $bind)) { + if ($bind && 0 === strpos($url, $bind)) { $url = substr($url, strlen($bind) + 1); } } @@ -135,7 +135,7 @@ class Url if (!empty($vars)) { // 娣诲姞鍙傛暟 if (Config::get('url_common_param')) { - $vars = urldecode(http_build_query($vars)); + $vars = http_build_query($vars); $url .= $suffix . '?' . $vars . $anchor; } else { $paramType = Config::get('url_param_type'); @@ -210,17 +210,21 @@ class Url } $module = $module ? $module . '/' : ''; - $controller = Loader::parseName($request->controller()); + $controller = $request->controller(); if ('' == $url) { // 绌哄瓧绗︿覆杈撳嚭褰撳墠鐨 妯″潡/鎺у埗鍣/鎿嶄綔 - $url = $module . $controller . '/' . $request->action(); + $action = $request->action(); } else { $path = explode('/', $url); - $action = Config::get('url_convert') ? strtolower(array_pop($path)) : array_pop($path); - $controller = empty($path) ? $controller : (Config::get('url_convert') ? Loader::parseName(array_pop($path)) : array_pop($path)); + $action = array_pop($path); + $controller = empty($path) ? $controller : array_pop($path); $module = empty($path) ? $module : array_pop($path) . '/'; - $url = $module . $controller . '/' . $action; } + if (Config::get('url_convert')) { + $action = strtolower($action); + $controller = Loader::parseName($controller); + } + $url = $module . $controller . '/' . $action; } return $url; } @@ -272,7 +276,7 @@ class Url $domain .= '.' . $rootDomain; } } - if (false !== strpos($domain, ':')) { + if (false !== strpos($domain, '://')) { $scheme = ''; } else { $scheme = $request->isSsl() || Config::get('is_https') ? 'https://' : 'http://'; @@ -298,11 +302,12 @@ class Url foreach ($rule as $item) { list($url, $pattern, $domain, $suffix) = $item; if (empty($pattern)) { - return [$url, $domain, $suffix]; + return [rtrim($url, '$'), $domain, $suffix]; } + $type = Config::get('url_common_param'); foreach ($pattern as $key => $val) { if (isset($vars[$key])) { - $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], urlencode($vars[$key]), $url); + $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $type ? $vars[$key] : urlencode($vars[$key]), $url); unset($vars[$key]); $result = [$url, $domain, $suffix]; } elseif (2 == $val) { diff --git a/thinkphp/library/think/Validate.php b/thinkphp/library/think/Validate.php index 1df14f114..608e1e4a5 100644 --- a/thinkphp/library/think/Validate.php +++ b/thinkphp/library/think/Validate.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -36,54 +36,56 @@ class Validate // 楠岃瘉瑙勫垯榛樿鎻愮ず淇℃伅 protected static $typeMsg = [ - 'require' => ':attribute涓嶈兘涓虹┖', - 'number' => ':attribute蹇呴』鏄暟瀛', - 'float' => ':attribute蹇呴』鏄诞鐐规暟', - 'boolean' => ':attribute蹇呴』鏄竷灏斿', - 'email' => ':attribute鏍煎紡涓嶇', - 'array' => ':attribute蹇呴』鏄暟缁', - 'accepted' => ':attribute蹇呴』鏄痽es銆乷n鎴栬1', - 'date' => ':attribute鏍煎紡涓嶇鍚', - 'file' => ':attribute涓嶆槸鏈夋晥鐨勪笂浼犳枃浠', - 'image' => ':attribute涓嶆槸鏈夋晥鐨勫浘鍍忔枃浠', - 'alpha' => ':attribute鍙兘鏄瓧姣', - 'alphaNum' => ':attribute鍙兘鏄瓧姣嶅拰鏁板瓧', - 'alphaDash' => ':attribute鍙兘鏄瓧姣嶃佹暟瀛楀拰涓嬪垝绾縚鍙婄牬鎶樺彿-', - 'activeUrl' => ':attribute涓嶆槸鏈夋晥鐨勫煙鍚嶆垨鑰匢P', - 'chs' => ':attribute鍙兘鏄眽瀛', - 'chsAlpha' => ':attribute鍙兘鏄眽瀛椼佸瓧姣', - 'chsAlphaNum' => ':attribute鍙兘鏄眽瀛椼佸瓧姣嶅拰鏁板瓧', - 'chsDash' => ':attribute鍙兘鏄眽瀛椼佸瓧姣嶃佹暟瀛楀拰涓嬪垝绾縚鍙婄牬鎶樺彿-', - 'url' => ':attribute涓嶆槸鏈夋晥鐨刄RL鍦板潃', - 'ip' => ':attribute涓嶆槸鏈夋晥鐨処P鍦板潃', - 'dateFormat' => ':attribute蹇呴』浣跨敤鏃ユ湡鏍煎紡 :rule', - 'in' => ':attribute蹇呴』鍦 :rule 鑼冨洿鍐', - 'notIn' => ':attribute涓嶈兘鍦 :rule 鑼冨洿鍐', - 'between' => ':attribute鍙兘鍦 :1 - :2 涔嬮棿', - 'notBetween' => ':attribute涓嶈兘鍦 :1 - :2 涔嬮棿', - 'length' => ':attribute闀垮害涓嶇鍚堣姹 :rule', - 'max' => ':attribute闀垮害涓嶈兘瓒呰繃 :rule', - 'min' => ':attribute闀垮害涓嶈兘灏忎簬 :rule', - 'after' => ':attribute鏃ユ湡涓嶈兘灏忎簬 :rule', - 'before' => ':attribute鏃ユ湡涓嶈兘瓒呰繃 :rule', - 'expire' => '涓嶅湪鏈夋晥鏈熷唴 :rule', - 'allowIp' => '涓嶅厑璁哥殑IP璁块棶', - 'denyIp' => '绂佹鐨処P璁块棶', - 'confirm' => ':attribute鍜岀‘璁ゅ瓧娈:2涓嶄竴鑷', - 'different' => ':attribute鍜屾瘮杈冨瓧娈:2涓嶈兘鐩稿悓', - 'egt' => ':attribute蹇呴』澶т簬绛変簬 :rule', - 'gt' => ':attribute蹇呴』澶т簬 :rule', - 'elt' => ':attribute蹇呴』灏忎簬绛変簬 :rule', - 'lt' => ':attribute蹇呴』灏忎簬 :rule', - 'eq' => ':attribute蹇呴』绛変簬 :rule', - 'unique' => ':attribute宸插瓨鍦', - 'regex' => ':attribute涓嶇鍚堟寚瀹氳鍒', - 'method' => '鏃犳晥鐨勮姹傜被鍨', - 'token' => '浠ょ墝鏁版嵁鏃犳晥', - 'fileSize' => '涓婁紶鏂囦欢澶у皬涓嶇', - 'fileExt' => '涓婁紶鏂囦欢鍚庣紑涓嶇', - 'fileMime' => '涓婁紶鏂囦欢绫诲瀷涓嶇', - + 'require' => ':attribute require', + 'number' => ':attribute must be numeric', + 'integer' => ':attribute must be integer', + 'float' => ':attribute must be float', + 'boolean' => ':attribute must be bool', + 'email' => ':attribute not a valid email address', + 'array' => ':attribute must be a array', + 'accepted' => ':attribute must be yes,on or 1', + 'date' => ':attribute not a valid datetime', + 'file' => ':attribute not a valid file', + 'image' => ':attribute not a valid image', + 'alpha' => ':attribute must be alpha', + 'alphaNum' => ':attribute must be alpha-numeric', + 'alphaDash' => ':attribute must be alpha-numeric, dash, underscore', + 'activeUrl' => ':attribute not a valid domain or ip', + 'chs' => ':attribute must be chinese', + 'chsAlpha' => ':attribute must be chinese or alpha', + 'chsAlphaNum' => ':attribute must be chinese,alpha-numeric', + 'chsDash' => ':attribute must be chinese,alpha-numeric,underscore, dash', + 'url' => ':attribute not a valid url', + 'ip' => ':attribute not a valid ip', + 'dateFormat' => ':attribute must be dateFormat of :rule', + 'in' => ':attribute must be in :rule', + 'notIn' => ':attribute be notin :rule', + 'between' => ':attribute must between :1 - :2', + 'notBetween' => ':attribute not between :1 - :2', + 'length' => 'size of :attribute must be :rule', + 'max' => 'max size of :attribute must be :rule', + 'min' => 'min size of :attribute must be :rule', + 'after' => ':attribute cannot be less than :rule', + 'before' => ':attribute cannot exceed :rule', + 'afterWith' => ':attribute cannot be less than :rule', + 'beforeWith' => ':attribute cannot exceed :rule', + 'expire' => ':attribute not within :rule', + 'allowIp' => 'access IP is not allowed', + 'denyIp' => 'access IP denied', + 'confirm' => ':attribute out of accord with :2', + 'different' => ':attribute cannot be same with :2', + 'egt' => ':attribute must greater than or equal :rule', + 'gt' => ':attribute must greater than :rule', + 'elt' => ':attribute must less than or equal :rule', + 'lt' => ':attribute must less than :rule', + 'eq' => ':attribute must equal :rule', + 'unique' => ':attribute has exists', + 'regex' => ':attribute not conform to the rules', + 'method' => 'invalid Request method', + 'token' => 'invalid token', + 'fileSize' => 'filesize not match', + 'fileExt' => 'extensions to upload is not allowed', + 'fileMime' => 'mimetype to upload is not allowed', ]; // 褰撳墠楠岃瘉鍦烘櫙 @@ -339,6 +341,41 @@ class Validate return !empty($this->error) ? false : true; } + /** + * 鏍规嵁楠岃瘉瑙勫垯楠岃瘉鏁版嵁 + * @access protected + * @param mixed $value 瀛楁鍊 + * @param mixed $rules 楠岃瘉瑙勫垯 + * @return bool + */ + protected function checkRule($value, $rules) + { + if ($rules instanceof \Closure) { + return call_user_func_array($rules, [$value]); + } elseif (is_string($rules)) { + $rules = explode('|', $rules); + } + + foreach ($rules as $key => $rule) { + if ($rule instanceof \Closure) { + $result = call_user_func_array($rule, [$value]); + } else { + // 鍒ゆ柇楠岃瘉绫诲瀷 + list($type, $rule) = $this->getValidateType($key, $rule); + + $callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type]; + + $result = call_user_func_array($callback, [$value, $rule]); + } + + if (true !== $result) { + return $result; + } + } + + return true; + } + /** * 楠岃瘉鍗曚釜瀛楁瑙勫垯 * @access protected @@ -363,25 +400,7 @@ class Validate $info = is_numeric($key) ? '' : $key; } else { // 鍒ゆ柇楠岃瘉绫诲瀷 - if (is_numeric($key)) { - if (strpos($rule, ':')) { - list($type, $rule) = explode(':', $rule, 2); - if (isset($this->alias[$type])) { - // 鍒ゆ柇鍒悕 - $type = $this->alias[$type]; - } - $info = $type; - } elseif (method_exists($this, $rule)) { - $type = $rule; - $info = $rule; - $rule = ''; - } else { - $type = 'is'; - $info = $rule; - } - } else { - $info = $type = $key; - } + list($type, $rule, $info) = $this->getValidateType($key, $rule); // 濡傛灉涓嶆槸require 鏈夋暟鎹墠浼氳楠岃瘉 if (0 === strpos($info, 'require') || (!is_null($value) && '' !== $value)) { @@ -417,6 +436,39 @@ class Validate return $result; } + /** + * 鑾峰彇褰撳墠楠岃瘉绫诲瀷鍙婅鍒 + * @access public + * @param mixed $key + * @param mixed $rule + * @return array + */ + protected function getValidateType($key, $rule) + { + // 鍒ゆ柇楠岃瘉绫诲瀷 + if (!is_numeric($key)) { + return [$key, $rule, $key]; + } + + if (strpos($rule, ':')) { + list($type, $rule) = explode(':', $rule, 2); + if (isset($this->alias[$type])) { + // 鍒ゆ柇鍒悕 + $type = $this->alias[$type]; + } + $info = $type; + } elseif (method_exists($this, $rule)) { + $type = $rule; + $info = $rule; + $rule = ''; + } else { + $type = 'is'; + $info = $rule; + } + + return [$type, $rule, $info]; + } + /** * 楠岃瘉鏄惁鍜屾煇涓瓧娈电殑鍊间竴鑷 * @access protected @@ -632,8 +684,12 @@ class Validate if (function_exists('exif_imagetype')) { return exif_imagetype($image); } else { - $info = getimagesize($image); - return $info[2]; + try { + $info = getimagesize($image); + return $info ? $info[2] : false; + } catch (\Exception $e) { + return false; + } } } @@ -676,21 +732,17 @@ class Validate */ protected function fileExt($file, $rule) { - if (!($file instanceof File)) { - return false; - } - if (is_string($rule)) { - $rule = explode(',', $rule); - } if (is_array($file)) { foreach ($file as $item) { - if (!$item->checkExt($rule)) { + if (!($item instanceof File) || !$item->checkExt($rule)) { return false; } } return true; - } else { + } elseif ($file instanceof File) { return $file->checkExt($rule); + } else { + return false; } } @@ -703,21 +755,17 @@ class Validate */ protected function fileMime($file, $rule) { - if (!($file instanceof File)) { - return false; - } - if (is_string($rule)) { - $rule = explode(',', $rule); - } if (is_array($file)) { foreach ($file as $item) { - if (!$item->checkMime($rule)) { + if (!($item instanceof File) || !$item->checkMime($rule)) { return false; } } return true; - } else { + } elseif ($file instanceof File) { return $file->checkMime($rule); + } else { + return false; } } @@ -730,18 +778,17 @@ class Validate */ protected function fileSize($file, $rule) { - if (!($file instanceof File)) { - return false; - } if (is_array($file)) { foreach ($file as $item) { - if (!$item->checkSize($rule)) { + if (!($item instanceof File) || !$item->checkSize($rule)) { return false; } } return true; - } else { + } elseif ($file instanceof File) { return $file->checkSize($rule); + } else { + return false; } } @@ -833,21 +880,26 @@ class Validate // 鏀寔澶氫釜瀛楁楠岃瘉 $fields = explode('^', $key); foreach ($fields as $key) { - $map[$key] = $data[$key]; + if (isset($data[$key])) { + $map[$key] = $data[$key]; + } } } elseif (strpos($key, '=')) { parse_str($key, $map); - } else { + } elseif (isset($data[$field])) { $map[$key] = $data[$field]; + } else { + $map = []; } - $pk = strval(isset($rule[3]) ? $rule[3] : $db->getPk()); - if (isset($rule[2])) { - $map[$pk] = ['neq', $rule[2]]; - } elseif (isset($data[$pk])) { - $map[$pk] = ['neq', $data[$pk]]; + $pk = isset($rule[3]) ? $rule[3] : $db->getPk(); + if (is_string($pk)) { + if (isset($rule[2])) { + $map[$pk] = ['neq', $rule[2]]; + } elseif (isset($data[$pk])) { + $map[$pk] = ['neq', $data[$pk]]; + } } - if ($db->where($map)->field($pk)->find()) { return false; } @@ -899,7 +951,7 @@ class Validate { list($field, $val) = explode(',', $rule); if ($this->getDataValue($data, $field) == $val) { - return !empty($value); + return !empty($value) || '0' == $value; } else { return true; } @@ -917,7 +969,7 @@ class Validate { $result = call_user_func_array($rule, [$value, $data]); if ($result) { - return !empty($value); + return !empty($value) || '0' == $value; } else { return true; } @@ -935,7 +987,7 @@ class Validate { $val = $this->getDataValue($data, $rule); if (!empty($val)) { - return !empty($value); + return !empty($value) || '0' == $value; } else { return true; } @@ -1067,9 +1119,10 @@ class Validate * @access protected * @param mixed $value 瀛楁鍊 * @param mixed $rule 楠岃瘉瑙勫垯 + * @param array $data 鏁版嵁 * @return bool */ - protected function after($value, $rule) + protected function after($value, $rule, $data) { return strtotime($value) >= strtotime($rule); } @@ -1079,13 +1132,42 @@ class Validate * @access protected * @param mixed $value 瀛楁鍊 * @param mixed $rule 楠岃瘉瑙勫垯 + * @param array $data 鏁版嵁 * @return bool */ - protected function before($value, $rule) + protected function before($value, $rule, $data) { return strtotime($value) <= strtotime($rule); } + /** + * 楠岃瘉鏃ユ湡瀛楁 + * @access protected + * @param mixed $value 瀛楁鍊 + * @param mixed $rule 楠岃瘉瑙勫垯 + * @param array $data 鏁版嵁 + * @return bool + */ + protected function afterWith($value, $rule, $data) + { + $rule = $this->getDataValue($data, $rule); + return !is_null($rule) && strtotime($value) >= strtotime($rule); + } + + /** + * 楠岃瘉鏃ユ湡瀛楁 + * @access protected + * @param mixed $value 瀛楁鍊 + * @param mixed $rule 楠岃瘉瑙勫垯 + * @param array $data 鏁版嵁 + * @return bool + */ + protected function beforeWith($value, $rule, $data) + { + $rule = $this->getDataValue($data, $rule); + return !is_null($rule) && strtotime($value) <= strtotime($rule); + } + /** * 楠岃瘉鏈夋晥鏈 * @access protected @@ -1149,7 +1231,7 @@ class Validate // 涓嶆槸姝ｅ垯琛ㄨ揪寮忓垯涓ょ琛ヤ笂/ $rule = '/^' . $rule . '$/'; } - return 1 === preg_match($rule, (string) $value); + return is_scalar($value) && 1 === preg_match($rule, (string) $value); } /** @@ -1225,12 +1307,16 @@ class Validate $msg = $this->message[$attribute]; } elseif (isset(self::$typeMsg[$type])) { $msg = self::$typeMsg[$type]; + } elseif (0 === strpos($type, 'require')) { + $msg = self::$typeMsg['require']; } else { - $msg = $title . '瑙勫垯閿欒'; + $msg = $title . Lang::get('not conform to the rules'); } if (is_string($msg) && 0 === strpos($msg, '{%')) { $msg = Lang::get(substr($msg, 2, -1)); + } elseif (Lang::has($msg)) { + $msg = Lang::get($msg); } if (is_string($msg) && is_scalar($rule) && false !== strpos($msg, ':')) { diff --git a/thinkphp/library/think/View.php b/thinkphp/library/think/View.php index 96ae56c92..ca2dadbb6 100644 --- a/thinkphp/library/think/View.php +++ b/thinkphp/library/think/View.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -33,7 +33,7 @@ class View public function __construct($engine = [], $replace = []) { // 鍒濆鍖栨ā鏉垮紩鎿 - $this->engine((array) $engine); + $this->engine($engine); // 鍩虹鏇挎崲瀛楃涓 $request = Request::instance(); $base = $request->root(); @@ -127,7 +127,7 @@ class View * @access private * @param string|array $name 鍙傛暟鍚 * @param mixed $value 鍙傛暟鍊 - * @return void + * @return $this */ public function config($name, $value = null) { @@ -155,18 +155,21 @@ class View ob_implicit_flush(0); // 娓叉煋杈撳嚭 - $method = $renderContent ? 'display' : 'fetch'; - $this->engine->$method($template, $vars, $config); + try { + $method = $renderContent ? 'display' : 'fetch'; + // 鍏佽鐢ㄦ埛鑷畾涔夋ā鏉跨殑瀛楃涓叉浛鎹 + $replace = array_merge($this->replace, $replace, (array) $this->engine->config('tpl_replace_string')); + $this->engine->config('tpl_replace_string', $replace); + $this->engine->$method($template, $vars, $config); + } catch (\Exception $e) { + ob_end_clean(); + throw $e; + } // 鑾峰彇骞舵竻绌虹紦瀛 $content = ob_get_clean(); // 鍐呭杩囨护鏍囩 Hook::listen('view_filter', $content); - // 鍏佽鐢ㄦ埛鑷畾涔夋ā鏉跨殑瀛楃涓叉浛鎹 - $replace = array_merge($this->replace, $replace); - if (!empty($replace)) { - $content = strtr($content, $replace); - } return $content; } diff --git a/thinkphp/library/think/cache/Driver.php b/thinkphp/library/think/cache/Driver.php index ab48bdd6d..07805e485 100644 --- a/thinkphp/library/think/cache/Driver.php +++ b/thinkphp/library/think/cache/Driver.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -120,10 +120,29 @@ abstract class Driver public function remember($name, $value, $expire = null) { if (!$this->has($name)) { - if ($value instanceof \Closure) { - $value = call_user_func($value); + $time = time(); + while ($time + 5 > time() && $this->has($name . '_lock')) { + // 瀛樺湪閿佸畾鍒欑瓑寰 + usleep(200000); + } + + try { + // 閿佸畾 + $this->set($name . '_lock', true); + if ($value instanceof \Closure) { + $value = call_user_func($value); + } + $this->set($name, $value, $expire); + // 瑙ｉ攣 + $this->rm($name . '_lock'); + } catch (\Exception $e) { + // 瑙ｉ攣 + $this->rm($name . '_lock'); + throw $e; + } catch (\throwable $e) { + $this->rm($name . '_lock'); + throw $e; } - $this->set($name, $value, $expire); } else { $value = $this->get($name); } @@ -140,7 +159,9 @@ abstract class Driver */ public function tag($name, $keys = null, $overlay = false) { - if (is_null($keys)) { + if (is_null($name)) { + + } elseif (is_null($keys)) { $this->tag = $name; } else { $key = 'tag_' . md5($name); @@ -153,7 +174,7 @@ abstract class Driver } else { $value = array_unique(array_merge($this->getTagItem($name), $keys)); } - $this->set($key, implode(',', $value)); + $this->set($key, implode(',', $value), 0); } return $this; } @@ -176,7 +197,7 @@ abstract class Driver } else { $value = $name; } - $this->set($key, $value); + $this->set($key, $value, 0); } } @@ -191,7 +212,7 @@ abstract class Driver $key = 'tag_' . md5($tag); $value = $this->get($key); if ($value) { - return explode(',', $value); + return array_filter(explode(',', $value)); } else { return []; } diff --git a/thinkphp/library/think/cache/driver/File.php b/thinkphp/library/think/cache/driver/File.php index 5aadb2b19..fee64894a 100644 --- a/thinkphp/library/think/cache/driver/File.php +++ b/thinkphp/library/think/cache/driver/File.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -27,6 +27,8 @@ class File extends Driver 'data_compress' => false, ]; + protected $expire; + /** * 鏋勯犲嚱鏁 * @param array $options @@ -61,10 +63,11 @@ class File extends Driver /** * 鍙栧緱鍙橀噺鐨勫瓨鍌ㄦ枃浠跺悕 * @access protected - * @param string $name 缂撳瓨鍙橀噺鍚 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param bool $auto 鏄惁鑷姩鍒涘缓鐩綍 * @return string */ - protected function getCacheKey($name) + protected function getCacheKey($name, $auto = false) { $name = md5($name); if ($this->options['cache_subdir']) { @@ -76,7 +79,8 @@ class File extends Driver } $filename = $this->options['path'] . $name . '.php'; $dir = dirname($filename); - if (!is_dir($dir)) { + + if ($auto && !is_dir($dir)) { mkdir($dir, 0755, true); } return $filename; @@ -106,15 +110,15 @@ class File extends Driver if (!is_file($filename)) { return $default; } - $content = file_get_contents($filename); + $content = file_get_contents($filename); + $this->expire = null; if (false !== $content) { $expire = (int) substr($content, 8, 12); - if (0 != $expire && $_SERVER['REQUEST_TIME'] > filemtime($filename) + $expire) { - //缂撳瓨杩囨湡鍒犻櫎缂撳瓨鏂囦欢 - $this->unlink($filename); + if (0 != $expire && time() > filemtime($filename) + $expire) { return $default; } - $content = substr($content, 20, -3); + $this->expire = $expire; + $content = substr($content, 32); if ($this->options['data_compress'] && function_exists('gzcompress')) { //鍚敤鏁版嵁鍘嬬缉 $content = gzuncompress($content); @@ -129,9 +133,9 @@ class File extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param int $expire 鏈夋晥鏃堕棿 0涓烘案涔 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return boolean */ public function set($name, $value, $expire = null) @@ -139,7 +143,10 @@ class File extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } - $filename = $this->getCacheKey($name); + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp() - time(); + } + $filename = $this->getCacheKey($name, true); if ($this->tag && !is_file($filename)) { $first = true; } @@ -148,7 +155,7 @@ class File extends Driver //鏁版嵁鍘嬬缉 $data = gzcompress($data, 3); } - $data = ""; + $data = "\n" . $data; $result = file_put_contents($filename, $data); if ($result) { isset($first) && $this->setTagItem($filename); @@ -169,11 +176,14 @@ class File extends Driver public function inc($name, $step = 1) { if ($this->has($name)) { - $value = $this->get($name) + $step; + $value = $this->get($name) + $step; + $expire = $this->expire; } else { - $value = $step; + $value = $step; + $expire = 0; } - return $this->set($name, $value, 0) ? $value : false; + + return $this->set($name, $value, $expire) ? $value : false; } /** @@ -186,11 +196,14 @@ class File extends Driver public function dec($name, $step = 1) { if ($this->has($name)) { - $value = $this->get($name) - $step; + $value = $this->get($name) - $step; + $expire = $this->expire; } else { - $value = $step; + $value = -$step; + $expire = 0; } - return $this->set($name, $value, 0) ? $value : false; + + return $this->set($name, $value, $expire) ? $value : false; } /** @@ -201,7 +214,11 @@ class File extends Driver */ public function rm($name) { - return $this->unlink($this->getCacheKey($name)); + $filename = $this->getCacheKey($name); + try { + return $this->unlink($filename); + } catch (\Exception $e) { + } } /** @@ -224,7 +241,10 @@ class File extends Driver $files = (array) glob($this->options['path'] . ($this->options['prefix'] ? $this->options['prefix'] . DS : '') . '*'); foreach ($files as $path) { if (is_dir($path)) { - array_map('unlink', glob($path . '/*.php')); + $matches = glob($path . '/*.php'); + if (is_array($matches)) { + array_map('unlink', $matches); + } rmdir($path); } else { unlink($path); diff --git a/thinkphp/library/think/cache/driver/Lite.php b/thinkphp/library/think/cache/driver/Lite.php index eeb96a194..8cbf08f95 100644 --- a/thinkphp/library/think/cache/driver/Lite.php +++ b/thinkphp/library/think/cache/driver/Lite.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -77,7 +77,7 @@ class Lite extends Driver if (is_file($filename)) { // 鍒ゆ柇鏄惁杩囨湡 $mtime = filemtime($filename); - if ($mtime < $_SERVER['REQUEST_TIME']) { + if ($mtime < time()) { // 娓呴櫎宸茬粡杩囨湡鐨勬枃浠 unlink($filename); return $default; @@ -91,9 +91,9 @@ class Lite extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param int $expire 鏈夋晥鏃堕棿 0涓烘案涔 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return bool */ public function set($name, $value, $expire = null) @@ -101,9 +101,11 @@ class Lite extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } - // 妯℃嫙姘镐箙 - if (0 === $expire) { - $expire = 10 * 365 * 24 * 3600; + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp(); + } else { + $expire = 0 === $expire ? 10 * 365 * 24 * 3600 : $expire; + $expire = time() + $expire; } $filename = $this->getCacheKey($name); if ($this->tag && !is_file($filename)) { @@ -113,7 +115,7 @@ class Lite extends Driver // 閫氳繃璁剧疆淇敼鏃堕棿瀹炵幇鏈夋晥鏈 if ($ret) { isset($first) && $this->setTagItem($filename); - touch($filename, $_SERVER['REQUEST_TIME'] + $expire); + touch($filename, $expire); } return $ret; } @@ -147,7 +149,7 @@ class Lite extends Driver if ($this->has($name)) { $value = $this->get($name) - $step; } else { - $value = $step; + $value = -$step; } return $this->set($name, $value, 0) ? $value : false; } diff --git a/thinkphp/library/think/cache/driver/Memcache.php b/thinkphp/library/think/cache/driver/Memcache.php index e464f38cf..58703ea34 100644 --- a/thinkphp/library/think/cache/driver/Memcache.php +++ b/thinkphp/library/think/cache/driver/Memcache.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -63,7 +63,7 @@ class Memcache extends Driver public function has($name) { $key = $this->getCacheKey($name); - return $this->handler->get($key) ? true : false; + return false !== $this->handler->get($key); } /** @@ -82,9 +82,9 @@ class Memcache extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param integer $expire 鏈夋晥鏃堕棿锛堢锛 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return bool */ public function set($name, $value, $expire = null) @@ -92,6 +92,9 @@ class Memcache extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp() - time(); + } if ($this->tag && !$this->has($name)) { $first = true; } diff --git a/thinkphp/library/think/cache/driver/Memcached.php b/thinkphp/library/think/cache/driver/Memcached.php index 4a9d898c1..5aab5a306 100644 --- a/thinkphp/library/think/cache/driver/Memcached.php +++ b/thinkphp/library/think/cache/driver/Memcached.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -93,9 +93,9 @@ class Memcached extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param integer $expire 鏈夋晥鏃堕棿锛堢锛 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return bool */ public function set($name, $value, $expire = null) @@ -103,6 +103,9 @@ class Memcached extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp() - time(); + } if ($this->tag && !$this->has($name)) { $first = true; } diff --git a/thinkphp/library/think/cache/driver/Redis.php b/thinkphp/library/think/cache/driver/Redis.php index 4f6187856..027b3ea26 100644 --- a/thinkphp/library/think/cache/driver/Redis.php +++ b/thinkphp/library/think/cache/driver/Redis.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -46,9 +46,12 @@ class Redis extends Driver if (!empty($options)) { $this->options = array_merge($this->options, $options); } - $func = $this->options['persistent'] ? 'pconnect' : 'connect'; $this->handler = new \Redis; - $this->handler->$func($this->options['host'], $this->options['port'], $this->options['timeout']); + if ($this->options['persistent']) { + $this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_' . $this->options['select']); + } else { + $this->handler->connect($this->options['host'], $this->options['port'], $this->options['timeout']); + } if ('' != $this->options['password']) { $this->handler->auth($this->options['password']); @@ -67,7 +70,7 @@ class Redis extends Driver */ public function has($name) { - return $this->handler->get($this->getCacheKey($name)) ? true : false; + return $this->handler->exists($this->getCacheKey($name)); } /** @@ -80,20 +83,25 @@ class Redis extends Driver public function get($name, $default = false) { $value = $this->handler->get($this->getCacheKey($name)); - if (is_null($value)) { + if (is_null($value) || false === $value) { return $default; } - $jsonData = json_decode($value, true); - // 妫娴嬫槸鍚︿负JSON鏁版嵁 true 杩斿洖JSON瑙ｆ瀽鏁扮粍, false杩斿洖婧愭暟鎹 byron sampson - return (null === $jsonData) ? $value : $jsonData; + + try { + $result = 0 === strpos($value, 'think_serialize:') ? unserialize(substr($value, 16)) : $value; + } catch (\Exception $e) { + $result = $default; + } + + return $result; } /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param integer $expire 鏈夋晥鏃堕棿锛堢锛 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return boolean */ public function set($name, $value, $expire = null) @@ -101,13 +109,15 @@ class Redis extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp() - time(); + } if ($this->tag && !$this->has($name)) { $first = true; } - $key = $this->getCacheKey($name); - //瀵规暟缁/瀵硅薄鏁版嵁杩涜缂撳瓨澶勭悊锛屼繚璇佹暟鎹畬鏁存 byron sampson - $value = (is_object($value) || is_array($value)) ? json_encode($value) : $value; - if (is_int($expire) && $expire) { + $key = $this->getCacheKey($name); + $value = is_scalar($value) ? $value : 'think_serialize:' . serialize($value); + if ($expire) { $result = $this->handler->setex($key, $expire, $value); } else { $result = $this->handler->set($key, $value); @@ -119,26 +129,28 @@ class Redis extends Driver /** * 鑷缂撳瓨锛堥拡瀵规暟鍊肩紦瀛橈級 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param int $step 姝ラ暱 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param int $step 姝ラ暱 * @return false|int */ public function inc($name, $step = 1) { $key = $this->getCacheKey($name); + return $this->handler->incrby($key, $step); } /** * 鑷噺缂撳瓨锛堥拡瀵规暟鍊肩紦瀛橈級 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param int $step 姝ラ暱 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param int $step 姝ラ暱 * @return false|int */ public function dec($name, $step = 1) { $key = $this->getCacheKey($name); + return $this->handler->decrby($key, $step); } diff --git a/thinkphp/library/think/cache/driver/Sqlite.php b/thinkphp/library/think/cache/driver/Sqlite.php index 305fd9e88..dc2ee0559 100644 --- a/thinkphp/library/think/cache/driver/Sqlite.php +++ b/thinkphp/library/think/cache/driver/Sqlite.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -96,9 +96,9 @@ class Sqlite extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param integer $expire 鏈夋晥鏃堕棿锛堢锛 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return boolean */ public function set($name, $value, $expire = null) @@ -108,7 +108,11 @@ class Sqlite extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } - $expire = (0 == $expire) ? 0 : ($_SERVER['REQUEST_TIME'] + $expire); //缂撳瓨鏈夋晥鏈熶负0琛ㄧず姘镐箙缂撳瓨 + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp(); + } else { + $expire = (0 == $expire) ? 0 : (time() + $expire); //缂撳瓨鏈夋晥鏈熶负0琛ㄧず姘镐箙缂撳瓨 + } if (function_exists('gzcompress')) { //鏁版嵁鍘嬬缉 $value = gzcompress($value, 3); @@ -155,7 +159,7 @@ class Sqlite extends Driver if ($this->has($name)) { $value = $this->get($name) - $step; } else { - $value = $step; + $value = -$step; } return $this->set($name, $value, 0) ? $value : false; } diff --git a/thinkphp/library/think/cache/driver/Wincache.php b/thinkphp/library/think/cache/driver/Wincache.php index 3076fc140..03f8d3577 100644 --- a/thinkphp/library/think/cache/driver/Wincache.php +++ b/thinkphp/library/think/cache/driver/Wincache.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -68,9 +68,9 @@ class Wincache extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param integer $expire 鏈夋晥鏃堕棿锛堢锛 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return boolean */ public function set($name, $value, $expire = null) @@ -78,6 +78,9 @@ class Wincache extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp() - time(); + } $key = $this->getCacheKey($name); if ($this->tag && !$this->has($name)) { $first = true; diff --git a/thinkphp/library/think/cache/driver/Xcache.php b/thinkphp/library/think/cache/driver/Xcache.php index 2a0e07ad9..4d94c033c 100644 --- a/thinkphp/library/think/cache/driver/Xcache.php +++ b/thinkphp/library/think/cache/driver/Xcache.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -68,9 +68,9 @@ class Xcache extends Driver /** * 鍐欏叆缂撳瓨 * @access public - * @param string $name 缂撳瓨鍙橀噺鍚 - * @param mixed $value 瀛樺偍鏁版嵁 - * @param integer $expire 鏈夋晥鏃堕棿锛堢锛 + * @param string $name 缂撳瓨鍙橀噺鍚 + * @param mixed $value 瀛樺偍鏁版嵁 + * @param integer|\DateTime $expire 鏈夋晥鏃堕棿锛堢锛 * @return boolean */ public function set($name, $value, $expire = null) @@ -78,6 +78,9 @@ class Xcache extends Driver if (is_null($expire)) { $expire = $this->options['expire']; } + if ($expire instanceof \DateTime) { + $expire = $expire->getTimestamp() - time(); + } if ($this->tag && !$this->has($name)) { $first = true; } diff --git a/thinkphp/library/think/config/driver/Ini.php b/thinkphp/library/think/config/driver/Ini.php index a223a5785..bcd12b697 100644 --- a/thinkphp/library/think/config/driver/Ini.php +++ b/thinkphp/library/think/config/driver/Ini.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/config/driver/Json.php b/thinkphp/library/think/config/driver/Json.php index 557f75fe0..479dcc892 100644 --- a/thinkphp/library/think/config/driver/Json.php +++ b/thinkphp/library/think/config/driver/Json.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/config/driver/Xml.php b/thinkphp/library/think/config/driver/Xml.php index b573a5627..1158519fe 100644 --- a/thinkphp/library/think/config/driver/Xml.php +++ b/thinkphp/library/think/config/driver/Xml.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/console/command/Clear.php b/thinkphp/library/think/console/command/Clear.php index 41019ceaf..1b5102ec2 100644 --- a/thinkphp/library/think/console/command/Clear.php +++ b/thinkphp/library/think/console/command/Clear.php @@ -10,8 +10,10 @@ // +---------------------------------------------------------------------- namespace think\console\command; +use think\Cache; use think\console\Command; use think\console\Input; +use think\console\input\Argument; use think\console\input\Option; use think\console\Output; @@ -22,6 +24,7 @@ class Clear extends Command // 鎸囦护閰嶇疆 $this ->setName('clear') + ->addArgument('type', Argument::OPTIONAL, 'type to clear', null) ->addOption('path', 'd', Option::VALUE_OPTIONAL, 'path to clear', null) ->setDescription('Clear runtime file'); } @@ -30,8 +33,14 @@ class Clear extends Command { $path = $input->getOption('path') ?: RUNTIME_PATH; - if (is_dir($path)) { - $this->clearPath($path); + $type = $input->getArgument('type'); + + if ($type == 'route') { + Cache::clear('route_check'); + } else { + if (is_dir($path)) { + $this->clearPath($path); + } } $output->writeln("Clear Successed"); diff --git a/thinkphp/library/think/console/command/optimize/Config.php b/thinkphp/library/think/console/command/optimize/Config.php index cadfe5ee9..59c69a8e5 100644 --- a/thinkphp/library/think/console/command/optimize/Config.php +++ b/thinkphp/library/think/console/command/optimize/Config.php @@ -30,7 +30,7 @@ class Config extends Command protected function execute(Input $input, Output $output) { - if ($input->hasArgument('module')) { + if ($input->getArgument('module')) { $module = $input->getArgument('module') . DS; } else { $module = ''; diff --git a/thinkphp/library/think/console/command/optimize/Route.php b/thinkphp/library/think/console/command/optimize/Route.php index 911e4c147..6da1d9a62 100644 --- a/thinkphp/library/think/console/command/optimize/Route.php +++ b/thinkphp/library/think/console/command/optimize/Route.php @@ -27,6 +27,11 @@ class Route extends Command protected function execute(Input $input, Output $output) { + + if (!is_dir(RUNTIME_PATH)) { + @mkdir(RUNTIME_PATH, 0755, true); + } + file_put_contents(RUNTIME_PATH . 'route.php', $this->buildRouteCache()); $output->writeln('Succeed!'); } diff --git a/thinkphp/library/think/console/command/optimize/Schema.php b/thinkphp/library/think/console/command/optimize/Schema.php index 27eb9dbb7..33534240e 100644 --- a/thinkphp/library/think/console/command/optimize/Schema.php +++ b/thinkphp/library/think/console/command/optimize/Schema.php @@ -44,7 +44,8 @@ class Schema extends Command if ($input->hasOption('module')) { $module = $input->getOption('module'); // 璇诲彇妯″瀷 - $list = scandir(APP_PATH . $module . DS . 'model'); + $path = APP_PATH . $module . DS . 'model'; + $list = is_dir($path) ? scandir($path) : []; $app = App::$namespace; foreach ($list as $file) { if (0 === strpos($file, '.')) { @@ -66,7 +67,8 @@ class Schema extends Command $tables = Db::connect($config)->getTables($dbName); } elseif (!\think\Config::get('app_multi_module')) { $app = App::$namespace; - $list = scandir(APP_PATH . 'model'); + $path = APP_PATH . 'model'; + $list = is_dir($path) ? scandir($path) : []; foreach ($list as $file) { if (0 === strpos($file, '.')) { continue; diff --git a/thinkphp/library/think/console/output/Descriptor.php b/thinkphp/library/think/console/output/Descriptor.php index 6d98d53c7..23dc64812 100644 --- a/thinkphp/library/think/console/output/Descriptor.php +++ b/thinkphp/library/think/console/output/Descriptor.php @@ -69,7 +69,7 @@ class Descriptor * 鎻忚堪鍙傛暟 * @param InputArgument $argument * @param array $options - * @return string|mixed + * @return void */ protected function describeInputArgument(InputArgument $argument, array $options = []) { @@ -93,7 +93,7 @@ class Descriptor * 鎻忚堪閫夐」 * @param InputOption $option * @param array $options - * @return string|mixed + * @return void */ protected function describeInputOption(InputOption $option, array $options = []) { @@ -128,7 +128,7 @@ class Descriptor * 鎻忚堪杈撳叆 * @param InputDefinition $definition * @param array $options - * @return string|mixed + * @return void */ protected function describeInputDefinition(InputDefinition $definition, array $options = []) { @@ -173,7 +173,7 @@ class Descriptor * 鎻忚堪鎸囦护 * @param Command $command * @param array $options - * @return string|mixed + * @return void */ protected function describeCommand(Command $command, array $options = []) { @@ -208,7 +208,7 @@ class Descriptor * 鎻忚堪鎺у埗鍙 * @param Console $console * @param array $options - * @return string|mixed + * @return void */ protected function describeConsole(Console $console, array $options = []) { diff --git a/thinkphp/library/think/controller/Rest.php b/thinkphp/library/think/controller/Rest.php index 8c5911dff..43ab2f629 100644 --- a/thinkphp/library/think/controller/Rest.php +++ b/thinkphp/library/think/controller/Rest.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -43,7 +43,7 @@ abstract class Rest if ('' == $ext) { // 鑷姩妫娴嬭祫婧愮被鍨 $this->type = $request->type(); - } elseif (!preg_match('/\(' . $this->restTypeList . '\)$/i', $ext)) { + } elseif (!preg_match('/(' . $this->restTypeList . ')$/i', $ext)) { // 璧勬簮绫诲瀷闈炴硶 鍒欑敤榛樿璧勬簮绫诲瀷璁块棶 $this->type = $this->restDefaultType; } else { @@ -51,7 +51,7 @@ abstract class Rest } // 璇锋眰鏂瑰紡妫娴 $method = strtolower($request->method()); - if (false === stripos($this->restMethodList, $method)) { + if (!preg_match('/(' . $this->restMethodList . ')$/i', $method)) { // 璇锋眰鏂瑰紡闈炴硶 鍒欑敤榛樿璇锋眰鏂规硶 $method = $this->restDefaultMethod; } diff --git a/thinkphp/library/think/db/Builder.php b/thinkphp/library/think/db/Builder.php index 5d57cebb9..58b45aa88 100644 --- a/thinkphp/library/think/db/Builder.php +++ b/thinkphp/library/think/db/Builder.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -25,7 +25,7 @@ abstract class Builder protected $exp = ['eq' => '=', 'neq' => '<>', 'gt' => '>', 'egt' => '>=', 'lt' => '<', 'elt' => '<=', 'notlike' => 'NOT LIKE', 'not like' => 'NOT LIKE', 'like' => 'LIKE', 'in' => 'IN', 'exp' => 'EXP', 'notin' => 'NOT IN', 'not in' => 'NOT IN', 'between' => 'BETWEEN', 'not between' => 'NOT BETWEEN', 'notbetween' => 'NOT BETWEEN', 'exists' => 'EXISTS', 'notexists' => 'NOT EXISTS', 'not exists' => 'NOT EXISTS', 'null' => 'NULL', 'notnull' => 'NOT NULL', 'not null' => 'NOT NULL', '> time' => '> TIME', '< time' => '< TIME', '>= time' => '>= TIME', '<= time' => '<= TIME', 'between time' => 'BETWEEN TIME', 'not between time' => 'NOT BETWEEN TIME', 'notbetween time' => 'NOT BETWEEN TIME']; // SQL琛ㄨ揪寮 - protected $selectSql = 'SELECT%DISTINCT% %FIELD% FROM %TABLE%%FORCE%%JOIN%%WHERE%%GROUP%%HAVING%%ORDER%%LIMIT% %UNION%%LOCK%%COMMENT%'; + protected $selectSql = 'SELECT%DISTINCT% %FIELD% FROM %TABLE%%FORCE%%JOIN%%WHERE%%GROUP%%HAVING%%UNION%%ORDER%%LIMIT%%LOCK%%COMMENT%'; protected $insertSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%'; protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) %DATA% %COMMENT%'; protected $updateSql = 'UPDATE %TABLE% SET %SET% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%'; @@ -46,7 +46,7 @@ abstract class Builder /** * 鑾峰彇褰撳墠鐨勮繛鎺ュ璞″疄渚 * @access public - * @return void + * @return Connection */ public function getConnection() { @@ -56,7 +56,7 @@ abstract class Builder /** * 鑾峰彇褰撳墠鐨凲uery瀵硅薄瀹炰緥 * @access public - * @return void + * @return Query */ public function getQuery() { @@ -80,6 +80,7 @@ abstract class Builder * @param array $data 鏁版嵁 * @param array $options 鏌ヨ鍙傛暟 * @return array + * @throws Exception */ protected function parseData($data, $options) { @@ -97,8 +98,15 @@ abstract class Builder $result = []; foreach ($data as $key => $val) { - $item = $this->parseKey($key, $options); - if (is_object($val) && method_exists($val, '__toString')) { + if ('*' != $options['field'] && !in_array($key, $fields, true)) { + continue; + } + + $item = $this->parseKey($key, $options, true); + if ($val instanceof Expression) { + $result[$item] = $val->getValue(); + continue; + } elseif (is_object($val) && method_exists($val, '__toString')) { // 瀵硅薄鏁版嵁鍐欏叆 $val = $val->__toString(); } @@ -108,16 +116,25 @@ abstract class Builder } } elseif (is_null($val)) { $result[$item] = 'NULL'; - } elseif (isset($val[0]) && 'exp' == $val[0]) { - $result[$item] = $val[1]; + } elseif (is_array($val) && !empty($val)) { + switch (strtolower($val[0])) { + case 'inc': + $result[$item] = $item . '+' . floatval($val[1]); + break; + case 'dec': + $result[$item] = $item . '-' . floatval($val[1]); + break; + case 'exp': + throw new Exception('not support data:[' . $val[0] . ']'); + } } elseif (is_scalar($val)) { // 杩囨护闈炴爣閲忔暟鎹 if (0 === strpos($val, ':') && $this->query->isBind(substr($val, 1))) { $result[$item] = $val; } else { $key = str_replace('.', '_', $key); - $this->query->bind('__data__' . $key, $val, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR); - $result[$item] = ':__data__' . $key; + $this->query->bind('data__' . $key, $val, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR); + $result[$item] = ':data__' . $key; } } } @@ -131,7 +148,7 @@ abstract class Builder * @param array $options * @return string */ - protected function parseKey($key, $options = []) + protected function parseKey($key, $options = [], $strict = false) { return $key; } @@ -172,8 +189,10 @@ abstract class Builder // 鏀寔 'field1'=>'field2' 杩欐牱鐨勫瓧娈靛埆鍚嶅畾涔 $array = []; foreach ($fields as $key => $field) { - if (!is_numeric($key)) { - $array[] = $this->parseKey($key, $options) . ' AS ' . $this->parseKey($field, $options); + if ($field instanceof Expression) { + $array[] = $field->getValue(); + } elseif (!is_numeric($key)) { + $array[] = $this->parseKey($key, $options) . ' AS ' . $this->parseKey($field, $options, true); } else { $array[] = $this->parseKey($field, $options); } @@ -195,9 +214,6 @@ abstract class Builder $item = []; foreach ((array) $tables as $key => $table) { if (!is_numeric($key)) { - if (strpos($key, '@think')) { - $key = strstr($key, '@think', true); - } $key = $this->parseSqlTable($key); $item[] = $this->parseKey($key) . ' ' . (isset($options['alias'][$table]) ? $this->parseKey($options['alias'][$table]) : $this->parseKey($table)); } else { @@ -255,7 +271,9 @@ abstract class Builder foreach ($where as $key => $val) { $str = []; foreach ($val as $field => $value) { - if ($value instanceof \Closure) { + if ($value instanceof Expression) { + $str[] = ' ' . $key . ' ( ' . $value->getValue() . ' )'; + } elseif ($value instanceof \Closure) { // 浣跨敤闂寘鏌ヨ $query = new Query($this->connection); call_user_func_array($value, [ & $query]); @@ -296,11 +314,11 @@ abstract class Builder protected function parseWhereItem($field, $val, $rule = '', $options = [], $binds = [], $bindName = null) { // 瀛楁鍒嗘瀽 - $key = $field ? $this->parseKey($field, $options) : ''; + $key = $field ? $this->parseKey($field, $options, true) : ''; // 鏌ヨ瑙勫垯鍜屾潯浠 if (!is_array($val)) { - $val = ['=', $val]; + $val = is_null($val) ? ['null', ''] : ['=', $val]; } list($exp, $value) = $val; @@ -329,12 +347,19 @@ abstract class Builder throw new Exception('where express error:' . $exp); } } - $bindName = $bindName ?: 'where_' . str_replace(['.', '-'], '_', $field); + $bindName = $bindName ?: 'where_' . $rule . '_' . str_replace(['.', '-'], '_', $field); if (preg_match('/\W/', $bindName)) { // 澶勭悊甯﹂潪鍗曡瘝瀛楃鐨勫瓧娈靛悕 $bindName = md5($bindName); } + if ($value instanceof Expression) { + + } elseif (is_object($value) && method_exists($value, '__toString')) { + // 瀵硅薄鏁版嵁鍐欏叆 + $value = $value->__toString(); + } + $bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR; if (is_scalar($value) && array_key_exists($field, $binds) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) { if (strpos($value, ':') !== 0 || !$this->query->isBind(substr($value, 1))) { @@ -367,7 +392,11 @@ abstract class Builder } } elseif ('EXP' == $exp) { // 琛ㄨ揪寮忔煡璇 - $whereStr .= '( ' . $key . ' ' . $value . ' )'; + if ($value instanceof Expression) { + $whereStr .= '( ' . $key . ' ' . $value->getValue() . ' )'; + } else { + throw new Exception('where express error:' . $exp); + } } elseif (in_array($exp, ['NOT NULL', 'NULL'])) { // NULL 鏌ヨ $whereStr .= $key . ' IS ' . $exp; @@ -485,6 +514,11 @@ abstract class Builder } } $bindName = $bindName ?: $key; + + if ($this->query->isBind($bindName)) { + $bindName .= '_' . str_replace('.', '_', uniqid('', true)); + } + $this->query->bind($bindName, $value, $bindType); return ':' . $bindName; } @@ -492,7 +526,7 @@ abstract class Builder /** * limit鍒嗘瀽 * @access protected - * @param mixed $lmit + * @param mixed $limit * @return string */ protected function parseLimit($limit) @@ -515,7 +549,9 @@ abstract class Builder list($table, $type, $on) = $item; $condition = []; foreach ((array) $on as $val) { - if (strpos($val, '=')) { + if ($val instanceof Expression) { + $condition[] = $val->getValue(); + } elseif (strpos($val, '=')) { list($val1, $val2) = explode('=', $val, 2); $condition[] = $this->parseKey($val1, $options) . '=' . $this->parseKey($val2, $options); } else { @@ -539,24 +575,29 @@ abstract class Builder */ protected function parseOrder($order, $options = []) { - if (is_array($order)) { - $array = []; - foreach ($order as $key => $val) { - if (is_numeric($key)) { - if ('[rand]' == $val) { - $array[] = $this->parseRand(); - } elseif (false === strpos($val, '(')) { - $array[] = $this->parseKey($val, $options); - } else { - $array[] = $val; - } - } else { - $sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : ''; - $array[] = $this->parseKey($key, $options) . ' ' . $sort; - } - } - $order = implode(',', $array); + if (empty($order)) { + return ''; } + + $array = []; + foreach ($order as $key => $val) { + if ($val instanceof Expression) { + $array[] = $val->getValue(); + } elseif ('[rand]' == $val) { + $array[] = $this->parseRand(); + } else { + if (is_numeric($key)) { + list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' '); + } else { + $sort = $val; + } + $sort = strtoupper($sort); + $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : ''; + $array[] = $this->parseKey($key, $options, true) . $sort; + } + } + $order = implode(',', $array); + return !empty($order) ? ' ORDER BY ' . $order : ''; } @@ -568,7 +609,7 @@ abstract class Builder */ protected function parseGroup($group) { - return !empty($group) ? ' GROUP BY ' . $group : ''; + return !empty($group) ? ' GROUP BY ' . $this->parseKey($group) : ''; } /** @@ -590,6 +631,9 @@ abstract class Builder */ protected function parseComment($comment) { + if (false !== strpos($comment, '*/')) { + $comment = strstr($comment, '*/', true); + } return !empty($comment) ? ' /* ' . $comment . ' */' : ''; } @@ -619,12 +663,12 @@ abstract class Builder unset($union['type']); foreach ($union as $u) { if ($u instanceof \Closure) { - $sql[] = $type . ' ' . $this->parseClosure($u, false); + $sql[] = $type . ' ' . $this->parseClosure($u); } elseif (is_string($u)) { - $sql[] = $type . ' ' . $this->parseSqlTable($u); + $sql[] = $type . ' ( ' . $this->parseSqlTable($u) . ' )'; } } - return implode(' ', $sql); + return ' ' . implode(' ', $sql); } /** @@ -639,22 +683,22 @@ abstract class Builder return ''; } - if (is_array($index)) { - $index = join(",", $index); - } - - return sprintf(" FORCE INDEX ( %s ) ", $index); + return sprintf(" FORCE INDEX ( %s ) ", is_array($index) ? implode(',', $index) : $index); } /** * 璁剧疆閿佹満鍒 * @access protected - * @param bool $locl + * @param bool|string $lock * @return string */ protected function parseLock($lock = false) { - return $lock ? ' FOR UPDATE ' : ''; + if (is_bool($lock)) { + return $lock ? ' FOR UPDATE ' : ''; + } elseif (is_string($lock)) { + return ' ' . trim($lock) . ' '; + } } /** @@ -723,8 +767,9 @@ abstract class Builder * @param array $options 琛ㄨ揪寮 * @param bool $replace 鏄惁replace * @return string + * @throws Exception */ - public function insertAll($dataSet, $options, $replace = false) + public function insertAll($dataSet, $options = [], $replace = false) { // 鑾峰彇鍚堟硶鐨勫瓧娈 if ('*' == $options['field']) { @@ -733,7 +778,7 @@ abstract class Builder $fields = $options['field']; } - foreach ($dataSet as &$data) { + foreach ($dataSet as $data) { foreach ($data as $key => $val) { if (!in_array($key, $fields, true)) { if ($options['strict']) { @@ -754,23 +799,29 @@ abstract class Builder } $value = array_values($data); $values[] = 'SELECT ' . implode(',', $value); + + if (!isset($insertFields)) { + $insertFields = array_keys($data); + } } - $fields = array_map([$this, 'parseKey'], array_keys(reset($dataSet))); - $sql = str_replace( + + foreach ($insertFields as $field) { + $fields[] = $this->parseKey($field, $options, true); + } + + return str_replace( ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'], [ $replace ? 'REPLACE' : 'INSERT', $this->parseTable($options['table'], $options), - implode(' , ', $fields), + implode(' , ', $insertFields), implode(' UNION ALL ', $values), $this->parseComment($options['comment']), ], $this->insertAllSql); - - return $sql; } /** - * 鐢熸垚slectinsert SQL + * 鐢熸垚select insert SQL * @access public * @param array $fields 鏁版嵁 * @param string $table 鏁版嵁琛 @@ -791,7 +842,7 @@ abstract class Builder /** * 鐢熸垚update SQL * @access public - * @param array $fields 鏁版嵁 + * @param array $data 鏁版嵁 * @param array $options 琛ㄨ揪寮 * @return string */ diff --git a/thinkphp/library/think/db/Connection.php b/thinkphp/library/think/db/Connection.php index 2c2b9a8ca..578cc8f98 100644 --- a/thinkphp/library/think/db/Connection.php +++ b/thinkphp/library/think/db/Connection.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -90,6 +90,8 @@ abstract class Connection 'master_num' => 1, // 鎸囧畾浠庢湇鍔″櫒搴忓彿 'slave_no' => '', + // 妯″瀷鍐欏叆鍚庤嚜鍔ㄨ鍙栦富鏈嶅姟鍣 + 'read_master' => false, // 鏄惁涓ユ牸妫鏌ュ瓧娈垫槸鍚﹀瓨鍦 'fields_strict' => true, // 鏁版嵁杩斿洖绫诲瀷 @@ -338,8 +340,8 @@ abstract class Connection * @param bool $master 鏄惁鍦ㄤ富鏈嶅姟鍣ㄨ鎿嶄綔 * @param bool $pdo 鏄惁杩斿洖PDO瀵硅薄 * @return mixed - * @throws BindParamException * @throws PDOException + * @throws \Exception */ public function query($sql, $bind = [], $master = false, $pdo = false) { @@ -354,19 +356,14 @@ abstract class Connection $this->bind = $bind; } - // 閲婃斁鍓嶆鐨勬煡璇㈢粨鏋 - if (!empty($this->PDOStatement)) { - $this->free(); - } - Db::$queryTimes++; try { // 璋冭瘯寮濮 $this->debug(true); + // 棰勫鐞 - if (empty($this->PDOStatement)) { - $this->PDOStatement = $this->linkID->prepare($sql); - } + $this->PDOStatement = $this->linkID->prepare($sql); + // 鏄惁涓哄瓨鍌ㄨ繃绋嬭皟鐢 $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']); // 鍙傛暟缁戝畾 @@ -378,7 +375,7 @@ abstract class Connection // 鎵ц鏌ヨ $this->PDOStatement->execute(); // 璋冭瘯缁撴潫 - $this->debug(false); + $this->debug(false, '', $master); // 杩斿洖缁撴灉闆 return $this->getResult($pdo, $procedure); } catch (\PDOException $e) { @@ -386,6 +383,11 @@ abstract class Connection return $this->close()->query($sql, $bind, $master, $pdo); } throw new PDOException($e, $this->config, $this->getLastsql()); + } catch (\Throwable $e) { + if ($this->isBreak($e)) { + return $this->close()->query($sql, $bind, $master, $pdo); + } + throw $e; } catch (\Exception $e) { if ($this->isBreak($e)) { return $this->close()->query($sql, $bind, $master, $pdo); @@ -397,13 +399,14 @@ abstract class Connection /** * 鎵ц璇彞 * @access public - * @param string $sql sql鎸囦护 - * @param array $bind 鍙傛暟缁戝畾 + * @param string $sql sql鎸囦护 + * @param array $bind 鍙傛暟缁戝畾 + * @param Query $query 鏌ヨ瀵硅薄 * @return int - * @throws BindParamException * @throws PDOException + * @throws \Exception */ - public function execute($sql, $bind = []) + public function execute($sql, $bind = [], Query $query = null) { $this->initConnect(true); if (!$this->linkID) { @@ -416,19 +419,14 @@ abstract class Connection $this->bind = $bind; } - //閲婃斁鍓嶆鐨勬煡璇㈢粨鏋 - if (!empty($this->PDOStatement) && $this->PDOStatement->queryString != $sql) { - $this->free(); - } - Db::$executeTimes++; try { // 璋冭瘯寮濮 $this->debug(true); + // 棰勫鐞 - if (empty($this->PDOStatement)) { - $this->PDOStatement = $this->linkID->prepare($sql); - } + $this->PDOStatement = $this->linkID->prepare($sql); + // 鏄惁涓哄瓨鍌ㄨ繃绋嬭皟鐢 $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']); // 鍙傛暟缁戝畾 @@ -440,18 +438,27 @@ abstract class Connection // 鎵ц璇彞 $this->PDOStatement->execute(); // 璋冭瘯缁撴潫 - $this->debug(false); + $this->debug(false, '', true); + + if ($query && !empty($this->config['deploy']) && !empty($this->config['read_master'])) { + $query->readMaster(); + } $this->numRows = $this->PDOStatement->rowCount(); return $this->numRows; } catch (\PDOException $e) { if ($this->isBreak($e)) { - return $this->close()->execute($sql, $bind); + return $this->close()->execute($sql, $bind, $query); } throw new PDOException($e, $this->config, $this->getLastsql()); + } catch (\Throwable $e) { + if ($this->isBreak($e)) { + return $this->close()->execute($sql, $bind, $query); + } + throw $e; } catch (\Exception $e) { if ($this->isBreak($e)) { - return $this->close()->execute($sql, $bind); + return $this->close()->execute($sql, $bind, $query); } throw $e; } @@ -466,6 +473,10 @@ abstract class Connection */ public function getRealSql($sql, array $bind = []) { + if (is_array($sql)) { + $sql = implode(';', $sql); + } + foreach ($bind as $key => $val) { $value = is_array($val) ? $val[0] : $val; $type = is_array($val) ? $val[1] : PDO::PARAM_STR; @@ -478,8 +489,8 @@ abstract class Connection $sql = is_numeric($key) ? substr_replace($sql, $value, strpos($sql, '?'), 1) : str_replace( - [':' . $key . ')', ':' . $key . ',', ':' . $key . ' '], - [$value . ')', $value . ',', $value . ' '], + [':' . $key . ')', ':' . $key . ',', ':' . $key . ' ', ':' . $key . PHP_EOL], + [$value . ')', $value . ',', $value . ' ', $value . PHP_EOL], $sql . ' '); } return rtrim($sql); @@ -552,7 +563,7 @@ abstract class Connection * @access protected * @param bool $pdo 鏄惁杩斿洖PDOStatement * @param bool $procedure 鏄惁瀛樺偍杩囩▼ - * @return array + * @return PDOStatement|array */ protected function getResult($pdo = false, $procedure = false) { @@ -618,7 +629,8 @@ abstract class Connection /** * 鍚姩浜嬪姟 * @access public - * @return void + * @return bool|mixed + * @throws \Exception */ public function startTrans() { @@ -637,13 +649,15 @@ abstract class Connection ); } - } catch (\PDOException $e) { + } catch (\Exception $e) { if ($this->isBreak($e)) { + --$this->transTimes; return $this->close()->startTrans(); } throw $e; - } catch (\ErrorException $e) { + } catch (\Error $e) { if ($this->isBreak($e)) { + --$this->transTimes; return $this->close()->startTrans(); } throw $e; @@ -724,7 +738,7 @@ abstract class Connection * @param array $sqlArray SQL鎵瑰鐞嗘寚浠 * @return boolean */ - public function batchQuery($sqlArray = []) + public function batchQuery($sqlArray = [], $bind = [], Query $query = null) { if (!is_array($sqlArray)) { return false; @@ -733,7 +747,7 @@ abstract class Connection $this->startTrans(); try { foreach ($sqlArray as $sql) { - $this->execute($sql); + $this->execute($sql, $bind, $query); } // 鎻愪氦浜嬪姟 $this->commit(); @@ -741,6 +755,7 @@ abstract class Connection $this->rollback(); throw $e; } + return true; } @@ -776,13 +791,15 @@ abstract class Connection $this->linkWrite = null; $this->linkRead = null; $this->links = []; + // 閲婃斁鏌ヨ + $this->free(); return $this; } /** * 鏄惁鏂嚎 * @access protected - * @param \PDOException $e 寮傚父瀵硅薄 + * @param \PDOException|\Exception $e 寮傚父瀵硅薄 * @return bool */ protected function isBreak($e) @@ -802,6 +819,7 @@ abstract class Connection 'SSL connection has been closed unexpectedly', 'Error writing data to the connection', 'Resource deadlock avoided', + 'failed with errno', ]; $error = $e->getMessage(); @@ -882,9 +900,10 @@ abstract class Connection * @access protected * @param boolean $start 璋冭瘯寮濮嬫爣璁 true 寮濮 false 缁撴潫 * @param string $sql 鎵ц鐨凷QL璇彞 鐣欑┖鑷姩鑾峰彇 + * @param boolean $master 涓讳粠鏍囪 * @return void */ - protected function debug($start, $sql = '') + protected function debug($start, $sql = '', $master = false) { if (!empty($this->config['debug'])) { // 寮鍚暟鎹簱璋冭瘯妯″紡 @@ -901,7 +920,7 @@ abstract class Connection $result = $this->getExplain($sql); } // SQL鐩戝惉 - $this->trigger($sql, $runtime, $result); + $this->trigger($sql, $runtime, $result, $master); } } } @@ -923,19 +942,27 @@ abstract class Connection * @param string $sql SQL璇彞 * @param float $runtime SQL杩愯鏃堕棿 * @param mixed $explain SQL鍒嗘瀽 - * @return bool + * @param bool $master 涓讳粠鏍囪 + * @return void */ - protected function trigger($sql, $runtime, $explain = []) + protected function trigger($sql, $runtime, $explain = [], $master = false) { if (!empty(self::$event)) { foreach (self::$event as $callback) { if (is_callable($callback)) { - call_user_func_array($callback, [$sql, $runtime, $explain]); + call_user_func_array($callback, [$sql, $runtime, $explain, $master]); } } } else { // 鏈敞鍐岀洃鍚垯璁板綍鍒版棩蹇椾腑 - Log::record('[ SQL ] ' . $sql . ' [ RunTime:' . $runtime . 's ]', 'sql'); + if ($this->config['deploy']) { + // 鍒嗗竷寮忚褰曞綋鍓嶆搷浣滅殑涓讳粠 + $master = $master ? 'master|' : 'slave|'; + } else { + $master = ''; + } + + Log::record('[ SQL ] ' . $sql . ' [ ' . $master . 'RunTime:' . $runtime . 's ]', 'sql'); if (!empty($explain)) { Log::record('[ EXPLAIN : ' . var_export($explain, true) . ' ]', 'sql'); } diff --git a/thinkphp/library/think/db/Expression.php b/thinkphp/library/think/db/Expression.php new file mode 100644 index 000000000..f1b92abd7 --- /dev/null +++ b/thinkphp/library/think/db/Expression.php @@ -0,0 +1,48 @@ + +// +---------------------------------------------------------------------- + +namespace think\db; + +class Expression +{ + /** + * 鏌ヨ琛ㄨ揪寮 + * + * @var string + */ + protected $value; + + /** + * 鍒涘缓涓涓煡璇㈣〃杈惧紡 + * + * @param string $value + * @return void + */ + public function __construct($value) + { + $this->value = $value; + } + + /** + * 鑾峰彇琛ㄨ揪寮 + * + * @return string + */ + public function getValue() + { + return $this->value; + } + + public function __toString() + { + return (string) $this->value; + } +} diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php index 1ab48f46f..ac4adea16 100644 --- a/thinkphp/library/think/db/Query.php +++ b/thinkphp/library/think/db/Query.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -12,6 +12,7 @@ namespace think\db; use PDO; +use think\App; use think\Cache; use think\Collection; use think\Config; @@ -52,14 +53,16 @@ class Query protected static $info = []; // 鍥炶皟浜嬩欢 private static $event = []; + // 璇诲彇涓诲簱 + protected static $readMaster = []; /** * 鏋勯犲嚱鏁 * @access public * @param Connection $connection 鏁版嵁搴撳璞″疄渚 - * @param string $model 妯″瀷鍚 + * @param Model $model 妯″瀷瀵硅薄 */ - public function __construct(Connection $connection = null, $model = '') + public function __construct(Connection $connection = null, $model = null) { $this->connection = $connection ?: Db::connect([], true); $this->prefix = $this->connection->getConfig('prefix'); @@ -89,6 +92,13 @@ class Query $name = Loader::parseName(substr($method, 10)); $where[$name] = $args[0]; return $this->where($where)->value($args[1]); + } elseif ($this->model && method_exists($this->model, 'scope' . $method)) { + // 鍔ㄦ佽皟鐢ㄥ懡鍚嶈寖鍥 + $method = 'scope' . $method; + array_unshift($args, $this); + + call_user_func_array([$this->model, $method], $args); + return $this; } else { throw new Exception('method not exist:' . __CLASS__ . '->' . $method); } @@ -114,6 +124,7 @@ class Query { $this->connection = Db::connect($config); $this->setBuilder(); + $this->prefix = $this->connection->getConfig('prefix'); return $this; } @@ -129,15 +140,34 @@ class Query } /** - * 鑾峰彇褰撳墠鐨勬ā鍨嬪璞″悕 + * 鑾峰彇褰撳墠鐨勬ā鍨嬪璞″疄渚 * @access public - * @return string + * @return Model|null */ public function getModel() { return $this->model; } + /** + * 璁剧疆鍚庣画浠庝富搴撹鍙栨暟鎹 + * @access public + * @param bool $allTable + * @return void + */ + public function readMaster($allTable = false) + { + if ($allTable) { + $table = '*'; + } else { + $table = isset($this->options['table']) ? $this->options['table'] : $this->getTable(); + } + + static::$readMaster[$table] = true; + + return $this; + } + /** * 鑾峰彇褰撳墠鐨刡uilder瀹炰緥瀵硅薄 * @access public @@ -236,7 +266,7 @@ class Query */ public function execute($sql, $bind = []) { - return $this->connection->execute($sql, $bind); + return $this->connection->execute($sql, $bind, $this); } /** @@ -310,9 +340,9 @@ class Query * @param array $sql SQL鎵瑰鐞嗘寚浠 * @return boolean */ - public function batchQuery($sql = []) + public function batchQuery($sql = [], $bind = []) { - return $this->connection->batchQuery($sql); + return $this->connection->batchQuery($sql, $bind); } /** @@ -401,7 +431,7 @@ class Query if (empty($this->options['table'])) { $this->options['table'] = $this->getTable(); } - $key = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options) . serialize($this->bind)); + $key = is_string($cache['key']) ? $cache['key'] : md5($this->connection->getConfig('database') . '.' . $field . serialize($this->options) . serialize($this->bind)); $result = Cache::get($key); } if (false === $result) { @@ -413,11 +443,13 @@ class Query // 杩斿洖SQL璇彞 return $pdo; } + $result = $pdo->fetchColumn(); if ($force) { - $result = is_numeric($result) ? $result + 0 : $result; + $result = (float) $result; } - if (isset($cache)) { + + if (isset($cache) && false !== $result) { // 缂撳瓨鏁版嵁 $this->cacheData($key, $result, $cache); } @@ -444,7 +476,7 @@ class Query if (empty($this->options['table'])) { $this->options['table'] = $this->getTable(); } - $guid = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options) . serialize($this->bind)); + $guid = is_string($cache['key']) ? $cache['key'] : md5($this->connection->getConfig('database') . '.' . $field . serialize($this->options) . serialize($this->bind)); $result = Cache::get($guid); } if (false === $result) { @@ -507,13 +539,43 @@ class Query public function count($field = '*') { if (isset($this->options['group'])) { + if (!preg_match('/^[\w\.\*]+$/', $field)) { + throw new Exception('not support data:' . $field); + } // 鏀寔GROUP $options = $this->getOptions(); $subSql = $this->options($options)->field('count(' . $field . ')')->bind($this->bind)->buildSql(); - return $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0, true); + + $count = $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0, true); + } else { + $count = $this->aggregate('COUNT', $field, true); } - return $this->value('COUNT(' . $field . ') AS tp_count', 0, true); + return is_string($count) ? $count : (int) $count; + + } + + /** + * 鑱氬悎鏌ヨ + * @access public + * @param string $aggregate 鑱氬悎鏂规硶 + * @param string $field 瀛楁鍚 + * @param bool $force 寮哄埗杞负鏁板瓧绫诲瀷 + * @return mixed + */ + public function aggregate($aggregate, $field, $force = false) + { + if (0 === stripos($field, 'DISTINCT ')) { + list($distinct, $field) = explode(' ', $field); + } + + if (!preg_match('/^[\w\.\+\-\*]+$/', $field)) { + throw new Exception('not support data:' . $field); + } + + $result = $this->value($aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $field . ') AS tp_' . strtolower($aggregate), 0, $force); + + return $result; } /** @@ -524,29 +586,31 @@ class Query */ public function sum($field) { - return $this->value('SUM(' . $field . ') AS tp_sum', 0, true); + return $this->aggregate('SUM', $field, true); } /** * MIN鏌ヨ * @access public * @param string $field 瀛楁鍚 + * @param bool $force 寮哄埗杞负鏁板瓧绫诲瀷 * @return mixed */ - public function min($field) + public function min($field, $force = true) { - return $this->value('MIN(' . $field . ') AS tp_min', 0, true); + return $this->aggregate('MIN', $field, $force); } /** * MAX鏌ヨ * @access public * @param string $field 瀛楁鍚 + * @param bool $force 寮哄埗杞负鏁板瓧绫诲瀷 * @return mixed */ - public function max($field) + public function max($field, $force = true) { - return $this->value('MAX(' . $field . ') AS tp_max', 0, true); + return $this->aggregate('MAX', $field, $force); } /** @@ -557,7 +621,7 @@ class Query */ public function avg($field) { - return $this->value('AVG(' . $field . ') AS tp_avg', 0, true); + return $this->aggregate('AVG', $field, true); } /** @@ -604,7 +668,7 @@ class Query return true; } } - return $this->setField($field, ['exp', $field . '+' . $step]); + return $this->setField($field, ['inc', $step]); } /** @@ -632,8 +696,9 @@ class Query $this->options = []; return true; } + return $this->setField($field, ['inc', $step]); } - return $this->setField($field, ['exp', $field . '-' . $step]); + return $this->setField($field, ['dec', $step]); } /** @@ -701,7 +766,8 @@ class Query { // 浼犲叆鐨勮〃鍚嶄负鏁扮粍 if (is_array($join)) { - list($table, $alias) = each($join); + $table = $join; + $alias = array_shift($join); } else { $join = trim($join); if (false !== strpos($join, '(')) { @@ -722,13 +788,9 @@ class Query $table = $this->getTable($table); } } - } - if (isset($alias)) { - if (isset($this->options['alias'][$table])) { - $table = $table . '@think' . uniqid(); + if (isset($alias) && $table != $alias) { + $table = [$table => $alias]; } - $table = [$table => $alias]; - $this->alias($table); } return $table; } @@ -766,8 +828,15 @@ class Query { if (empty($field)) { return $this; + } elseif ($field instanceof Expression) { + $this->options['field'][] = $field; + return $this; } + if (is_string($field)) { + if (preg_match('/[\<\'\"\(]/', $field)) { + return $this->fieldRaw($field); + } $field = array_map('trim', explode(',', $field)); } if (true === $field) { @@ -791,12 +860,30 @@ class Query } if (isset($this->options['field'])) { - $field = array_merge($this->options['field'], $field); + $field = array_merge((array) $this->options['field'], $field); } $this->options['field'] = array_unique($field); return $this; } + /** + * 琛ㄨ揪寮忔柟寮忔寚瀹氭煡璇㈠瓧娈 + * @access public + * @param string $field 瀛楁鍚 + * @param array $bind 鍙傛暟缁戝畾 + * @return $this + */ + public function fieldRaw($field, array $bind = []) + { + $this->options['field'][] = $this->raw($field); + + if ($bind) { + $this->bind($bind); + } + + return $this; + } + /** * 璁剧疆鏁版嵁 * @access public @@ -825,7 +912,7 @@ class Query { $fields = is_string($field) ? explode(',', $field) : $field; foreach ($fields as $field) { - $this->data($field, ['exp', $field . '+' . $step]); + $this->data($field, ['inc', $step]); } return $this; } @@ -841,7 +928,7 @@ class Query { $fields = is_string($field) ? explode(',', $field) : $field; foreach ($fields as $field) { - $this->data($field, ['exp', $field . '-' . $step]); + $this->data($field, ['dec', $step]); } return $this; } @@ -855,25 +942,36 @@ class Query */ public function exp($field, $value) { - $this->data($field, ['exp', $value]); + $this->data($field, $this->raw($value)); return $this; } + /** + * 浣跨敤琛ㄨ揪寮忚缃暟鎹 + * @access public + * @param mixed $value 琛ㄨ揪寮 + * @return Expression + */ + public function raw($value) + { + return new Expression($value); + } + /** * 鎸囧畾JOIN鏌ヨ瀛楁 * @access public * @param string|array $table 鏁版嵁琛 * @param string|array $field 鏌ヨ瀛楁 - * @param string|array $on JOIN鏉′欢 + * @param mixed $on JOIN鏉′欢 * @param string $type JOIN绫诲瀷 * @return $this */ public function view($join, $field = true, $on = null, $type = 'INNER') { $this->options['view'] = true; - if (is_array($join) && key($join) !== 0) { + if (is_array($join) && key($join) === 0) { foreach ($join as $key => $val) { - $this->view($key, $val[0], isset($val[1]) ? $val[1] : null, isset($val[2]) ? $val[2] : 'INNER'); + $this->view($val[0], $val[1], isset($val[2]) ? $val[2] : null, isset($val[3]) ? $val[3] : 'INNER'); } } else { $fields = []; @@ -972,6 +1070,37 @@ class Query return $this; } + /** + * 鎸囧畾琛ㄨ揪寮忔煡璇㈡潯浠 + * @access public + * @param string $where 鏌ヨ鏉′欢 + * @param array $bind 鍙傛暟缁戝畾 + * @param string $logic 鏌ヨ閫昏緫 and or xor + * @return $this + */ + public function whereRaw($where, $bind = [], $logic = 'AND') + { + $this->options['where'][$logic][] = $this->raw($where); + + if ($bind) { + $this->bind($bind); + } + + return $this; + } + + /** + * 鎸囧畾琛ㄨ揪寮忔煡璇㈡潯浠 OR + * @access public + * @param string $where 鏌ヨ鏉′欢 + * @param array $bind 鍙傛暟缁戝畾 + * @return $this + */ + public function whereOrRaw($where, $bind = []) + { + return $this->whereRaw($where, $bind, 'OR'); + } + /** * 鎸囧畾Null鏌ヨ鏉′欢 * @access public @@ -981,7 +1110,7 @@ class Query */ public function whereNull($field, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'null', null); + $this->parseWhereExp($logic, $field, 'null', null, [], true); return $this; } @@ -994,7 +1123,7 @@ class Query */ public function whereNotNull($field, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'notnull', null); + $this->parseWhereExp($logic, $field, 'notnull', null, [], true); return $this; } @@ -1034,7 +1163,7 @@ class Query */ public function whereIn($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'in', $condition); + $this->parseWhereExp($logic, $field, 'in', $condition, [], true); return $this; } @@ -1048,7 +1177,7 @@ class Query */ public function whereNotIn($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'not in', $condition); + $this->parseWhereExp($logic, $field, 'not in', $condition, [], true); return $this; } @@ -1062,7 +1191,7 @@ class Query */ public function whereLike($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'like', $condition); + $this->parseWhereExp($logic, $field, 'like', $condition, [], true); return $this; } @@ -1076,7 +1205,7 @@ class Query */ public function whereNotLike($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'not like', $condition); + $this->parseWhereExp($logic, $field, 'not like', $condition, [], true); return $this; } @@ -1090,7 +1219,7 @@ class Query */ public function whereBetween($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'between', $condition); + $this->parseWhereExp($logic, $field, 'between', $condition, [], true); return $this; } @@ -1104,7 +1233,7 @@ class Query */ public function whereNotBetween($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'not between', $condition); + $this->parseWhereExp($logic, $field, 'not between', $condition, [], true); return $this; } @@ -1118,7 +1247,7 @@ class Query */ public function whereExp($field, $condition, $logic = 'AND') { - $this->parseWhereExp($logic, $field, 'exp', $condition); + $this->parseWhereExp($logic, $field, 'exp', $this->raw($condition), [], true); return $this; } @@ -1145,9 +1274,10 @@ class Query * @param mixed $op 鏌ヨ琛ㄨ揪寮 * @param mixed $condition 鏌ヨ鏉′欢 * @param array $param 鏌ヨ鍙傛暟 + * @param bool $strict 涓ユ牸妯″紡 * @return void */ - protected function parseWhereExp($logic, $field, $op, $condition, $param = []) + protected function parseWhereExp($logic, $field, $op, $condition, $param = [], $strict = false) { $logic = strtoupper($logic); if ($field instanceof \Closure) { @@ -1158,8 +1288,17 @@ class Query if (is_string($field) && !empty($this->options['via']) && !strpos($field, '.')) { $field = $this->options['via'] . '.' . $field; } - if (is_string($field) && preg_match('/[,=\>\<\'\"\(\s]/', $field)) { - $where[] = ['exp', $field]; + + if ($field instanceof Expression) { + return $this->whereRaw($field, is_array($op) ? $op : []); + } elseif ($strict) { + // 浣跨敤涓ユ牸妯″紡鏌ヨ + $where[$field] = [$op, $condition]; + + // 璁板綍涓涓瓧娈靛娆℃煡璇㈡潯浠 + $this->options['multi'][$logic][$field][] = $where[$field]; + } elseif (is_string($field) && preg_match('/[,=\>\<\'\"\(\s]/', $field)) { + $where[] = ['exp', $this->raw($field)]; if (is_array($op)) { // 鍙傛暟缁戝畾 $this->bind($op); @@ -1180,23 +1319,28 @@ class Query $where[$field] = $param; } elseif (in_array(strtolower($op), ['null', 'notnull', 'not null'])) { // null鏌ヨ - $where[$field] = [$op, '']; + $where[$field] = [$op, '']; + $this->options['multi'][$logic][$field][] = $where[$field]; } elseif (is_null($condition)) { // 瀛楁鐩哥瓑鏌ヨ $where[$field] = ['eq', $op]; - if ('AND' != $logic) { - $this->options['multi'][$logic][$field][] = $where[$field]; - } + + $this->options['multi'][$logic][$field][] = $where[$field]; } else { - $where[$field] = [$op, $condition, isset($param[2]) ? $param[2] : null]; - if ('exp' == strtolower($op) && isset($param[2]) && is_array($param[2])) { + if ('exp' == strtolower($op)) { + $where[$field] = ['exp', $this->raw($condition)]; // 鍙傛暟缁戝畾 - $this->bind($param[2]); + if (isset($param[2]) && is_array($param[2])) { + $this->bind($param[2]); + } + } else { + $where[$field] = [$op, $condition]; } // 璁板綍涓涓瓧娈靛娆℃煡璇㈡潯浠 $this->options['multi'][$logic][$field][] = $where[$field]; } + if (!empty($where)) { if (!isset($this->options['where'][$logic])) { $this->options['where'][$logic] = []; @@ -1238,6 +1382,7 @@ class Query $logic = strtoupper($logic); if (isset($this->options['where'][$logic][$field])) { unset($this->options['where'][$logic][$field]); + unset($this->options['multi'][$logic][$field]); } return $this; } @@ -1413,49 +1558,78 @@ class Query */ public function order($field, $order = null) { - if (!empty($field)) { - if (is_string($field)) { - if (!empty($this->options['via'])) { - $field = $this->options['via'] . '.' . $field; - } - $field = empty($order) ? $field : [$field => $order]; - } elseif (!empty($this->options['via'])) { - foreach ($field as $key => $val) { - if (is_numeric($key)) { - $field[$key] = $this->options['via'] . '.' . $val; - } else { - $field[$this->options['via'] . '.' . $key] = $val; - unset($field[$key]); - } - } + if (empty($field)) { + return $this; + } elseif ($field instanceof Expression) { + $this->options['order'][] = $field; + return $this; + } + + if (is_string($field)) { + if (!empty($this->options['via'])) { + $field = $this->options['via'] . '.' . $field; } - if (!isset($this->options['order'])) { - $this->options['order'] = []; - } - if (is_array($field)) { - $this->options['order'] = array_merge($this->options['order'], $field); + if (strpos($field, ',')) { + $field = array_map('trim', explode(',', $field)); } else { - $this->options['order'][] = $field; + $field = empty($order) ? $field : [$field => $order]; + } + } elseif (!empty($this->options['via'])) { + foreach ($field as $key => $val) { + if (is_numeric($key)) { + $field[$key] = $this->options['via'] . '.' . $val; + } else { + $field[$this->options['via'] . '.' . $key] = $val; + unset($field[$key]); + } } } + if (!isset($this->options['order'])) { + $this->options['order'] = []; + } + if (is_array($field)) { + $this->options['order'] = array_merge($this->options['order'], $field); + } else { + $this->options['order'][] = $field; + } + + return $this; + } + + /** + * 琛ㄨ揪寮忔柟寮忔寚瀹欶ield鎺掑簭 + * @access public + * @param string $field 鎺掑簭瀛楁 + * @param array $bind 鍙傛暟缁戝畾 + * @return $this + */ + public function orderRaw($field, array $bind = []) + { + $this->options['order'][] = $this->raw($field); + + if ($bind) { + $this->bind($bind); + } + return $this; } /** * 鏌ヨ缂撳瓨 * @access public - * @param mixed $key 缂撳瓨key - * @param integer $expire 缂撳瓨鏈夋晥鏈 - * @param string $tag 缂撳瓨鏍囩 + * @param mixed $key 缂撳瓨key + * @param integer|\DateTime $expire 缂撳瓨鏈夋晥鏈 + * @param string $tag 缂撳瓨鏍囩 * @return $this */ public function cache($key = true, $expire = null, $tag = null) { // 澧炲姞蹇嵎璋冪敤鏂瑰紡 cache(10) 绛夊悓浜 cache(true, 10) - if (is_numeric($key) && is_null($expire)) { + if ($key instanceof \DateTime || (is_numeric($key) && is_null($expire))) { $expire = $key; $key = true; } + if (false !== $key) { $this->options['cache'] = ['key' => $key, 'expire' => $expire, 'tag' => $tag]; } @@ -1489,7 +1663,7 @@ class Query /** * 鎸囧畾鏌ヨlock * @access public - * @param boolean $lock 鏄惁lock + * @param bool|string $lock 鏄惁lock * @return $this */ public function lock($lock = false) @@ -1521,7 +1695,12 @@ class Query { if (is_array($alias)) { foreach ($alias as $key => $val) { - $this->options['alias'][$key] = $val; + if (false !== strpos($key, '__')) { + $table = $this->parseSqlTable($key); + } else { + $table = $key; + } + $this->options['alias'][$table] = $val; } } else { if (isset($this->options['table'])) { @@ -1649,46 +1828,49 @@ class Query * 鏌ヨ鏃ユ湡鎴栬呮椂闂 * @access public * @param string $field 鏃ユ湡瀛楁鍚 - * @param string $op 姣旇緝杩愮畻绗︽垨鑰呰〃杈惧紡 + * @param string|array $op 姣旇緝杩愮畻绗︽垨鑰呰〃杈惧紡 * @param string|array $range 姣旇緝鑼冨洿 * @return $this */ public function whereTime($field, $op, $range = null) { if (is_null($range)) { - // 浣跨敤鏃ユ湡琛ㄨ揪寮 - $date = getdate(); - switch (strtolower($op)) { - case 'today': - case 'd': - $range = ['today', 'tomorrow']; - break; - case 'week': - case 'w': - $range = 'this week 00:00:00'; - break; - case 'month': - case 'm': - $range = mktime(0, 0, 0, $date['mon'], 1, $date['year']); - break; - case 'year': - case 'y': - $range = mktime(0, 0, 0, 1, 1, $date['year']); - break; - case 'yesterday': - $range = ['yesterday', 'today']; - break; - case 'last week': - $range = ['last week 00:00:00', 'this week 00:00:00']; - break; - case 'last month': - $range = [date('y-m-01', strtotime('-1 month')), mktime(0, 0, 0, $date['mon'], 1, $date['year'])]; - break; - case 'last year': - $range = [mktime(0, 0, 0, 1, 1, $date['year'] - 1), mktime(0, 0, 0, 1, 1, $date['year'])]; - break; - default: - $range = $op; + if (is_array($op)) { + $range = $op; + } else { + // 浣跨敤鏃ユ湡琛ㄨ揪寮 + switch (strtolower($op)) { + case 'today': + case 'd': + $range = ['today', 'tomorrow']; + break; + case 'week': + case 'w': + $range = ['this week 00:00:00', 'next week 00:00:00']; + break; + case 'month': + case 'm': + $range = ['first Day of this month 00:00:00', 'first Day of next month 00:00:00']; + break; + case 'year': + case 'y': + $range = ['this year 1/1', 'next year 1/1']; + break; + case 'yesterday': + $range = ['yesterday', 'today']; + break; + case 'last week': + $range = ['last week 00:00:00', 'this week 00:00:00']; + break; + case 'last month': + $range = ['first Day of last month 00:00:00', 'first Day of this month 00:00:00']; + break; + case 'last year': + $range = ['last year 1/1', 'this year 1/1']; + break; + default: + $range = $op; + } } $op = is_array($range) ? 'between' : '>'; } @@ -1733,7 +1915,7 @@ class Query $schema = $guid; } // 璇诲彇缂撳瓨 - if (is_file(RUNTIME_PATH . 'schema/' . $schema . '.php')) { + if (!App::$debug && is_file(RUNTIME_PATH . 'schema/' . $schema . '.php')) { $info = include RUNTIME_PATH . 'schema/' . $schema . '.php'; } else { $info = $this->connection->getFields($guid); @@ -1808,7 +1990,9 @@ class Query */ protected function getFieldBindType($type) { - if (preg_match('/(int|double|float|decimal|real|numeric|serial|bit)/is', $type)) { + if (0 === strpos($type, 'set') || 0 === strpos($type, 'enum')) { + $bind = PDO::PARAM_STR; + } elseif (preg_match('/(int|double|float|decimal|real|numeric|serial|bit)/is', $type)) { $bind = PDO::PARAM_INT; } elseif (preg_match('/bool/is', $type)) { $bind = PDO::PARAM_BOOL; @@ -1890,11 +2074,10 @@ class Query $with = explode(',', $with); } - $first = true; - $currentModel = $this->model; + $first = true; /** @var Model $class */ - $class = new $currentModel; + $class = $this->model; foreach ($with as $key => $relation) { $subRelation = ''; $closure = false; @@ -1947,14 +2130,23 @@ class Query $this->field('*'); } foreach ($relations as $key => $relation) { - $closure = false; + $closure = $name = null; if ($relation instanceof \Closure) { $closure = $relation; $relation = $key; + } elseif (!is_int($key)) { + $name = $relation; + $relation = $key; } $relation = Loader::parseName($relation, 1, false); - $count = '(' . (new $this->model)->$relation()->getRelationCountQuery($closure) . ')'; - $this->field([$count => Loader::parseName($relation) . '_count']); + + $count = '(' . $this->model->$relation()->getRelationCountQuery($closure, $name) . ')'; + + if (empty($name)) { + $name = Loader::parseName($relation) . '_count'; + } + + $this->field([$count => $name]); } } return $this; @@ -2080,7 +2272,7 @@ class Query } // 鎵ц鎿嶄綔 - $result = $this->execute($sql, $bind); + $result = 0 === $sql ? 0 : $this->execute($sql, $bind, $this); if ($result) { $sequence = $sequence ?: (isset($options['sequence']) ? $options['sequence'] : null); $lastInsId = $this->getLastInsID($sequence); @@ -2116,27 +2308,40 @@ class Query /** * 鎵归噺鎻掑叆璁板綍 * @access public - * @param mixed $dataSet 鏁版嵁闆 - * @param boolean $replace 鏄惁replace + * @param mixed $dataSet 鏁版嵁闆 + * @param boolean $replace 鏄惁replace + * @param integer $limit 姣忔鍐欏叆鏁版嵁闄愬埗 * @return integer|string */ - public function insertAll(array $dataSet, $replace = false) + public function insertAll(array $dataSet, $replace = false, $limit = null) { // 鍒嗘瀽鏌ヨ琛ㄨ揪寮 $options = $this->parseExpress(); if (!is_array(reset($dataSet))) { return false; } + // 鐢熸垚SQL璇彞 - $sql = $this->builder->insertAll($dataSet, $options, $replace); + if (is_null($limit)) { + $sql = $this->builder->insertAll($dataSet, $options, $replace); + } else { + $array = array_chunk($dataSet, $limit, true); + foreach ($array as $item) { + $sql[] = $this->builder->insertAll($item, $options, $replace); + } + } + // 鑾峰彇鍙傛暟缁戝畾 $bind = $this->getBind(); if ($options['fetch_sql']) { // 鑾峰彇瀹為檯鎵ц鐨凷QL璇彞 return $this->connection->getRealSql($sql, $bind); + } elseif (is_array($sql)) { + // 鎵ц鎿嶄綔 + return $this->batchQuery($sql, $bind, $this); } else { // 鎵ц鎿嶄綔 - return $this->execute($sql, $bind); + return $this->execute($sql, $bind, $this); } } @@ -2162,7 +2367,7 @@ class Query return $this->connection->getRealSql($sql, $bind); } else { // 鎵ц鎿嶄綔 - return $this->execute($sql, $bind); + return $this->execute($sql, $bind, $this); } } @@ -2229,7 +2434,7 @@ class Query Cache::clear($options['cache']['tag']); } // 鎵ц鎿嶄綔 - $result = '' == $sql ? 0 : $this->execute($sql, $bind); + $result = '' == $sql ? 0 : $this->execute($sql, $bind, $this); if ($result) { if (is_string($pk) && isset($where[$pk])) { $data[$pk] = $where[$pk]; @@ -2298,7 +2503,7 @@ class Query // 鍒ゆ柇鏌ヨ缂撳瓨 $cache = $options['cache']; unset($options['cache']); - $key = is_string($cache['key']) ? $cache['key'] : md5(serialize($options) . serialize($this->bind)); + $key = is_string($cache['key']) ? $cache['key'] : md5($this->connection->getConfig('database') . '.' . serialize($options) . serialize($this->bind)); $resultSet = Cache::get($key); } if (false === $resultSet) { @@ -2332,11 +2537,10 @@ class Query // 鏁版嵁鍒楄〃璇诲彇鍚庣殑澶勭悊 if (!empty($this->model)) { // 鐢熸垚妯″瀷瀵硅薄 - $modelName = $this->model; if (count($resultSet) > 0) { foreach ($resultSet as $key => $result) { - /** @var Model $result */ - $model = new $modelName($result); + /** @var Model $model */ + $model = $this->model->newInstance($result); $model->isUpdate(true); // 鍏宠仈鏌ヨ @@ -2356,7 +2560,7 @@ class Query // 妯″瀷鏁版嵁闆嗚浆鎹 $resultSet = $model->toCollection($resultSet); } else { - $resultSet = (new $modelName)->toCollection($resultSet); + $resultSet = $this->model->toCollection($resultSet); } } elseif ('collection' == $this->connection->getConfig('resultset_type')) { // 杩斿洖Collection瀵硅薄 @@ -2391,18 +2595,25 @@ class Query * @param mixed $value 缂撳瓨鏁版嵁 * @param array $options 缂撳瓨鍙傛暟 * @param array $bind 缁戝畾鍙傛暟 + * @return string */ protected function getCacheKey($value, $options, $bind = []) { if (is_scalar($value)) { $data = $value; - } elseif (is_array($value) && 'eq' == strtolower($value[0])) { + } elseif (is_array($value) && is_string($value[0]) && 'eq' == strtolower($value[0])) { $data = $value[1]; } + $prefix = $this->connection->getConfig('database') . '.'; + if (isset($data)) { - return 'think:' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data; - } else { - return md5(serialize($options) . serialize($bind)); + return 'think:' . $prefix . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data; + } + + try { + return md5($prefix . serialize($options) . serialize($bind)); + } catch (\Exception $e) { + throw new Exception('closure not support cache(true)'); } } @@ -2439,11 +2650,11 @@ class Query // 鍒ゆ柇鏌ヨ缂撳瓨 $cache = $options['cache']; if (true === $cache['key'] && !is_null($data) && !is_array($data)) { - $key = 'think:' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data; + $key = 'think:' . $this->connection->getConfig('database') . '.' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data; } elseif (is_string($cache['key'])) { $key = $cache['key']; } elseif (!isset($key)) { - $key = md5(serialize($options) . serialize($this->bind)); + $key = md5($this->connection->getConfig('database') . '.' . serialize($options) . serialize($this->bind)); } $result = Cache::get($key); } @@ -2481,7 +2692,7 @@ class Query $result = isset($resultSet[0]) ? $resultSet[0] : null; } - if (isset($cache) && false !== $result) { + if (isset($cache) && $result) { // 缂撳瓨鏁版嵁 $this->cacheData($key, $result, $cache); } @@ -2491,8 +2702,7 @@ class Query if (!empty($result)) { if (!empty($this->model)) { // 杩斿洖妯″瀷瀵硅薄 - $model = $this->model; - $result = new $model($result); + $result = $this->model->newInstance($result); $result->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null); // 鍏宠仈鏌ヨ if (!empty($options['relation'])) { @@ -2523,7 +2733,8 @@ class Query protected function throwNotFound($options = []) { if (!empty($this->model)) { - throw new ModelNotFoundException('model data Not Found:' . $this->model, $this->model, $options); + $class = get_class($this->model); + throw new ModelNotFoundException('model data Not Found:' . $class, $class, $options); } else { $table = is_array($options['table']) ? key($options['table']) : $options['table']; throw new DataNotFoundException('table data not Found:' . $table, $table, $options); @@ -2564,44 +2775,61 @@ class Query * @param integer $count 姣忔澶勭悊鐨勬暟鎹暟閲 * @param callable $callback 澶勭悊鍥炶皟鏂规硶 * @param string $column 鍒嗘壒澶勭悊鐨勫瓧娈靛悕 + * @param string $order 鎺掑簭瑙勫垯 * @return boolean + * @throws \LogicException */ - public function chunk($count, $callback, $column = null) + public function chunk($count, $callback, $column = null, $order = 'asc') { $options = $this->getOptions(); - if (isset($options['table'])) { - $table = is_array($options['table']) ? key($options['table']) : $options['table']; - } else { - $table = ''; - } - $column = $column ?: $this->getPk($table); - $bind = $this->bind; - $resultSet = $this->limit($count)->order($column, 'asc')->select(); - if (strpos($column, '.')) { - list($alias, $key) = explode('.', $column); - } else { - $key = $column; - } - if ($resultSet instanceof Collection) { - $resultSet = $resultSet->all(); + if (empty($options['table'])) { + $options['table'] = $this->getTable(); } + $column = $column ?: $this->getPk($options); - while (!empty($resultSet)) { - if (false === call_user_func($callback, $resultSet)) { - return false; + if (isset($options['order'])) { + if (App::$debug) { + throw new \LogicException('chunk not support call order'); } - $end = end($resultSet); - $lastId = is_array($end) ? $end[$key] : $end->$key; - $resultSet = $this->options($options) - ->limit($count) - ->bind($bind) - ->where($column, '>', $lastId) - ->order($column, 'asc') - ->select(); + unset($options['order']); + } + $bind = $this->bind; + if (is_array($column)) { + $times = 1; + $query = $this->options($options)->page($times, $count); + } else { + if (strpos($column, '.')) { + list($alias, $key) = explode('.', $column); + } else { + $key = $column; + } + $query = $this->options($options)->limit($count); + } + $resultSet = $query->order($column, $order)->select(); + + while (count($resultSet) > 0) { if ($resultSet instanceof Collection) { $resultSet = $resultSet->all(); } + + if (false === call_user_func($callback, $resultSet)) { + return false; + } + + if (is_array($column)) { + $times++; + $query = $this->options($options)->page($times, $count); + } else { + $end = end($resultSet); + $lastId = is_array($end) ? $end[$key] : $end->getData($key); + $query = $this->options($options) + ->limit($count) + ->where($column, 'asc' == strtolower($order) ? '>' : '<', $lastId); + } + + $resultSet = $query->bind($bind)->order($column, $order)->select(); } + return true; } @@ -2678,7 +2906,7 @@ class Query Cache::clear($options['cache']['tag']); } // 鎵ц鎿嶄綔 - $result = $this->execute($sql, $bind); + $result = $this->execute($sql, $bind, $this); if ($result) { if (!is_array($data) && is_string($pk) && isset($key) && strpos($key, '|')) { list($a, $val) = explode('|', $key); @@ -2763,6 +2991,10 @@ class Query } } + if (isset(static::$readMaster['*']) || (is_string($options['table']) && isset(static::$readMaster[$options['table']]))) { + $options['master'] = true; + } + foreach (['join', 'union', 'group', 'having', 'limit', 'order', 'force', 'comment'] as $name) { if (!isset($options[$name])) { $options[$name] = ''; diff --git a/thinkphp/library/think/db/builder/Mysql.php b/thinkphp/library/think/db/builder/Mysql.php index 5bc9d03b1..be2af7141 100644 --- a/thinkphp/library/think/db/builder/Mysql.php +++ b/thinkphp/library/think/db/builder/Mysql.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -12,28 +12,93 @@ namespace think\db\builder; use think\db\Builder; +use think\Exception; /** * mysql鏁版嵁搴撻┍鍔 */ class Mysql extends Builder { - protected $updateSql = 'UPDATE %TABLE% %JOIN% SET %SET% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%'; + + protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES %DATA% %COMMENT%'; + protected $updateSql = 'UPDATE %TABLE% %JOIN% SET %SET% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%'; + + /** + * 鐢熸垚insertall SQL + * @access public + * @param array $dataSet 鏁版嵁闆 + * @param array $options 琛ㄨ揪寮 + * @param bool $replace 鏄惁replace + * @return string + * @throws Exception + */ + public function insertAll($dataSet, $options = [], $replace = false) + { + // 鑾峰彇鍚堟硶鐨勫瓧娈 + if ('*' == $options['field']) { + $fields = array_keys($this->query->getFieldsType($options['table'])); + } else { + $fields = $options['field']; + } + + foreach ($dataSet as $data) { + foreach ($data as $key => $val) { + if (!in_array($key, $fields, true)) { + if ($options['strict']) { + throw new Exception('fields not exists:[' . $key . ']'); + } + unset($data[$key]); + } elseif (is_null($val)) { + $data[$key] = 'NULL'; + } elseif (is_scalar($val)) { + $data[$key] = $this->parseValue($val, $key); + } elseif (is_object($val) && method_exists($val, '__toString')) { + // 瀵硅薄鏁版嵁鍐欏叆 + $data[$key] = $val->__toString(); + } else { + // 杩囨护鎺夐潪鏍囬噺鏁版嵁 + unset($data[$key]); + } + } + $value = array_values($data); + $values[] = '( ' . implode(',', $value) . ' )'; + + if (!isset($insertFields)) { + $insertFields = array_map([$this, 'parseKey'], array_keys($data)); + } + } + + return str_replace( + ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'], + [ + $replace ? 'REPLACE' : 'INSERT', + $this->parseTable($options['table'], $options), + implode(' , ', $insertFields), + implode(' , ', $values), + $this->parseComment($options['comment']), + ], $this->insertAllSql); + } /** * 瀛楁鍜岃〃鍚嶅鐞 * @access protected - * @param string $key + * @param mixed $key * @param array $options * @return string */ - protected function parseKey($key, $options = []) + protected function parseKey($key, $options = [], $strict = false) { + if (is_numeric($key)) { + return $key; + } elseif ($key instanceof Expression) { + return $key->getValue(); + } + $key = trim($key); if (strpos($key, '$.') && false === strpos($key, '(')) { // JSON瀛楁鏀寔 list($field, $name) = explode('$.', $key); - $key = 'json_extract(' . $field . ', \'$.' . $name . '\')'; + return 'json_extract(' . $field . ', \'$.' . $name . '\')'; } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) { list($table, $key) = explode('.', $key, 2); if ('__TABLE__' == $table) { @@ -43,7 +108,11 @@ class Mysql extends Builder $table = $options['alias'][$table]; } } - if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) { + + if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) { + throw new Exception('not support data:' . $key); + } + if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) { $key = '`' . $key . '`'; } if (isset($table)) { diff --git a/thinkphp/library/think/db/builder/Pgsql.php b/thinkphp/library/think/db/builder/Pgsql.php index 5be0468a3..acc228961 100644 --- a/thinkphp/library/think/db/builder/Pgsql.php +++ b/thinkphp/library/think/db/builder/Pgsql.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -18,6 +18,8 @@ use think\db\Builder; */ class Pgsql extends Builder { + protected $insertSql = 'INSERT INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%'; + protected $insertAllSql = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%'; /** * limit鍒嗘瀽 @@ -42,12 +44,18 @@ class Pgsql extends Builder /** * 瀛楁鍜岃〃鍚嶅鐞 * @access protected - * @param string $key + * @param mixed $key * @param array $options * @return string */ - protected function parseKey($key, $options = []) + protected function parseKey($key, $options = [], $strict = false) { + if (is_numeric($key)) { + return $key; + } elseif ($key instanceof Expression) { + return $key->getValue(); + } + $key = trim($key); if (strpos($key, '$.') && false === strpos($key, '(')) { // JSON瀛楁鏀寔 diff --git a/thinkphp/library/think/db/builder/Sqlite.php b/thinkphp/library/think/db/builder/Sqlite.php index 55d3abc41..c727f04b8 100644 --- a/thinkphp/library/think/db/builder/Sqlite.php +++ b/thinkphp/library/think/db/builder/Sqlite.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -22,6 +22,7 @@ class Sqlite extends Builder /** * limit * @access public + * @param string $limit * @return string */ public function parseLimit($limit) @@ -51,12 +52,18 @@ class Sqlite extends Builder /** * 瀛楁鍜岃〃鍚嶅鐞 * @access protected - * @param string $key + * @param mixed $key * @param array $options * @return string */ - protected function parseKey($key, $options = []) + protected function parseKey($key, $options = [], $strict = false) { + if (is_numeric($key)) { + return $key; + } elseif ($key instanceof Expression) { + return $key->getValue(); + } + $key = trim($key); if (strpos($key, '.')) { list($table, $key) = explode('.', $key, 2); diff --git a/thinkphp/library/think/db/builder/Sqlsrv.php b/thinkphp/library/think/db/builder/Sqlsrv.php index 52629e732..dc425d9eb 100644 --- a/thinkphp/library/think/db/builder/Sqlsrv.php +++ b/thinkphp/library/think/db/builder/Sqlsrv.php @@ -12,6 +12,7 @@ namespace think\db\builder; use think\db\Builder; +use think\db\Expression; /** * Sqlsrv鏁版嵁搴撻┍鍔 @@ -22,6 +23,8 @@ class Sqlsrv extends Builder protected $selectInsertSql = 'SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%'; protected $updateSql = 'UPDATE %TABLE% SET %SET% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%'; protected $deleteSql = 'DELETE FROM %TABLE% %USING% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%'; + protected $insertSql = 'INSERT INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%'; + protected $insertAllSql = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%'; /** * order鍒嗘瀽 @@ -32,23 +35,29 @@ class Sqlsrv extends Builder */ protected function parseOrder($order, $options = []) { - if (is_array($order)) { - $array = []; - foreach ($order as $key => $val) { - if (is_numeric($key)) { - if (false === strpos($val, '(')) { - $array[] = $this->parseKey($val, $options); - } elseif ('[rand]' == $val) { - $array[] = $this->parseRand(); - } - } else { - $sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : ''; - $array[] = $this->parseKey($key, $options) . ' ' . $sort; - } - } - $order = implode(',', $array); + if (empty($order)) { + return ' ORDER BY rand()'; } - return !empty($order) ? ' ORDER BY ' . $order : ' ORDER BY rand()'; + + $array = []; + foreach ($order as $key => $val) { + if ($val instanceof Expression) { + $array[] = $val->getValue(); + } elseif (is_numeric($key)) { + if (false === strpos($val, '(')) { + $array[] = $this->parseKey($val, $options); + } elseif ('[rand]' == $val) { + $array[] = $this->parseRand(); + } else { + $array[] = $val; + } + } else { + $sort = in_array(strtolower(trim($val)), ['asc', 'desc'], true) ? ' ' . $val : ''; + $array[] = $this->parseKey($key, $options, true) . ' ' . $sort; + } + } + + return ' ORDER BY ' . implode(',', $array); } /** @@ -64,12 +73,17 @@ class Sqlsrv extends Builder /** * 瀛楁鍜岃〃鍚嶅鐞 * @access protected - * @param string $key + * @param mixed $key * @param array $options * @return string */ - protected function parseKey($key, $options = []) + protected function parseKey($key, $options = [], $strict = false) { + if (is_numeric($key)) { + return $key; + } elseif ($key instanceof Expression) { + return $key->getValue(); + } $key = trim($key); if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) { list($table, $key) = explode('.', $key, 2); @@ -80,7 +94,11 @@ class Sqlsrv extends Builder $table = $options['alias'][$table]; } } - if (!is_numeric($key) && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) { + + if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) { + throw new Exception('not support data:' . $key); + } + if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) { $key = '[' . $key . ']'; } if (isset($table)) { diff --git a/thinkphp/library/think/db/connector/Mysql.php b/thinkphp/library/think/db/connector/Mysql.php index 536125fd1..be1a85ce7 100644 --- a/thinkphp/library/think/db/connector/Mysql.php +++ b/thinkphp/library/think/db/connector/Mysql.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -31,12 +31,15 @@ class Mysql extends Connection */ protected function parseDsn($config) { - $dsn = 'mysql:dbname=' . $config['database'] . ';host=' . $config['hostname']; - if (!empty($config['hostport'])) { - $dsn .= ';port=' . $config['hostport']; - } elseif (!empty($config['socket'])) { - $dsn .= ';unix_socket=' . $config['socket']; + if (!empty($config['socket'])) { + $dsn = 'mysql:unix_socket=' . $config['socket']; + } elseif (!empty($config['hostport'])) { + $dsn = 'mysql:host=' . $config['hostname'] . ';port=' . $config['hostport']; + } else { + $dsn = 'mysql:host=' . $config['hostname']; } + $dsn .= ';dbname=' . $config['database']; + if (!empty($config['charset'])) { $dsn .= ';charset=' . $config['charset']; } diff --git a/thinkphp/library/think/db/connector/Pgsql.php b/thinkphp/library/think/db/connector/Pgsql.php index 761fbac4b..bbcf57683 100644 --- a/thinkphp/library/think/db/connector/Pgsql.php +++ b/thinkphp/library/think/db/connector/Pgsql.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/db/connector/Sqlite.php b/thinkphp/library/think/db/connector/Sqlite.php index fd7f02b01..c4e3a7240 100644 --- a/thinkphp/library/think/db/connector/Sqlite.php +++ b/thinkphp/library/think/db/connector/Sqlite.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/db/connector/Sqlsrv.php b/thinkphp/library/think/db/connector/Sqlsrv.php index 08ad45e26..35c660059 100644 --- a/thinkphp/library/think/db/connector/Sqlsrv.php +++ b/thinkphp/library/think/db/connector/Sqlsrv.php @@ -50,7 +50,10 @@ class Sqlsrv extends Connection public function getFields($tableName) { list($tableName) = explode(' ', $tableName); - $sql = "SELECT column_name, data_type, column_default, is_nullable + $tableNames = explode('.', $tableName); + $tableName = isset($tableNames[1]) ? $tableNames[1] : $tableNames[0]; + + $sql = "SELECT column_name, data_type, column_default, is_nullable FROM information_schema.tables AS t JOIN information_schema.columns AS c ON t.table_catalog = c.table_catalog diff --git a/thinkphp/library/think/db/exception/BindParamException.php b/thinkphp/library/think/db/exception/BindParamException.php index d0e2387bc..4ed195468 100644 --- a/thinkphp/library/think/db/exception/BindParamException.php +++ b/thinkphp/library/think/db/exception/BindParamException.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/db/exception/DataNotFoundException.php b/thinkphp/library/think/db/exception/DataNotFoundException.php index e399b0637..f2542ac6e 100644 --- a/thinkphp/library/think/db/exception/DataNotFoundException.php +++ b/thinkphp/library/think/db/exception/DataNotFoundException.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/db/exception/ModelNotFoundException.php b/thinkphp/library/think/db/exception/ModelNotFoundException.php index 2180ab072..6e5f930cc 100644 --- a/thinkphp/library/think/db/exception/ModelNotFoundException.php +++ b/thinkphp/library/think/db/exception/ModelNotFoundException.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/debug/Console.php b/thinkphp/library/think/debug/Console.php index 8a232c8c1..c17911b2d 100644 --- a/thinkphp/library/think/debug/Console.php +++ b/thinkphp/library/think/debug/Console.php @@ -137,7 +137,7 @@ JS; } break; case '閿欒': - $msg = str_replace("\n", '\n', $m); + $msg = str_replace("\n", '\n', json_encode($m)); $style = 'color:#F4006B;font-size:14px;'; $line[] = "console.error(\"%c{$msg}\", \"{$style}\");"; break; diff --git a/thinkphp/library/think/debug/Html.php b/thinkphp/library/think/debug/Html.php index f8651aa92..b6be7adbe 100644 --- a/thinkphp/library/think/debug/Html.php +++ b/thinkphp/library/think/debug/Html.php @@ -53,7 +53,7 @@ class Html return false; } // 鑾峰彇鍩烘湰淇℃伅 - $runtime = number_format(microtime(true) - THINK_START_TIME, 10); + $runtime = number_format(microtime(true) - THINK_START_TIME, 10, '.', ''); $reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '鈭'; $mem = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); diff --git a/thinkphp/library/think/exception/DbException.php b/thinkphp/library/think/exception/DbException.php index 532af5ef3..0ae80ad17 100644 --- a/thinkphp/library/think/exception/DbException.php +++ b/thinkphp/library/think/exception/DbException.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/exception/ErrorException.php b/thinkphp/library/think/exception/ErrorException.php index e3f18375d..b3a9a30a4 100644 --- a/thinkphp/library/think/exception/ErrorException.php +++ b/thinkphp/library/think/exception/ErrorException.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/exception/Handle.php b/thinkphp/library/think/exception/Handle.php index d975690e9..f523db09f 100644 --- a/thinkphp/library/think/exception/Handle.php +++ b/thinkphp/library/think/exception/Handle.php @@ -21,11 +21,16 @@ use think\Response; class Handle { - + protected $render; protected $ignoreReport = [ '\\think\\exception\\HttpException', ]; + public function setRender($render) + { + $this->render = $render; + } + /** * Report or log an exception. * @@ -78,6 +83,13 @@ class Handle */ public function render(Exception $e) { + if ($this->render && $this->render instanceof \Closure) { + $result = call_user_func_array($this->render, [$e]); + if ($result) { + return $result; + } + } + if ($e instanceof HttpException) { return $this->renderHttpException($e); } else { diff --git a/thinkphp/library/think/exception/PDOException.php b/thinkphp/library/think/exception/PDOException.php index ebd53dff9..044f82a05 100644 --- a/thinkphp/library/think/exception/PDOException.php +++ b/thinkphp/library/think/exception/PDOException.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/exception/RouteNotFoundException.php b/thinkphp/library/think/exception/RouteNotFoundException.php index f85a3c4bb..d22e3a637 100644 --- a/thinkphp/library/think/exception/RouteNotFoundException.php +++ b/thinkphp/library/think/exception/RouteNotFoundException.php @@ -16,7 +16,7 @@ class RouteNotFoundException extends HttpException public function __construct() { - parent::__construct(404); + parent::__construct(404, 'Route Not Found'); } } diff --git a/thinkphp/library/think/log/driver/File.php b/thinkphp/library/think/log/driver/File.php index d82a5243e..f2296cfa0 100644 --- a/thinkphp/library/think/log/driver/File.php +++ b/thinkphp/library/think/log/driver/File.php @@ -12,6 +12,7 @@ namespace think\log\driver; use think\App; +use think\Request; /** * 鏈湴鍖栬皟璇曡緭鍑哄埌鏂囦欢 @@ -20,13 +21,14 @@ class File { protected $config = [ 'time_format' => ' c ', + 'single' => false, 'file_size' => 2097152, 'path' => LOG_PATH, 'apart_level' => [], + 'max_files' => 0, + 'json' => false, ]; - protected $writed = []; - // 瀹炰緥鍖栧苟浼犲叆鍙傛暟 public function __construct($config = []) { @@ -38,82 +40,231 @@ class File /** * 鏃ュ織鍐欏叆鎺ュ彛 * @access public - * @param array $log 鏃ュ織淇℃伅 + * @param array $log 鏃ュ織淇℃伅 + * @param bool $append 鏄惁杩藉姞璇锋眰淇℃伅 * @return bool */ - public function save(array $log = []) + public function save(array $log = [], $append = false) { - $cli = IS_CLI ? '_cli' : ''; - $destination = $this->config['path'] . date('Ym') . DS . date('d') . $cli . '.log'; + $destination = $this->getMasterLogFile(); $path = dirname($destination); !is_dir($path) && mkdir($path, 0755, true); - $info = ''; + $info = []; foreach ($log as $type => $val) { - $level = ''; + foreach ($val as $msg) { if (!is_string($msg)) { $msg = var_export($msg, true); } - $level .= '[ ' . $type . ' ] ' . $msg . "\r\n"; + + $info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg; } - if (in_array($type, $this->config['apart_level'])) { + + if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) { // 鐙珛璁板綍鐨勬棩蹇楃骇鍒 - $filename = $path . DS . date('d') . '_' . $type . $cli . '.log'; - $this->write($level, $filename, true); - } else { - $info .= $level; + $filename = $this->getApartLevelFile($path, $type); + + $this->write($info[$type], $filename, true, $append); + unset($info[$type]); } } + if ($info) { - return $this->write($info, $destination); + return $this->write($info, $destination, false, $append); } + return true; } - protected function write($message, $destination, $apart = false) + /** + * 鑾峰彇涓绘棩蹇楁枃浠跺悕 + * @access public + * @return string + */ + protected function getMasterLogFile() { - //妫娴嬫棩蹇楁枃浠跺ぇ灏忥紝瓒呰繃閰嶇疆澶у皬鍒欏浠芥棩蹇楁枃浠堕噸鏂扮敓鎴 - if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) { - rename($destination, dirname($destination) . DS . time() . '-' . basename($destination)); - $this->writed[$destination] = false; - } + if ($this->config['single']) { + $name = is_string($this->config['single']) ? $this->config['single'] : 'single'; - if (empty($this->writed[$destination]) && !IS_CLI) { - if (App::$debug && !$apart) { - // 鑾峰彇鍩烘湰淇℃伅 - if (isset($_SERVER['HTTP_HOST'])) { - $current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; - } else { - $current_uri = "cmd:" . implode(' ', $_SERVER['argv']); + $destination = $this->config['path'] . $name . '.log'; + } else { + $cli = PHP_SAPI == 'cli' ? '_cli' : ''; + + if ($this->config['max_files']) { + $filename = date('Ymd') . $cli . '.log'; + $files = glob($this->config['path'] . '*.log'); + + try { + if (count($files) > $this->config['max_files']) { + unlink($files[0]); + } + } catch (\Exception $e) { } - - $runtime = round(microtime(true) - THINK_START_TIME, 10); - $reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '鈭'; - $time_str = ' [杩愯鏃堕棿锛' . number_format($runtime, 6) . 's][鍚炲悙鐜囷細' . $reqs . 'req/s]'; - $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); - $memory_str = ' [鍐呭瓨娑堣楋細' . $memory_use . 'kb]'; - $file_load = ' [鏂囦欢鍔犺浇锛' . count(get_included_files()) . ']'; - - $message = '[ info ] ' . $current_uri . $time_str . $memory_str . $file_load . "\r\n" . $message; + } else { + $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . $cli . '.log'; } - $now = date($this->config['time_format']); - $server = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0'; - $remote = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0'; - $method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'CLI'; - $uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; - $message = "---------------------------------------------------------------\r\n[{$now}] {$server} {$remote} {$method} {$uri}\r\n" . $message; - $this->writed[$destination] = true; + $destination = $this->config['path'] . $filename; } - if (IS_CLI) { - $now = date($this->config['time_format']); - $message = "[{$now}]" . $message; + return $destination; + } + + /** + * 鑾峰彇鐙珛鏃ュ織鏂囦欢鍚 + * @access public + * @param string $path 鏃ュ織鐩綍 + * @param string $type 鏃ュ織绫诲瀷 + * @return string + */ + protected function getApartLevelFile($path, $type) + { + $cli = PHP_SAPI == 'cli' ? '_cli' : ''; + + if ($this->config['single']) { + $name = is_string($this->config['single']) ? $this->config['single'] : 'single'; + + $name .= '_' . $type; + } elseif ($this->config['max_files']) { + $name = date('Ymd') . '_' . $type . $cli; + } else { + $name = date('d') . '_' . $type . $cli; + } + + return $path . DIRECTORY_SEPARATOR . $name . '.log'; + } + + /** + * 鏃ュ織鍐欏叆 + * @access protected + * @param array $message 鏃ュ織淇℃伅 + * @param string $destination 鏃ュ織鏂囦欢 + * @param bool $apart 鏄惁鐙珛鏂囦欢鍐欏叆 + * @param bool $append 鏄惁杩藉姞璇锋眰淇℃伅 + * @return bool + */ + protected function write($message, $destination, $apart = false, $append = false) + { + // 妫娴嬫棩蹇楁枃浠跺ぇ灏忥紝瓒呰繃閰嶇疆澶у皬鍒欏浠芥棩蹇楁枃浠堕噸鏂扮敓鎴 + $this->checkLogSize($destination); + + // 鏃ュ織淇℃伅灏佽 + $info['timestamp'] = date($this->config['time_format']); + + foreach ($message as $type => $msg) { + $info[$type] = is_array($msg) ? implode("\r\n", $msg) : $msg; + } + + if (PHP_SAPI == 'cli') { + $message = $this->parseCliLog($info); + } else { + // 娣诲姞璋冭瘯鏃ュ織 + $this->getDebugLog($info, $append, $apart); + + $message = $this->parseLog($info); } return error_log($message, 3, $destination); } + /** + * 妫鏌ユ棩蹇楁枃浠跺ぇ灏忓苟鑷姩鐢熸垚澶囦唤鏂囦欢 + * @access protected + * @param string $destination 鏃ュ織鏂囦欢 + * @return void + */ + protected function checkLogSize($destination) + { + if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) { + try { + rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination)); + } catch (\Exception $e) { + } + } + } + + /** + * CLI鏃ュ織瑙ｆ瀽 + * @access protected + * @param array $info 鏃ュ織淇℃伅 + * @return string + */ + protected function parseCliLog($info) + { + if ($this->config['json']) { + $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n"; + } else { + $now = $info['timestamp']; + unset($info['timestamp']); + + $message = implode("\r\n", $info); + + $message = "[{$now}]" . $message . "\r\n"; + } + + return $message; + } + + /** + * 瑙ｆ瀽鏃ュ織 + * @access protected + * @param array $info 鏃ュ織淇℃伅 + * @return string + */ + protected function parseLog($info) + { + $request = Request::instance(); + $requestInfo = [ + 'ip' => $request->ip(), + 'method' => $request->method(), + 'host' => $request->host(), + 'uri' => $request->url(), + ]; + + if ($this->config['json']) { + $info = $requestInfo + $info; + return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n"; + } + + array_unshift($info, "---------------------------------------------------------------\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}"); + unset($info['timestamp']); + + return implode("\r\n", $info) . "\r\n"; + } + + protected function getDebugLog(&$info, $append, $apart) + { + if (App::$debug && $append) { + + if ($this->config['json']) { + // 鑾峰彇鍩烘湰淇℃伅 + $runtime = round(microtime(true) - THINK_START_TIME, 10); + $reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '鈭'; + + $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); + + $info = [ + 'runtime' => number_format($runtime, 6) . 's', + 'reqs' => $reqs . 'req/s', + 'memory' => $memory_use . 'kb', + 'file' => count(get_included_files()), + ] + $info; + + } elseif (!$apart) { + // 澧炲姞棰濆鐨勮皟璇曚俊鎭 + $runtime = round(microtime(true) - THINK_START_TIME, 10); + $reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '鈭'; + + $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); + + $time_str = '[杩愯鏃堕棿锛' . number_format($runtime, 6) . 's] [鍚炲悙鐜囷細' . $reqs . 'req/s]'; + $memory_str = ' [鍐呭瓨娑堣楋細' . $memory_use . 'kb]'; + $file_load = ' [鏂囦欢鍔犺浇锛' . count(get_included_files()) . ']'; + + array_unshift($info, $time_str . $memory_str . $file_load); + } + } + } } diff --git a/thinkphp/library/think/log/driver/Socket.php b/thinkphp/library/think/log/driver/Socket.php index d30bba304..4f62915bc 100644 --- a/thinkphp/library/think/log/driver/Socket.php +++ b/thinkphp/library/think/log/driver/Socket.php @@ -60,7 +60,7 @@ class Socket * @param array $log 鏃ュ織淇℃伅 * @return bool */ - public function save(array $log = []) + public function save(array $log = [], $append = false) { if (!$this->check()) { return false; diff --git a/thinkphp/library/think/model/Collection.php b/thinkphp/library/think/model/Collection.php index 4e4bb4dc6..0406533c1 100644 --- a/thinkphp/library/think/model/Collection.php +++ b/thinkphp/library/think/model/Collection.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -16,20 +16,6 @@ use think\Model; class Collection extends BaseCollection { - /** - * 杩斿洖鏁扮粍涓寚瀹氱殑涓鍒 - * @param string $column_key - * @param string|null $index_key - * @return array - */ - public function column($column_key, $index_key = null) - { - if (function_exists('array_column')) { - return array_column($this->toArray(), $column_key, $index_key); - } - return parent::column($column_key, $index_key); - } - /** * 寤惰繜棰勮浇鍏ュ叧鑱旀煡璇 * @access public @@ -85,7 +71,7 @@ class Collection extends BaseCollection { $this->each(function ($model) use ($append, $override) { /** @var Model $model */ - $model->append($append, $override); + $model && $model->append($append, $override); }); return $this; } diff --git a/thinkphp/library/think/model/Merge.php b/thinkphp/library/think/model/Merge.php index d944979e1..4a9da81e4 100644 --- a/thinkphp/library/think/model/Merge.php +++ b/thinkphp/library/think/model/Merge.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/model/Pivot.php b/thinkphp/library/think/model/Pivot.php index 06c6b1817..13525cdd7 100644 --- a/thinkphp/library/think/model/Pivot.php +++ b/thinkphp/library/think/model/Pivot.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -24,11 +24,11 @@ class Pivot extends Model /** * 鏋舵瀯鍑芥暟 * @access public - * @param Model $parent 涓婄骇妯″瀷 * @param array|object $data 鏁版嵁 + * @param Model $parent 涓婄骇妯″瀷 * @param string $table 涓棿鏁版嵁琛ㄥ悕 */ - public function __construct(Model $parent, $data = [], $table = '') + public function __construct($data = [], Model $parent = null, $table = '') { $this->parent = $parent; @@ -37,8 +37,6 @@ class Pivot extends Model } parent::__construct($data); - - $this->class = $this->name; } } diff --git a/thinkphp/library/think/model/Relation.php b/thinkphp/library/think/model/Relation.php index 4869e5261..25fe88dbd 100644 --- a/thinkphp/library/think/model/Relation.php +++ b/thinkphp/library/think/model/Relation.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -35,6 +35,8 @@ abstract class Relation protected $localKey; // 鍩虹鏌ヨ protected $baseQuery; + // 鏄惁涓鸿嚜鍏宠仈 + protected $selfRelation; /** * 鑾峰彇鍏宠仈鐨勬墍灞炴ā鍨 @@ -47,13 +49,13 @@ abstract class Relation } /** - * 鑾峰彇褰撳墠鐨勫叧鑱旀ā鍨嬬被 + * 鑾峰彇褰撳墠鐨勫叧鑱旀ā鍨嬪璞″疄渚 * @access public - * @return string + * @return Model */ public function getModel() { - return $this->model; + return $this->query->getModel(); } /** @@ -66,6 +68,28 @@ abstract class Relation return $this->query; } + /** + * 璁剧疆褰撳墠鍏宠仈涓鸿嚜鍏宠仈 + * @access public + * @param bool $self 鏄惁鑷叧鑱 + * @return $this + */ + public function selfRelation($self = true) + { + $this->selfRelation = $self; + return $this; + } + + /** + * 褰撳墠鍏宠仈鏄惁涓鸿嚜鍏宠仈 + * @access public + * @return bool + */ + public function isSelfRelation() + { + return $this->selfRelation; + } + /** * 灏佽鍏宠仈鏁版嵁闆 * @access public @@ -108,7 +132,8 @@ abstract class Relation * @access protected * @return void */ - abstract protected function baseQuery(); + protected function baseQuery() + {} public function __call($method, $args) { diff --git a/thinkphp/library/think/model/relation/BelongsTo.php b/thinkphp/library/think/model/relation/BelongsTo.php index 905ea9443..c1cbab97d 100644 --- a/thinkphp/library/think/model/relation/BelongsTo.php +++ b/thinkphp/library/think/model/relation/BelongsTo.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -11,6 +11,7 @@ namespace think\model\relation; +use think\db\Query; use think\Loader; use think\Model; @@ -51,6 +52,7 @@ class BelongsTo extends OneToOne call_user_func_array($closure, [ & $this->query]); } $relationModel = $this->query + ->removeWhereField($this->localKey) ->where($this->localKey, $this->parent->$foreignKey) ->relation($subRelation) ->find(); @@ -68,7 +70,6 @@ class BelongsTo extends OneToOne * @param string $operator 姣旇緝鎿嶄綔绗 * @param integer $count 涓暟 * @param string $id 鍏宠仈琛ㄧ殑缁熻瀛楁 - * @param string $joinType JOIN绫诲瀷 * @return Query */ public function has($operator = '>=', $count = 1, $id = '*') @@ -79,14 +80,16 @@ class BelongsTo extends OneToOne /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { $table = $this->query->getTable(); $model = basename(str_replace('\\', '/', get_class($this->parent))); $relation = basename(str_replace('\\', '/', $this->model)); + if (is_array($where)) { foreach ($where as $key => $val) { if (false === strpos($key, '.')) { @@ -95,9 +98,11 @@ class BelongsTo extends OneToOne } } } + $fields = $this->getRelationQueryFields($fields, $model); + return $this->parent->db()->alias($model) - ->field($model . '.*') - ->join($table . ' ' . $relation, $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType) + ->field($fields) + ->join([$table => $relation], $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType) ->where($where); } @@ -124,7 +129,8 @@ class BelongsTo extends OneToOne } if (!empty($range)) { - $data = $this->eagerlyWhere($this, [ + $this->query->removeWhereField($localKey); + $data = $this->eagerlyWhere($this->query, [ $localKey => [ 'in', $range, @@ -143,12 +149,13 @@ class BelongsTo extends OneToOne $relationModel->isUpdate(true); } - if ($relationModel && !empty($this->bindAttr)) { + if (!empty($this->bindAttr)) { // 缁戝畾鍏宠仈灞炴 $this->bindAttr($relationModel, $result, $this->bindAttr); + } else { + // 璁剧疆鍏宠仈灞炴 + $result->setRelation($attr, $relationModel); } - // 璁剧疆鍏宠仈灞炴 - $result->setRelation($attr, $relationModel); } } } @@ -166,7 +173,8 @@ class BelongsTo extends OneToOne { $localKey = $this->localKey; $foreignKey = $this->foreignKey; - $data = $this->eagerlyWhere($this, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure); + $this->query->removeWhereField($localKey); + $data = $this->eagerlyWhere($this->query, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure); // 鍏宠仈妯″瀷 if (!isset($data[$result->$foreignKey])) { $relationModel = null; @@ -175,12 +183,13 @@ class BelongsTo extends OneToOne $relationModel->setParent(clone $result); $relationModel->isUpdate(true); } - if ($relationModel && !empty($this->bindAttr)) { + if (!empty($this->bindAttr)) { // 缁戝畾鍏宠仈灞炴 $this->bindAttr($relationModel, $result, $this->bindAttr); + } else { + // 璁剧疆鍏宠仈灞炴 + $result->setRelation(Loader::parseName($relation), $relationModel); } - // 璁剧疆鍏宠仈灞炴 - $result->setRelation(Loader::parseName($relation), $relationModel); } /** @@ -214,4 +223,21 @@ class BelongsTo extends OneToOne return $this->parent->setRelation($this->relation, null); } + + /** + * 鎵ц鍩虹鏌ヨ锛堜粎鎵ц涓娆★級 + * @access protected + * @return void + */ + protected function baseQuery() + { + if (empty($this->baseQuery)) { + if (isset($this->parent->{$this->foreignKey})) { + // 鍏宠仈鏌ヨ甯﹀叆鍏宠仈鏉′欢 + $this->query->where($this->localKey, '=', $this->parent->{$this->foreignKey}); + } + + $this->baseQuery = true; + } + } } diff --git a/thinkphp/library/think/model/relation/BelongsToMany.php b/thinkphp/library/think/model/relation/BelongsToMany.php index ef08abb4d..a41c45cee 100644 --- a/thinkphp/library/think/model/relation/BelongsToMany.php +++ b/thinkphp/library/think/model/relation/BelongsToMany.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -12,6 +12,7 @@ namespace think\model\relation; use think\Collection; +use think\Db; use think\db\Query; use think\Exception; use think\Loader; @@ -28,6 +29,8 @@ class BelongsToMany extends Relation protected $pivotName; // 涓棿琛ㄦā鍨嬪璞 protected $pivot; + // 涓棿琛ㄦ暟鎹悕绉 + protected $pivotDataName = 'pivot'; /** * 鏋勯犲嚱鏁 @@ -52,6 +55,10 @@ class BelongsToMany extends Relation } $this->query = (new $model)->db(); $this->pivot = $this->newPivot(); + + if ('think\model\Pivot' == get_class($this->pivot)) { + $this->pivot->name($this->middle); + } } /** @@ -66,14 +73,46 @@ class BelongsToMany extends Relation } /** - * 瀹炰緥鍖栦腑闂磋〃妯″瀷 - * @param $data - * @return mixed + * 璁剧疆涓棿琛ㄦ暟鎹悕绉 + * @access public + * @param string $name + * @return $this */ - protected function newPivot($data = []) + public function pivotDataName($name) { - $pivot = $this->pivotName ?: '\\think\\model\\Pivot'; - return new $pivot($this->parent, $data, $this->middle); + $this->pivotDataName = $name; + return $this; + } + + /** + * 鑾峰彇涓棿琛ㄦ洿鏂版潯浠 + * @param $data + * @return array + */ + protected function getUpdateWhere($data) + { + return [ + $this->localKey => $data[$this->localKey], + $this->foreignKey => $data[$this->foreignKey], + ]; + } + + /** + * 瀹炰緥鍖栦腑闂磋〃妯″瀷 + * @param array $data + * @param bool $isUpdate + * @return Pivot + * @throws Exception + */ + protected function newPivot($data = [], $isUpdate = false) + { + $class = $this->pivotName ?: '\\think\\model\\Pivot'; + $pivot = new $class($data, $this->parent, $this->middle); + if ($pivot instanceof Pivot) { + return $isUpdate ? $pivot->isUpdate(true, $this->getUpdateWhere($data)) : $pivot; + } else { + throw new Exception('pivot model must extends: \think\model\Pivot'); + } } /** @@ -93,7 +132,7 @@ class BelongsToMany extends Relation } } } - $model->setRelation('pivot', $this->newPivot($pivot)); + $model->setRelation($this->pivotDataName, $this->newPivot($pivot, true)); } } @@ -206,11 +245,12 @@ class BelongsToMany extends Relation /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query * @throws Exception */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { throw new Exception('relation not support: hasWhere'); } @@ -320,14 +360,22 @@ class BelongsToMany extends Relation * 鑾峰彇鍏宠仈缁熻瀛愭煡璇 * @access public * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 * @return string */ - public function getRelationCountQuery($closure) + public function getRelationCountQuery($closure, &$name = null) { + if ($closure) { + $return = call_user_func_array($closure, [ & $this->query]); + if ($return && is_string($return)) { + $name = $return; + } + } + return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [ 'pivot.' . $this->localKey => [ 'exp', - '=' . $this->parent->getTable() . '.' . $this->parent->getPk(), + Db::raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk()), ], ])->fetchSql()->count(); } @@ -358,7 +406,7 @@ class BelongsToMany extends Relation } } } - $set->setRelation('pivot', $this->newPivot($pivot)); + $set->setRelation($this->pivotDataName, $this->newPivot($pivot, true)); $data[$pivot[$this->localKey]][] = $set; } return $data; @@ -384,7 +432,7 @@ class BelongsToMany extends Relation if (empty($this->baseQuery)) { $relationFk = $this->query->getPk(); - $query->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk) + $query->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk) ->where($condition); } return $query; @@ -461,7 +509,7 @@ class BelongsToMany extends Relation foreach ($ids as $id) { $pivot[$this->foreignKey] = $id; $this->pivot->insert($pivot, true); - $result[] = $this->newPivot($pivot); + $result[] = $this->newPivot($pivot, true); } if (count($result) == 1) { // 杩斿洖涓棿琛ㄦā鍨嬪璞 @@ -473,6 +521,29 @@ class BelongsToMany extends Relation } } + /** + * 鍒ゆ柇鏄惁瀛樺湪鍏宠仈鏁版嵁 + * @access public + * @param mixed $data 鏁版嵁 鍙互浣跨敤鍏宠仈妯″瀷瀵硅薄 鎴栬 鍏宠仈瀵硅薄鐨勪富閿 + * @return Pivot + * @throws Exception + */ + public function attached($data) + { + if ($data instanceof Model) { + $relationFk = $data->getPk(); + $id = $data->$relationFk; + } else { + $id = $data; + } + + $pk = $this->parent->getPk(); + + $pivot = $this->pivot->where($this->localKey, $this->parent->$pk)->where($this->foreignKey, $id)->find(); + + return $pivot ?: false; + } + /** * 瑙ｉ櫎鍏宠仈鐨勪竴涓腑闂磋〃鏁版嵁 * @access public @@ -565,7 +636,7 @@ class BelongsToMany extends Relation if (empty($this->baseQuery) && $this->parent->getData()) { $pk = $this->parent->getPk(); $table = $this->pivot->getTable(); - $this->query->join($table . ' pivot', 'pivot.' . $this->foreignKey . '=' . $this->query->getTable() . '.' . $this->query->getPk())->where('pivot.' . $this->localKey, $this->parent->$pk); + $this->query->join([$table => 'pivot'], 'pivot.' . $this->foreignKey . '=' . $this->query->getTable() . '.' . $this->query->getPk())->where('pivot.' . $this->localKey, $this->parent->$pk); $this->baseQuery = true; } } diff --git a/thinkphp/library/think/model/relation/HasMany.php b/thinkphp/library/think/model/relation/HasMany.php index 9624fc676..ebab051ad 100644 --- a/thinkphp/library/think/model/relation/HasMany.php +++ b/thinkphp/library/think/model/relation/HasMany.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -24,7 +24,7 @@ class HasMany extends Relation * @param Model $parent 涓婄骇妯″瀷瀵硅薄 * @param string $model 妯″瀷鍚 * @param string $foreignKey 鍏宠仈澶栭敭 - * @param string $localKey 鍏宠仈涓婚敭 + * @param string $localKey 褰撳墠妯″瀷涓婚敭 */ public function __construct(Model $parent, $model, $foreignKey, $localKey) { @@ -77,7 +77,7 @@ class HasMany extends Relation } if (!empty($range)) { - $data = $this->eagerlyOneToMany($this, [ + $data = $this->eagerlyOneToMany($this->query, [ $this->foreignKey => [ 'in', $range, @@ -114,7 +114,7 @@ class HasMany extends Relation $localKey = $this->localKey; if (isset($result->$localKey)) { - $data = $this->eagerlyOneToMany($this, [$this->foreignKey => $result->$localKey], $relation, $subRelation, $closure); + $data = $this->eagerlyOneToMany($this->query, [$this->foreignKey => $result->$localKey], $relation, $subRelation, $closure); // 鍏宠仈鏁版嵁灏佽 if (!isset($data[$result->$localKey])) { $data[$result->$localKey] = []; @@ -143,7 +143,7 @@ class HasMany extends Relation if ($closure) { call_user_func_array($closure, [ & $this->query]); } - $count = $this->query->where([$this->foreignKey => $result->$localKey])->count(); + $count = $this->query->where($this->foreignKey, $result->$localKey)->count(); } return $count; } @@ -152,20 +152,19 @@ class HasMany extends Relation * 鍒涘缓鍏宠仈缁熻瀛愭煡璇 * @access public * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 * @return string */ - public function getRelationCountQuery($closure) + public function getRelationCountQuery($closure, &$name = null) { if ($closure) { - call_user_func_array($closure, [ & $this->query]); + $return = call_user_func_array($closure, [ & $this->query]); + if ($return && is_string($return)) { + $name = $return; + } } - - return $this->query->where([ - $this->foreignKey => [ - 'exp', - '=' . $this->parent->getTable() . '.' . $this->parent->getPk(), - ], - ])->fetchSql()->count(); + $localKey = $this->localKey ?: $this->parent->getPk(); + return $this->query->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $localKey)->fetchSql()->count(); } /** @@ -185,7 +184,7 @@ class HasMany extends Relation if ($closure) { call_user_func_array($closure, [ & $model]); } - $list = $model->where($where)->with($subRelation)->select(); + $list = $model->removeWhereField($foreignKey)->where($where)->with($subRelation)->select(); // 缁勮妯″瀷鏁版嵁 $data = []; @@ -206,12 +205,31 @@ class HasMany extends Relation if ($data instanceof Model) { $data = $data->getData(); } + // 淇濆瓨鍏宠仈琛ㄦ暟鎹 - $model = new $this->model; $data[$this->foreignKey] = $this->parent->{$this->localKey}; + + $model = new $this->model(); return $model->save($data) ? $model : false; } + /** + * 鍒涘缓鍏宠仈瀵硅薄瀹炰緥 + * @param array $data + * @return Model + */ + public function make($data = []) + { + if ($data instanceof Model) { + $data = $data->getData(); + } + + // 淇濆瓨鍏宠仈琛ㄦ暟鎹 + $data[$this->foreignKey] = $this->parent->{$this->localKey}; + + return new $this->model($data); + } + /** * 鎵归噺淇濆瓨褰撳墠鍏宠仈鏁版嵁瀵硅薄 * @access public @@ -238,24 +256,31 @@ class HasMany extends Relation */ public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER') { - $table = $this->query->getTable(); - return $this->parent->db()->alias('a') - ->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $joinType) - ->group('b.' . $this->foreignKey) + $table = $this->query->getTable(); + $model = basename(str_replace('\\', '/', get_class($this->parent))); + $relation = basename(str_replace('\\', '/', $this->model)); + + return $this->parent->db() + ->alias($model) + ->field($model . '.*') + ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType) + ->group($relation . '.' . $this->foreignKey) ->having('count(' . $id . ')' . $operator . $count); } /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { $table = $this->query->getTable(); $model = basename(str_replace('\\', '/', get_class($this->parent))); $relation = basename(str_replace('\\', '/', $this->model)); + if (is_array($where)) { foreach ($where as $key => $val) { if (false === strpos($key, '.')) { @@ -264,9 +289,13 @@ class HasMany extends Relation } } } + + $fields = $this->getRelationQueryFields($fields, $model); + return $this->parent->db()->alias($model) - ->field($model . '.*') - ->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey) + ->field($fields) + ->group($model . '.' . $this->localKey) + ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey) ->where($where); } diff --git a/thinkphp/library/think/model/relation/HasManyThrough.php b/thinkphp/library/think/model/relation/HasManyThrough.php index 1573fc65b..3a9a5482e 100644 --- a/thinkphp/library/think/model/relation/HasManyThrough.php +++ b/thinkphp/library/think/model/relation/HasManyThrough.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -77,10 +77,11 @@ class HasManyThrough extends Relation /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { throw new Exception('relation not support: hasWhere'); } @@ -92,10 +93,9 @@ class HasManyThrough extends Relation * @param string $relation 褰撳墠鍏宠仈鍚 * @param string $subRelation 瀛愬叧鑱斿悕 * @param \Closure $closure 闂寘 - * @param string $class 鏁版嵁闆嗗璞″悕 涓虹┖琛ㄧず鏁扮粍 * @return void */ - public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class) + public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure) {} /** @@ -105,10 +105,9 @@ class HasManyThrough extends Relation * @param string $relation 褰撳墠鍏宠仈鍚 * @param string $subRelation 瀛愬叧鑱斿悕 * @param \Closure $closure 闂寘 - * @param string $class 鏁版嵁闆嗗璞″悕 涓虹┖琛ㄧず鏁扮粍 * @return void */ - public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class) + public function eagerlyResult(&$result, $relation, $subRelation, $closure) {} /** @@ -121,6 +120,18 @@ class HasManyThrough extends Relation public function relationCount($result, $closure) {} + /** + * 鍒涘缓鍏宠仈缁熻瀛愭煡璇 + * @access public + * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 + * @return string + */ + public function getRelationCountQuery($closure, &$name = null) + { + throw new Exception('relation not support: withCount'); + } + /** * 鎵ц鍩虹鏌ヨ锛堣繘鎵ц涓娆★級 * @access protected diff --git a/thinkphp/library/think/model/relation/HasOne.php b/thinkphp/library/think/model/relation/HasOne.php index c500c02ab..db74e4a63 100644 --- a/thinkphp/library/think/model/relation/HasOne.php +++ b/thinkphp/library/think/model/relation/HasOne.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -23,7 +23,7 @@ class HasOne extends OneToOne * @param Model $parent 涓婄骇妯″瀷瀵硅薄 * @param string $model 妯″瀷鍚 * @param string $foreignKey 鍏宠仈澶栭敭 - * @param string $localKey 鍏宠仈涓婚敭 + * @param string $localKey 褰撳墠妯″瀷涓婚敭 * @param string $joinType JOIN绫诲瀷 */ public function __construct(Model $parent, $model, $foreignKey, $localKey, $joinType = 'INNER') @@ -50,7 +50,11 @@ class HasOne extends OneToOne call_user_func_array($closure, [ & $this->query]); } // 鍒ゆ柇鍏宠仈绫诲瀷鎵ц鏌ヨ - $relationModel = $this->query->where($this->foreignKey, $this->parent->$localKey)->relation($subRelation)->find(); + $relationModel = $this->query + ->removeWhereField($this->foreignKey) + ->where($this->foreignKey, $this->parent->$localKey) + ->relation($subRelation) + ->find(); if ($relationModel) { $relationModel->setParent(clone $this->parent); @@ -67,25 +71,30 @@ class HasOne extends OneToOne public function has() { $table = $this->query->getTable(); + $model = basename(str_replace('\\', '/', get_class($this->parent))); + $relation = basename(str_replace('\\', '/', $this->model)); $localKey = $this->localKey; $foreignKey = $this->foreignKey; - return $this->parent->db()->alias('a') - ->whereExists(function ($query) use ($table, $localKey, $foreignKey) { - $query->table([$table => 'b'])->field('b.' . $foreignKey)->whereExp('a.' . $localKey, '=b.' . $foreignKey); + return $this->parent->db() + ->alias($model) + ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) { + $query->table([$table => $relation])->field($relation . '.' . $foreignKey)->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey); }); } /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { $table = $this->query->getTable(); $model = basename(str_replace('\\', '/', get_class($this->parent))); $relation = basename(str_replace('\\', '/', $this->model)); + if (is_array($where)) { foreach ($where as $key => $val) { if (false === strpos($key, '.')) { @@ -94,9 +103,11 @@ class HasOne extends OneToOne } } } + $fields = $this->getRelationQueryFields($fields, $model); + return $this->parent->db()->alias($model) - ->field($model . '.*') - ->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType) + ->field($fields) + ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType) ->where($where); } @@ -123,7 +134,8 @@ class HasOne extends OneToOne } if (!empty($range)) { - $data = $this->eagerlyWhere($this, [ + $this->query->removeWhereField($foreignKey); + $data = $this->eagerlyWhere($this->query, [ $foreignKey => [ 'in', $range, @@ -140,13 +152,14 @@ class HasOne extends OneToOne $relationModel = $data[$result->$localKey]; $relationModel->setParent(clone $result); $relationModel->isUpdate(true); - if (!empty($this->bindAttr)) { - // 缁戝畾鍏宠仈灞炴 - $this->bindAttr($relationModel, $result, $this->bindAttr); - } } - // 璁剧疆鍏宠仈灞炴 - $result->setRelation($attr, $relationModel); + if (!empty($this->bindAttr)) { + // 缁戝畾鍏宠仈灞炴 + $this->bindAttr($relationModel, $result, $this->bindAttr); + } else { + // 璁剧疆鍏宠仈灞炴 + $result->setRelation($attr, $relationModel); + } } } } @@ -164,7 +177,8 @@ class HasOne extends OneToOne { $localKey = $this->localKey; $foreignKey = $this->foreignKey; - $data = $this->eagerlyWhere($this, [$foreignKey => $result->$localKey], $foreignKey, $relation, $subRelation, $closure); + $this->query->removeWhereField($foreignKey); + $data = $this->eagerlyWhere($this->query, [$foreignKey => $result->$localKey], $foreignKey, $relation, $subRelation, $closure); // 鍏宠仈妯″瀷 if (!isset($data[$result->$localKey])) { @@ -173,13 +187,29 @@ class HasOne extends OneToOne $relationModel = $data[$result->$localKey]; $relationModel->setParent(clone $result); $relationModel->isUpdate(true); - if (!empty($this->bindAttr)) { - // 缁戝畾鍏宠仈灞炴 - $this->bindAttr($relationModel, $result, $this->bindAttr); - } } - - $result->setRelation(Loader::parseName($relation), $relationModel); + if (!empty($this->bindAttr)) { + // 缁戝畾鍏宠仈灞炴 + $this->bindAttr($relationModel, $result, $this->bindAttr); + } else { + $result->setRelation(Loader::parseName($relation), $relationModel); + } } + /** + * 鎵ц鍩虹鏌ヨ锛堜粎鎵ц涓娆★級 + * @access protected + * @return void + */ + protected function baseQuery() + { + if (empty($this->baseQuery)) { + if (isset($this->parent->{$this->localKey})) { + // 鍏宠仈鏌ヨ甯﹀叆鍏宠仈鏉′欢 + $this->query->where($this->foreignKey, '=', $this->parent->{$this->localKey}); + } + + $this->baseQuery = true; + } + } } diff --git a/thinkphp/library/think/model/relation/MorphMany.php b/thinkphp/library/think/model/relation/MorphMany.php index 87c2d66c3..2755d5753 100644 --- a/thinkphp/library/think/model/relation/MorphMany.php +++ b/thinkphp/library/think/model/relation/MorphMany.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -11,6 +11,7 @@ namespace think\model\relation; +use think\Db; use think\db\Query; use think\Exception; use think\Loader; @@ -82,10 +83,11 @@ class MorphMany extends Relation /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { throw new Exception('relation not support: hasWhere'); } @@ -186,21 +188,25 @@ class MorphMany extends Relation } /** - * 鑾峰彇鍏宠仈缁熻瀛愭煡璇 + * 鍒涘缓鍏宠仈缁熻瀛愭煡璇 * @access public * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 * @return string */ - public function getRelationCountQuery($closure) + public function getRelationCountQuery($closure, &$name = null) { if ($closure) { - call_user_func_array($closure, [ & $this->query]); + $return = call_user_func_array($closure, [ & $this->query]); + if ($return && is_string($return)) { + $name = $return; + } } return $this->query->where([ $this->morphKey => [ 'exp', - '=' . $this->parent->getTable() . '.' . $this->parent->getPk(), + Db::raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk()), ], $this->morphType => $this->type, ])->fetchSql()->count(); @@ -242,13 +248,36 @@ class MorphMany extends Relation if ($data instanceof Model) { $data = $data->getData(); } + // 淇濆瓨鍏宠仈琛ㄦ暟鎹 $pk = $this->parent->getPk(); - $model = new $this->model; $data[$this->morphKey] = $this->parent->$pk; $data[$this->morphType] = $this->type; - return $model->save($data) ? $model : false; + + $model = new $this->model(); + + return $model->save() ? $model : false; + } + + /** + * 鍒涘缓鍏宠仈瀵硅薄瀹炰緥 + * @param array $data + * @return Model + */ + public function make($data = []) + { + if ($data instanceof Model) { + $data = $data->getData(); + } + + // 淇濆瓨鍏宠仈琛ㄦ暟鎹 + $pk = $this->parent->getPk(); + + $data[$this->morphKey] = $this->parent->$pk; + $data[$this->morphType] = $this->type; + + return new $this->model($data); } /** diff --git a/thinkphp/library/think/model/relation/MorphOne.php b/thinkphp/library/think/model/relation/MorphOne.php index 4dfd1c0ff..5ec717248 100644 --- a/thinkphp/library/think/model/relation/MorphOne.php +++ b/thinkphp/library/think/model/relation/MorphOne.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -81,10 +81,11 @@ class MorphOne extends Relation /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { throw new Exception('relation not support: hasWhere'); } @@ -201,13 +202,35 @@ class MorphOne extends Relation if ($data instanceof Model) { $data = $data->getData(); } + // 淇濆瓨鍏宠仈琛ㄦ暟鎹 $pk = $this->parent->getPk(); - $model = new $this->model; $data[$this->morphKey] = $this->parent->$pk; $data[$this->morphType] = $this->type; - return $model->save($data) ? $model : false; + + $model = new $this->model(); + + return $model->save() ? $model : false; + } + + /** + * 鍒涘缓鍏宠仈瀵硅薄瀹炰緥 + * @param array $data + * @return Model + */ + public function make($data = []) + { + if ($data instanceof Model) { + $data = $data->getData(); + } + // 淇濆瓨鍏宠仈琛ㄦ暟鎹 + $pk = $this->parent->getPk(); + + $data[$this->morphKey] = $this->parent->$pk; + $data[$this->morphType] = $this->type; + + return new $this->model($data); } /** @@ -226,4 +249,15 @@ class MorphOne extends Relation } } + /** + * 鍒涘缓鍏宠仈缁熻瀛愭煡璇 + * @access public + * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 + * @return string + */ + public function getRelationCountQuery($closure, &$name = null) + { + throw new Exception('relation not support: withCount'); + } } diff --git a/thinkphp/library/think/model/relation/MorphTo.php b/thinkphp/library/think/model/relation/MorphTo.php index df104a907..7d4526517 100644 --- a/thinkphp/library/think/model/relation/MorphTo.php +++ b/thinkphp/library/think/model/relation/MorphTo.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -43,6 +43,18 @@ class MorphTo extends Relation $this->relation = $relation; } + /** + * 鑾峰彇褰撳墠鐨勫叧鑱旀ā鍨嬬被鐨勫疄渚 + * @access public + * @return Model + */ + public function getModel() + { + $morphType = $this->morphType; + $model = $this->parseModel($this->parent->$morphType); + return (new $model); + } + /** * 寤惰繜鑾峰彇鍏宠仈鏁版嵁 * @param string $subRelation 瀛愬叧鑱斿悕 @@ -82,17 +94,18 @@ class MorphTo extends Relation /** * 鏍规嵁鍏宠仈鏉′欢鏌ヨ褰撳墠妯″瀷 * @access public - * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $where 鏌ヨ鏉′欢锛堟暟缁勬垨鑰呴棴鍖咃級 + * @param mixed $fields 瀛楁 * @return Query */ - public function hasWhere($where = []) + public function hasWhere($where = [], $fields = null) { throw new Exception('relation not support: hasWhere'); } /** * 瑙ｆ瀽妯″瀷鐨勫畬鏁村懡鍚嶇┖闂 - * @access public + * @access protected * @param string $model 妯″瀷鍚嶏紙鎴栬呭畬鏁寸被鍚嶏級 * @return string */ @@ -238,17 +251,18 @@ class MorphTo extends Relation /** * 娣诲姞鍏宠仈鏁版嵁 * @access public - * @param Model $model 鍏宠仈妯″瀷瀵硅薄 + * @param Model $model 鍏宠仈妯″瀷瀵硅薄 + * @param string $type 澶氭佺被鍨 * @return Model */ - public function associate($model) + public function associate($model, $type = '') { $morphKey = $this->morphKey; $morphType = $this->morphType; $pk = $model->getPk(); $this->parent->setAttr($morphKey, $model->$pk); - $this->parent->setAttr($morphType, get_class($model)); + $this->parent->setAttr($morphType, $type ?: get_class($model)); $this->parent->save(); return $this->parent->setRelation($this->relation, $model); @@ -272,10 +286,14 @@ class MorphTo extends Relation } /** - * 鎵ц鍩虹鏌ヨ锛堣繘鎵ц涓娆★級 - * @access protected - * @return void + * 鍒涘缓鍏宠仈缁熻瀛愭煡璇 + * @access public + * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 + * @return string */ - protected function baseQuery() - {} + public function getRelationCountQuery($closure, &$name = null) + { + throw new Exception('relation not support: withCount'); + } } diff --git a/thinkphp/library/think/model/relation/OneToOne.php b/thinkphp/library/think/model/relation/OneToOne.php index ff066ed3d..353ce21b4 100644 --- a/thinkphp/library/think/model/relation/OneToOne.php +++ b/thinkphp/library/think/model/relation/OneToOne.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -57,18 +57,18 @@ abstract class OneToOne extends Relation */ public function eagerly(Query $query, $relation, $subRelation, $closure, $first) { - $name = Loader::parseName(basename(str_replace('\\', '/', $query->getModel()))); - $alias = $name; + $name = Loader::parseName(basename(str_replace('\\', '/', get_class($query->getModel())))); + if ($first) { $table = $query->getTable(); - $query->table([$table => $alias]); + $query->table([$table => $name]); if ($query->getOptions('field')) { $field = $query->getOptions('field'); $query->removeOption('field'); } else { $field = true; } - $query->field($field, false, $table, $alias); + $query->field($field, false, $table, $name); $field = null; } @@ -78,9 +78,9 @@ abstract class OneToOne extends Relation $query->via($joinAlias); if ($this instanceof BelongsTo) { - $query->join($joinTable . ' ' . $joinAlias, $alias . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey, $this->joinType); + $query->join([$joinTable => $joinAlias], $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey, $this->joinType); } else { - $query->join($joinTable . ' ' . $joinAlias, $alias . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey, $this->joinType); + $query->join([$joinTable => $joinAlias], $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey, $this->joinType); } if ($closure) { @@ -214,6 +214,16 @@ abstract class OneToOne extends Relation return $this; } + /** + * 鑾峰彇缁戝畾灞炴 + * @access public + * @return array + */ + public function getBindAttr() + { + return $this->bindAttr; + } + /** * 鍏宠仈缁熻 * @access public @@ -276,7 +286,7 @@ abstract class OneToOne extends Relation if (isset($result->$key)) { throw new Exception('bind attr has exists:' . $key); } else { - $result->setAttr($key, $model->$attr); + $result->setAttr($key, $model ? $model->$attr : null); } } } @@ -294,6 +304,8 @@ abstract class OneToOne extends Relation */ protected function eagerlyWhere($model, $where, $key, $relation, $subRelation = '', $closure = false) { + $this->baseQuery = true; + // 棰勮浇鍏ュ叧鑱旀煡璇 鏀寔宓屽棰勮浇鍏 if ($closure) { call_user_func_array($closure, [ & $model]); @@ -312,10 +324,14 @@ abstract class OneToOne extends Relation } /** - * 鎵ц鍩虹鏌ヨ锛堣繘鎵ц涓娆★級 - * @access protected - * @return void + * 鍒涘缓鍏宠仈缁熻瀛愭煡璇 + * @access public + * @param \Closure $closure 闂寘 + * @param string $name 缁熻鏁版嵁鍒悕 + * @return string */ - protected function baseQuery() - {} + public function getRelationCountQuery($closure, &$name = null) + { + throw new Exception('relation not support: withCount'); + } } diff --git a/thinkphp/library/think/paginator/driver/Bootstrap.php b/thinkphp/library/think/paginator/driver/Bootstrap.php index 58fa94364..c5ac60db8 100644 --- a/thinkphp/library/think/paginator/driver/Bootstrap.php +++ b/thinkphp/library/think/paginator/driver/Bootstrap.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/response/Json.php b/thinkphp/library/think/response/Json.php index 538fc5a0d..c906bfc18 100644 --- a/thinkphp/library/think/response/Json.php +++ b/thinkphp/library/think/response/Json.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/response/Jsonp.php b/thinkphp/library/think/response/Jsonp.php index de8fb3041..404bacbe6 100644 --- a/thinkphp/library/think/response/Jsonp.php +++ b/thinkphp/library/think/response/Jsonp.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/response/Redirect.php b/thinkphp/library/think/response/Redirect.php index f45b0e1c5..91694cb2c 100644 --- a/thinkphp/library/think/response/Redirect.php +++ b/thinkphp/library/think/response/Redirect.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -67,7 +67,11 @@ class Redirect extends Response */ public function getTargetUrl() { - return strpos($this->data, '://') ? $this->data : Url::build($this->data, $this->params); + if (strpos($this->data, '://') || (0 === strpos($this->data, '/') && empty($this->params))) { + return $this->data; + } else { + return Url::build($this->data, $this->params); + } } public function params($params = []) diff --git a/thinkphp/library/think/response/View.php b/thinkphp/library/think/response/View.php index de75515a9..48f944a71 100644 --- a/thinkphp/library/think/response/View.php +++ b/thinkphp/library/think/response/View.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/response/Xml.php b/thinkphp/library/think/response/Xml.php index ca12e295e..3bdc052a2 100644 --- a/thinkphp/library/think/response/Xml.php +++ b/thinkphp/library/think/response/Xml.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -11,6 +11,8 @@ namespace think\response; +use think\Collection; +use think\Model; use think\Response; class Xml extends Response @@ -81,6 +83,11 @@ class Xml extends Response protected function dataToXml($data, $item, $id) { $xml = $attr = ''; + + if ($data instanceof Collection || $data instanceof Model) { + $data = $data->toArray(); + } + foreach ($data as $key => $val) { if (is_numeric($key)) { $id && $attr = " {$id}=\"{$key}\""; diff --git a/thinkphp/library/think/session/driver/Memcache.php b/thinkphp/library/think/session/driver/Memcache.php index 0c02e23ec..877d7bd77 100644 --- a/thinkphp/library/think/session/driver/Memcache.php +++ b/thinkphp/library/think/session/driver/Memcache.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/session/driver/Memcached.php b/thinkphp/library/think/session/driver/Memcached.php index bcaf8a1b5..2994a07c0 100644 --- a/thinkphp/library/think/session/driver/Memcached.php +++ b/thinkphp/library/think/session/driver/Memcached.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/session/driver/Redis.php b/thinkphp/library/think/session/driver/Redis.php index a4c2b54a6..8d05126bf 100644 --- a/thinkphp/library/think/session/driver/Redis.php +++ b/thinkphp/library/think/session/driver/Redis.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- diff --git a/thinkphp/library/think/template/TagLib.php b/thinkphp/library/think/template/TagLib.php index d343bed05..c5b72f916 100644 --- a/thinkphp/library/think/template/TagLib.php +++ b/thinkphp/library/think/template/TagLib.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -264,8 +264,8 @@ class TagLib if (!empty($this->tags[$name]['expression'])) { static $_taglibs; if (!isset($_taglibs[$name])) { - $_taglibs[$name][0] = strlen(ltrim($this->tpl->config('taglib_begin'), '\\') . $name); - $_taglibs[$name][1] = strlen(ltrim($this->tpl->config('taglib_end'), '\\')); + $_taglibs[$name][0] = strlen($this->tpl->config('taglib_begin_origin') . $name); + $_taglibs[$name][1] = strlen($this->tpl->config('taglib_end_origin')); } $result['expression'] = substr($str, $_taglibs[$name][0], -$_taglibs[$name][1]); // 娓呴櫎鑷棴鍚堟爣绛惧熬閮/ diff --git a/thinkphp/library/think/template/driver/File.php b/thinkphp/library/think/template/driver/File.php index b27e72659..a9a86bf2a 100644 --- a/thinkphp/library/think/template/driver/File.php +++ b/thinkphp/library/think/template/driver/File.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -15,6 +15,8 @@ use think\Exception; class File { + protected $cacheFile; + /** * 鍐欏叆缂栬瘧缂撳瓨 * @param string $cacheFile 缂撳瓨鐨勬枃浠跺悕 @@ -42,12 +44,13 @@ class File */ public function read($cacheFile, $vars = []) { + $this->cacheFile = $cacheFile; if (!empty($vars) && is_array($vars)) { // 妯℃澘闃靛垪鍙橀噺鍒嗚В鎴愪负鐙珛鍙橀噺 extract($vars, EXTR_OVERWRITE); } //杞藉叆妯＄増缂撳瓨鏂囦欢 - include $cacheFile; + include $this->cacheFile; } /** diff --git a/thinkphp/library/think/template/taglib/Cx.php b/thinkphp/library/think/template/taglib/Cx.php index af7a54c89..31e0698da 100644 --- a/thinkphp/library/think/template/taglib/Cx.php +++ b/thinkphp/library/think/template/taglib/Cx.php @@ -278,7 +278,7 @@ class Cx extends Taglib */ public function tagCase($tag, $content) { - $value = !empty($tag['expression']) ? $tag['expression'] : $tag['value']; + $value = isset($tag['expression']) ? $tag['expression'] : $tag['value']; $flag = substr($value, 0, 1); if ('$' == $flag || ':' == $flag) { $value = $this->autoBuildVar($value); diff --git a/thinkphp/library/think/view/driver/Php.php b/thinkphp/library/think/view/driver/Php.php index 468d3611d..f594a4384 100644 --- a/thinkphp/library/think/view/driver/Php.php +++ b/thinkphp/library/think/view/driver/Php.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -29,7 +29,11 @@ class Php 'view_suffix' => 'php', // 妯℃澘鏂囦欢鍚嶅垎闅旂 'view_depr' => DS, + // 榛樿妯℃澘娓叉煋瑙勫垯 1 瑙ｆ瀽涓哄皬鍐+涓嬪垝绾 2 鍏ㄩ儴杞崲灏忓啓 + 'auto_rule' => 1, ]; + protected $template; + protected $content; public function __construct($config = []) { @@ -68,16 +72,12 @@ class Php if (!is_file($template)) { throw new TemplateNotFoundException('template not exists:' . $template, $template); } + $this->template = $template; // 璁板綍瑙嗗浘淇℃伅 App::$debug && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info'); - if (isset($data['template'])) { - $__template__ = $template; - extract($data, EXTR_OVERWRITE); - include $__template__; - } else { - extract($data, EXTR_OVERWRITE); - include $template; - } + + extract($data, EXTR_OVERWRITE); + include $this->template; } /** @@ -89,14 +89,10 @@ class Php */ public function display($content, $data = []) { - if (isset($data['content'])) { - $__content__ = $content; - extract($data, EXTR_OVERWRITE); - eval('?>' . $__content__); - } else { - extract($data, EXTR_OVERWRITE); - eval('?>' . $content); - } + $this->content = $content; + + extract($data, EXTR_OVERWRITE); + eval('?>' . $this->content); } /** @@ -132,7 +128,7 @@ class Php if ($controller) { if ('' == $template) { // 濡傛灉妯℃澘鏂囦欢鍚嶄负绌 鎸夌収榛樿瑙勫垯瀹氫綅 - $template = str_replace('.', DS, $controller) . $depr . $request->action(); + $template = str_replace('.', DS, $controller) . $depr . (1 == $this->config['auto_rule'] ? Loader::parseName($request->action(true)) : $request->action()); } elseif (false === strpos($template, $depr)) { $template = str_replace('.', DS, $controller) . $depr . $template; } diff --git a/thinkphp/library/think/view/driver/Think.php b/thinkphp/library/think/view/driver/Think.php index 39a14ca33..a314ad606 100644 --- a/thinkphp/library/think/view/driver/Think.php +++ b/thinkphp/library/think/view/driver/Think.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -34,6 +34,8 @@ class Think 'view_depr' => DS, // 鏄惁寮鍚ā鏉跨紪璇戠紦瀛,璁句负false鍒欐瘡娆￠兘浼氶噸鏂扮紪璇 'tpl_cache' => true, + // 榛樿妯℃澘娓叉煋瑙勫垯 1 瑙ｆ瀽涓哄皬鍐+涓嬪垝绾 2 鍏ㄩ儴杞崲灏忓啓 + 'auto_rule' => 1, ]; public function __construct($config = []) @@ -127,7 +129,7 @@ class Think if ($controller) { if ('' == $template) { // 濡傛灉妯℃澘鏂囦欢鍚嶄负绌 鎸夌収榛樿瑙勫垯瀹氫綅 - $template = str_replace('.', DS, $controller) . $depr . $request->action(); + $template = str_replace('.', DS, $controller) . $depr . (1 == $this->config['auto_rule'] ? Loader::parseName($request->action(true)) : $request->action()); } elseif (false === strpos($template, $depr)) { $template = str_replace('.', DS, $controller) . $depr . $template; } diff --git a/thinkphp/library/traits/controller/Jump.php b/thinkphp/library/traits/controller/Jump.php index 6e6f2dec1..6a572246a 100644 --- a/thinkphp/library/traits/controller/Jump.php +++ b/thinkphp/library/traits/controller/Jump.php @@ -1,5 +1,4 @@ server('HTTP_REFERER'))) { + $url = Request::instance()->server('HTTP_REFERER'); + } elseif ('' !== $url && !strpos($url, '://') && 0 !== strpos($url, '/')) { + $url = Url::build($url); } + + $type = $this->getResponseType(); $result = [ - 'code' => $code, + 'code' => 1, 'msg' => $msg, 'data' => $data, 'url' => $url, 'wait' => $wait, ]; - $type = $this->getResponseType(); if ('html' == strtolower($type)) { - $result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str')) + $template = Config::get('template'); + $view = Config::get('view_replace_str'); + + $result = ViewTemplate::instance($template, $view) ->fetch(Config::get('dispatch_success_tmpl'), $result); } + $response = Response::create($result, $type)->header($header); + throw new HttpResponseException($response); } /** * 鎿嶄綔閿欒璺宠浆鐨勫揩鎹锋柟娉 * @access protected - * @param mixed $msg 鎻愮ず淇℃伅 - * @param string $url 璺宠浆鐨刄RL鍦板潃 - * @param mixed $data 杩斿洖鐨勬暟鎹 - * @param integer $wait 璺宠浆绛夊緟鏃堕棿 - * @param array $header 鍙戦佺殑Header淇℃伅 + * @param mixed $msg 鎻愮ず淇℃伅 + * @param string $url 璺宠浆鐨 URL 鍦板潃 + * @param mixed $data 杩斿洖鐨勬暟鎹 + * @param int $wait 璺宠浆绛夊緟鏃堕棿 + * @param array $header 鍙戦佺殑 Header 淇℃伅 * @return void + * @throws HttpResponseException */ protected function error($msg = '', $url = null, $data = '', $wait = 3, array $header = []) { - $code = 0; - if (is_numeric($msg)) { - $code = $msg; - $msg = ''; - } if (is_null($url)) { $url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);'; - } elseif ('' !== $url) { - $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); + } elseif ('' !== $url && !strpos($url, '://') && 0 !== strpos($url, '/')) { + $url = Url::build($url); } + + $type = $this->getResponseType(); $result = [ - 'code' => $code, + 'code' => 0, 'msg' => $msg, 'data' => $data, 'url' => $url, 'wait' => $wait, ]; - $type = $this->getResponseType(); if ('html' == strtolower($type)) { - $result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str')) + $template = Config::get('template'); + $view = Config::get('view_replace_str'); + + $result = ViewTemplate::instance($template, $view) ->fetch(Config::get('dispatch_error_tmpl'), $result); } + $response = Response::create($result, $type)->header($header); + throw new HttpResponseException($response); } /** - * 杩斿洖灏佽鍚庣殑API鏁版嵁鍒板鎴风 + * 杩斿洖灏佽鍚庣殑 API 鏁版嵁鍒板鎴风 * @access protected - * @param mixed $data 瑕佽繑鍥炵殑鏁版嵁 - * @param integer $code 杩斿洖鐨刢ode - * @param mixed $msg 鎻愮ず淇℃伅 - * @param string $type 杩斿洖鏁版嵁鏍煎紡 - * @param array $header 鍙戦佺殑Header淇℃伅 + * @param mixed $data 瑕佽繑鍥炵殑鏁版嵁 + * @param int $code 杩斿洖鐨 code + * @param mixed $msg 鎻愮ず淇℃伅 + * @param string $type 杩斿洖鏁版嵁鏍煎紡 + * @param array $header 鍙戦佺殑 Header 淇℃伅 * @return void + * @throws HttpResponseException */ protected function result($data, $code = 0, $msg = '', $type = '', array $header = []) { $result = [ 'code' => $code, 'msg' => $msg, - 'time' => $_SERVER['REQUEST_TIME'], + 'time' => Request::instance()->server('REQUEST_TIME'), 'data' => $data, ]; $type = $type ?: $this->getResponseType(); $response = Response::create($result, $type)->header($header); + throw new HttpResponseException($response); } /** - * URL閲嶅畾鍚 + * URL 閲嶅畾鍚 * @access protected - * @param string $url 璺宠浆鐨刄RL琛ㄨ揪寮 - * @param array|integer $params 鍏跺畠URL鍙傛暟 - * @param integer $code http code - * @param array $with 闅愬紡浼犲弬 + * @param string $url 璺宠浆鐨 URL 琛ㄨ揪寮 + * @param array|int $params 鍏跺畠 URL 鍙傛暟 + * @param int $code http code + * @param array $with 闅愬紡浼犲弬 * @return void + * @throws HttpResponseException */ protected function redirect($url, $params = [], $code = 302, $with = []) { - $response = new Redirect($url); if (is_integer($params)) { $code = $params; $params = []; } + + $response = new Redirect($url); $response->code($code)->params($params)->with($with); + throw new HttpResponseException($response); } /** - * 鑾峰彇褰撳墠鐨剅esponse 杈撳嚭绫诲瀷 + * 鑾峰彇褰撳墠鐨 response 杈撳嚭绫诲瀷 * @access protected * @return string */ protected function getResponseType() { - $isAjax = Request::instance()->isAjax(); - return $isAjax ? Config::get('default_ajax_return') : Config::get('default_return_type'); + return Request::instance()->isAjax() + ? Config::get('default_ajax_return') + : Config::get('default_return_type'); } } diff --git a/thinkphp/library/traits/model/SoftDelete.php b/thinkphp/library/traits/model/SoftDelete.php index be5863429..70f31ba29 100644 --- a/thinkphp/library/traits/model/SoftDelete.php +++ b/thinkphp/library/traits/model/SoftDelete.php @@ -2,11 +2,15 @@ namespace traits\model; +use think\Collection; use think\db\Query; +use think\Model; +/** + * @mixin \Think\Model + */ trait SoftDelete { - /** * 鍒ゆ柇褰撳墠瀹炰緥鏄惁琚蒋鍒犻櫎 * @access public @@ -15,22 +19,21 @@ trait SoftDelete public function trashed() { $field = $this->getDeleteTimeField(); - if (!empty($this->data[$field])) { + + if ($field && !empty($this->data[$field])) { return true; } return false; } /** - * 鏌ヨ杞垹闄ゆ暟鎹 + * 鏌ヨ鍖呭惈杞垹闄ょ殑鏁版嵁 * @access public * @return Query */ public static function withTrashed() { - $model = new static(); - $field = $model->getDeleteTimeField(true); - return $model->getQuery(); + return (new static )->getQuery(); } /** @@ -42,14 +45,18 @@ trait SoftDelete { $model = new static(); $field = $model->getDeleteTimeField(true); - return $model->getQuery() - ->useSoftDelete($field, ['not null', '']); + + if ($field) { + return $model->getQuery()->useSoftDelete($field, ['not null', '']); + } else { + return $model->getQuery(); + } } /** * 鍒犻櫎褰撳墠鐨勮褰 * @access public - * @param bool $force 鏄惁寮哄埗鍒犻櫎 + * @param bool $force 鏄惁寮哄埗鍒犻櫎 * @return integer */ public function delete($force = false) @@ -57,48 +64,71 @@ trait SoftDelete if (false === $this->trigger('before_delete', $this)) { return false; } + $name = $this->getDeleteTimeField(); - if (!$force) { + if ($name && !$force) { // 杞垹闄 $this->data[$name] = $this->autoWriteTimestamp($name); $result = $this->isUpdate()->save(); } else { - $result = $this->getQuery()->delete($this->data); + // 寮哄埗鍒犻櫎褰撳墠妯″瀷鏁版嵁 + $result = $this->getQuery()->where($this->getWhere())->delete(); + } + + // 鍏宠仈鍒犻櫎 + if (!empty($this->relationWrite)) { + foreach ($this->relationWrite as $key => $name) { + $name = is_numeric($key) ? $name : $key; + $result = $this->getRelation($name); + if ($result instanceof Model) { + $result->delete(); + } elseif ($result instanceof Collection || is_array($result)) { + foreach ($result as $model) { + $model->delete(); + } + } + } } $this->trigger('after_delete', $this); + + // 娓呯┖鍘熷鏁版嵁 + $this->origin = []; + return $result; } /** * 鍒犻櫎璁板綍 * @access public - * @param mixed $data 涓婚敭鍒楄〃 鏀寔闂寘鏌ヨ鏉′欢 + * @param mixed $data 涓婚敭鍒楄〃(鏀寔闂寘鏌ヨ鏉′欢) * @param bool $force 鏄惁寮哄埗鍒犻櫎 * @return integer 鎴愬姛鍒犻櫎鐨勮褰曟暟 */ public static function destroy($data, $force = false) { + if (is_null($data)) { + return 0; + } + // 鍖呭惈杞垹闄ゆ暟鎹 - $query = self::withTrashed(); + $query = (new static())->db(false); if (is_array($data) && key($data) !== 0) { $query->where($data); $data = null; } elseif ($data instanceof \Closure) { call_user_func_array($data, [ & $query]); $data = null; - } elseif (is_null($data)) { - return 0; } - $resultSet = $query->select($data); - $count = 0; - if ($resultSet) { + $count = 0; + if ($resultSet = $query->select($data)) { foreach ($resultSet as $data) { $result = $data->delete($force); $count += $result; } } + return $count; } @@ -110,46 +140,61 @@ trait SoftDelete */ public function restore($where = []) { - $name = $this->getDeleteTimeField(); if (empty($where)) { $pk = $this->getPk(); $where[$pk] = $this->getData($pk); } - // 鎭㈠鍒犻櫎 - return $this->getQuery() - ->useSoftDelete($name, ['not null', '']) - ->where($where) - ->update([$name => null]); + + $name = $this->getDeleteTimeField(); + + if ($name) { + // 鎭㈠鍒犻櫎 + return $this->getQuery() + ->useSoftDelete($name, ['not null', '']) + ->where($where) + ->update([$name => null]); + } else { + return 0; + } } /** * 鏌ヨ榛樿涓嶅寘鍚蒋鍒犻櫎鏁版嵁 * @access protected * @param Query $query 鏌ヨ瀵硅薄 - * @return void + * @return Query */ protected function base($query) { $field = $this->getDeleteTimeField(true); - $query->useSoftDelete($field); + return $field ? $query->useSoftDelete($field) : $query; } /** * 鑾峰彇杞垹闄ゅ瓧娈 * @access public - * @param bool $read 鏄惁鏌ヨ鎿嶄綔 鍐欐搷浣滅殑鏃跺欎細鑷姩鍘绘帀琛ㄥ埆鍚 + * @param bool $read 鏄惁鏌ヨ鎿嶄綔(鍐欐搷浣滅殑鏃跺欎細鑷姩鍘绘帀琛ㄥ埆鍚) * @return string */ protected function getDeleteTimeField($read = false) { - $field = property_exists($this, 'deleteTime') && isset($this->deleteTime) ? $this->deleteTime : 'delete_time'; + $field = property_exists($this, 'deleteTime') && isset($this->deleteTime) ? + $this->deleteTime : + 'delete_time'; + + if (false === $field) { + return false; + } + if (!strpos($field, '.')) { $field = '__TABLE__.' . $field; } + if (!$read && strpos($field, '.')) { $array = explode('.', $field); $field = array_pop($array); } + return $field; } } diff --git a/thinkphp/library/traits/think/Instance.php b/thinkphp/library/traits/think/Instance.php index ba45ddd83..428c8fde6 100644 --- a/thinkphp/library/traits/think/Instance.php +++ b/thinkphp/library/traits/think/Instance.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -15,31 +15,40 @@ use think\Exception; trait Instance { + /** + * @var null|static 瀹炰緥瀵硅薄 + */ protected static $instance = null; /** - * @param array $options + * 鑾峰彇绀轰緥 + * @param array $options 瀹炰緥閰嶇疆 * @return static */ public static function instance($options = []) { - if (is_null(self::$instance)) { - self::$instance = new self($options); - } + if (is_null(self::$instance)) self::$instance = new self($options); + return self::$instance; } - // 闈欐佽皟鐢 - public static function __callStatic($method, $params) + /** + * 闈欐佽皟鐢 + * @param string $method 璋冪敤鏂规硶 + * @param array $params 璋冪敤鍙傛暟 + * @return mixed + * @throws Exception + */ + public static function __callStatic($method, array $params) { - if (is_null(self::$instance)) { - self::$instance = new self(); - } + if (is_null(self::$instance)) self::$instance = new self(); + $call = substr($method, 1); - if (0 === strpos($method, '_') && is_callable([self::$instance, $call])) { - return call_user_func_array([self::$instance, $call], $params); - } else { + + if (0 !== strpos($method, '_') || !is_callable([self::$instance, $call])) { throw new Exception("method not exists:" . $method); } + + return call_user_func_array([self::$instance, $call], $params); } } diff --git a/thinkphp/start.php b/thinkphp/start.php index 8af62ef3a..adb1bc65c 100644 --- a/thinkphp/start.php +++ b/thinkphp/start.php @@ -2,7 +2,7 @@ // +---------------------------------------------------------------------- // | ThinkPHP [ WE CAN DO IT JUST THINK ] // +---------------------------------------------------------------------- -// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved. +// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. // +---------------------------------------------------------------------- // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) // +---------------------------------------------------------------------- @@ -12,7 +12,8 @@ namespace think; // ThinkPHP 寮曞鏂囦欢 -// 鍔犺浇鍩虹鏂囦欢 +// 1. 鍔犺浇鍩虹鏂囦欢 require __DIR__ . '/base.php'; -// 鎵ц搴旂敤 + +// 2. 鎵ц搴旂敤 App::run()->send(); diff --git a/thinkphp/tpl/dispatch_jump.tpl b/thinkphp/tpl/dispatch_jump.tpl index 18ee01bd5..583376bbb 100644 --- a/thinkphp/tpl/dispatch_jump.tpl +++ b/thinkphp/tpl/dispatch_jump.tpl @@ -2,6 +2,7 @@ + 璺宠浆鎻愮ず