PSR规范调整

This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions

View File

@@ -10,9 +10,10 @@
// +----------------------------------------------------------------------
namespace think\behavior;
use think\Config;
use think\Log;
use think\Debug;
use think\Log;
/**
* 系统行为扩展页面Trace显示输出
@@ -21,11 +22,13 @@ use think\Debug;
* @subpackage Behavior
* @author liu21st <liu21st@gmail.com>
*/
class ShowPageTrace {
class ShowPageTrace
{
// 行为扩展的执行入口必须是run
public function run(&$params){
if(!IS_AJAX && Config::get('show_page_trace')) {
public function run(&$params)
{
if (!IS_AJAX && Config::get('show_page_trace')) {
echo $this->showTrace();
}
}
@@ -34,57 +37,59 @@ class ShowPageTrace {
* 显示页面Trace信息
* @access private
*/
private function showTrace() {
// 系统默认显示信息
$files = get_included_files();
$info = [];
foreach ($files as $key=>$file){
$info[] = $file.' ( '.number_format(filesize($file)/1024,2).' KB )';
private function showTrace()
{
// 系统默认显示信息
$files = get_included_files();
$info = [];
foreach ($files as $key => $file) {
$info[] = $file . ' ( ' . number_format(filesize($file) / 1024, 2) . ' KB )';
}
$trace = [];
Debug::remark('START',NOW_TIME);
$base = [
'请求信息' => date('Y-m-d H:i:s',$_SERVER['REQUEST_TIME']).' '.$_SERVER['SERVER_PROTOCOL'].' '.$_SERVER['REQUEST_METHOD'].' : '.$_SERVER['PHP_SELF'],
'运行时间' => Debug::getUseTime('START','END',6).'s',
'内存开销' => MEMORY_LIMIT_ON?G('START','END','m').'b':'不支持',
'查询信息' => N('db_query').' queries '.N('db_write').' writes ',
'文件加载' => count($files),
'缓存信息' => N('cache_read').' gets '.N('cache_write').' writes ',
'配置加载' => count(Config::get()),
];
$trace = [];
Debug::remark('START', NOW_TIME);
$base = [
'请求信息' => date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME']) . ' ' . $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['PHP_SELF'],
'运行时间' => Debug::getUseTime('START', 'END', 6) . 's',
'内存开销' => MEMORY_LIMIT_ON ? G('START', 'END', 'm') . 'b' : '不支持',
'查询信息' => N('db_query') . ' queries ' . N('db_write') . ' writes ',
'文件加载' => count($files),
'缓存信息' => N('cache_read') . ' gets ' . N('cache_write') . ' writes ',
'配置加载' => count(Config::get()),
];
// 读取项目定义的Trace文件
$traceFile = MODULE_PATH.'trace.php';
if(is_file($traceFile)) {
$base = array_merge($base,include $traceFile);
$traceFile = MODULE_PATH . 'trace.php';
if (is_file($traceFile)) {
$base = array_merge($base, include $traceFile);
}
$debug = Log::getLog();
$tabs = Config::get('trace_page_tabs');
foreach ($tabs as $name=>$title){
switch(strtoupper($name)) {
case 'BASE':// 基本信息
$trace[$title] = $base;
$debug = Log::getLog();
$tabs = Config::get('trace_page_tabs');
foreach ($tabs as $name => $title) {
switch (strtoupper($name)) {
case 'BASE': // 基本信息
$trace[$title] = $base;
break;
case 'FILE': // 文件信息
$trace[$title] = $info;
$trace[$title] = $info;
break;
default:// 调试信息
$name = strtoupper($name);
if(strpos($name,'|')) {// 多组信息
$array = explode('|',$name);
$result = [];
foreach($array as $name){
$result += isset($debug[$name])?$debug[$name]:[];
default: // 调试信息
$name = strtoupper($name);
if (strpos($name, '|')) {
// 多组信息
$array = explode('|', $name);
$result = [];
foreach ($array as $name) {
$result += isset($debug[$name]) ? $debug[$name] : [];
}
$trace[$title] = $result;
}else{
$trace[$title] = isset($debug[$name])?$debug[$name]:'';
$trace[$title] = $result;
} else {
$trace[$title] = isset($debug[$name]) ? $debug[$name] : '';
}
}
}
unset($files,$info,$base,$debug);
unset($files, $info, $base, $debug);
// 调用Trace页面模板
ob_start();
include Config::has('tmpl_trace_file') ? Config::get('tmpl_trace_file') : THINK_PATH.'tpl/page_trace.tpl';
include Config::has('tmpl_trace_file') ? Config::get('tmpl_trace_file') : THINK_PATH . 'tpl/page_trace.tpl';
return ob_get_clean();
}
}