diff --git a/extensions/debug/DebugAsset.php b/extensions/debug/DebugAsset.php index da0b91f..34b4617 100644 --- a/extensions/debug/DebugAsset.php +++ b/extensions/debug/DebugAsset.php @@ -6,6 +6,7 @@ */ namespace yii\debug; + use yii\web\AssetBundle; /** diff --git a/extensions/debug/LogTarget.php b/extensions/debug/LogTarget.php index 3f0be69..ee1f6eb 100644 --- a/extensions/debug/LogTarget.php +++ b/extensions/debug/LogTarget.php @@ -154,5 +154,4 @@ class LogTarget extends Target # / 2 because messages are in couple (begin/end) return count($profileLogs['messages']) / 2; } - } diff --git a/extensions/debug/Module.php b/extensions/debug/Module.php index 55a1068..ae166bd 100644 --- a/extensions/debug/Module.php +++ b/extensions/debug/Module.php @@ -54,6 +54,16 @@ class Module extends \yii\base\Module public $historySize = 50; /** + * Returns Yii logo ready to use in `(.*).*$%ms', '$1', $pinfo); + $phpinfo = str_replace('getTotalQueryTime($timings) * 1000) . ' ms'; return Yii::$app->view->render('panels/db/summary', [ - 'timings' => $this->calculateTimings(), + 'timings' => $this->calculateTimings(), 'panel' => $this, 'queryCount' => $queryCount, 'queryTime' => $queryTime, @@ -127,7 +127,7 @@ class DbPanel extends Panel $this->_models = []; $timings = $this->calculateTimings(); - foreach($timings as $seq => $dbTiming) { + foreach ($timings as $seq => $dbTiming) { $this->_models[] = [ 'type' => $this->getQueryType($dbTiming['info']), 'query' => $dbTiming['info'], @@ -164,5 +164,4 @@ class DbPanel extends Panel { return (($this->criticalQueryThreshold !== null) && ($count > $this->criticalQueryThreshold)); } - } diff --git a/extensions/debug/panels/LogPanel.php b/extensions/debug/panels/LogPanel.php index 984c64b..67b9773 100644 --- a/extensions/debug/panels/LogPanel.php +++ b/extensions/debug/panels/LogPanel.php @@ -50,7 +50,7 @@ class LogPanel extends Panel $dataProvider = $searchModel->search(Yii::$app->request->getQueryParams(), $this->getModels()); return Yii::$app->view->render('panels/log/detail', [ - 'dataProvider' => $dataProvider, + 'dataProvider' => $dataProvider, 'panel' => $this, 'searchModel' => $searchModel, ]); @@ -78,7 +78,7 @@ class LogPanel extends Panel if ($this->_models === null || $refresh) { $this->_models = []; - foreach($this->data['messages'] as $message) { + foreach ($this->data['messages'] as $message) { $this->_models[] = [ 'message' => $message[0], 'level' => $message[1], diff --git a/extensions/debug/panels/ProfilingPanel.php b/extensions/debug/panels/ProfilingPanel.php index 7abe7d4..b287bfe 100644 --- a/extensions/debug/panels/ProfilingPanel.php +++ b/extensions/debug/panels/ProfilingPanel.php @@ -86,7 +86,7 @@ class ProfilingPanel extends Panel $this->_models = []; $timings = Yii::$app->getLog()->calculateTimings($this->data['messages']); - foreach($timings as $seq => $profileTiming) { + foreach ($timings as $seq => $profileTiming) { $this->_models[] = [ 'duration' => $profileTiming['duration'] * 1000, // in milliseconds 'category' => $profileTiming['category'], diff --git a/extensions/debug/views/default/index.php b/extensions/debug/views/default/index.php index 4adc29f..3477f69 100644 --- a/extensions/debug/views/default/index.php +++ b/extensions/debug/views/default/index.php @@ -3,6 +3,7 @@ use yii\helpers\Html; use yii\grid\GridView; use yii\data\ArrayDataProvider; +use yii\debug\panels\ConfigPanel; /** * @var \yii\web\View $this @@ -14,15 +15,18 @@ use yii\data\ArrayDataProvider; $this->title = 'Yii Debugger'; ?>
-
-
- - - -
-
- Yii Debugger -
+ + +
+
+ + + Yii Debugger + +
+ + getSummary() ?> +
@@ -49,17 +53,15 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'tag', - 'value' => function ($data) - { + 'value' => function ($data) { return Html::a($data['tag'], ['view', 'tag' => $data['tag']]); }, 'format' => 'html', ], [ 'attribute' => 'time', - 'value' => function ($data) use ($timeFormatter) - { - return $timeFormatter->asDateTime($data['time'], 'long'); + 'value' => function ($data) use ($timeFormatter) { + return $timeFormatter->asDateTime($data['time'], 'short'); }, ], 'ip', @@ -71,7 +73,7 @@ echo GridView::widget([ if ($dbPanel->isQueryCountCritical($data['sqlCount'])) { - $content = Html::tag('b', $data['sqlCount']) . ' ' . Html::tag('span','',['class' => 'glyphicon glyphicon-exclamation-sign']); + $content = Html::tag('b', $data['sqlCount']) . ' ' . Html::tag('span', '', ['class' => 'glyphicon glyphicon-exclamation-sign']); return Html::a($content, ['view', 'panel' => 'db', 'tag' => $data['tag']], [ 'title' => 'Too many queries. Allowed count is ' . $dbPanel->criticalQueryThreshold, ]); @@ -88,8 +90,7 @@ echo GridView::widget([ ], [ 'attribute'=>'ajax', - 'value' => function ($data) - { + 'value' => function ($data) { return $data['ajax'] ? 'Yes' : 'No'; }, 'filter' => ['No', 'Yes'], diff --git a/extensions/debug/views/default/panels/config/detail.php b/extensions/debug/views/default/panels/config/detail.php index f89a686..88e96a1 100644 --- a/extensions/debug/views/default/panels/config/detail.php +++ b/extensions/debug/views/default/panels/config/detail.php @@ -8,8 +8,6 @@ $extensions = $panel->getExtensions(); ?>

Configuration

-
'btn btn-info', 'target' => 'phpinfo']) ?>
- render('panels/config/table', [ 'caption' => 'Application Configuration', @@ -37,4 +35,6 @@ echo $this->render('panels/config/table', [ 'Memcache' => $panel->data['php']['memcache'] ? 'Enabled' : 'Disabled', ], ]); + +echo $panel->getPhpInfo(); ?> \ No newline at end of file diff --git a/extensions/debug/views/default/panels/config/summary.php b/extensions/debug/views/default/panels/config/summary.php index c2af8ae..66a8a44 100644 --- a/extensions/debug/views/default/panels/config/summary.php +++ b/extensions/debug/views/default/panels/config/summary.php @@ -8,10 +8,9 @@ use yii\helpers\Html; ?>
- - data['application']['yii'] ?> + Yii + data['application']['yii'] ?> + PHP + data['php']['version'] ?>
-
- data['php']['version'], ['phpinfo'], ['title' => 'Show phpinfo()', 'target' => 'phpinfo']) ?> -
diff --git a/extensions/debug/views/default/panels/profile/summary.php b/extensions/debug/views/default/panels/profile/summary.php index f12ea88..9dac6a7 100644 --- a/extensions/debug/views/default/panels/profile/summary.php +++ b/extensions/debug/views/default/panels/profile/summary.php @@ -1,6 +1,4 @@
Time -
-
Memory
diff --git a/extensions/debug/views/default/toolbar.php b/extensions/debug/views/default/toolbar.php index b2a380b..5ed34e5 100644 --- a/extensions/debug/views/default/toolbar.php +++ b/extensions/debug/views/default/toolbar.php @@ -5,6 +5,7 @@ * @var string $tag * @var string $position */ +use yii\helpers\Html; use yii\debug\panels\ConfigPanel; $minJs = <<getUrl(); +$firstPanel = reset($panels); +$url = $firstPanel->getUrl(); ?>
-
- - +
+ + + Yii Debugger
+ - getSummary() ?> + getSummary() ?> ›
‹
diff --git a/extensions/debug/views/default/view.php b/extensions/debug/views/default/view.php index cb31946..f3784a1 100644 --- a/extensions/debug/views/default/view.php +++ b/extensions/debug/views/default/view.php @@ -17,14 +17,14 @@ $this->title = 'Yii Debugger'; ?>
-
- - - -
-
- 'Back to main debug page']) ?> -
+ +
+ + + Yii Debugger + +
+ getSummary() ?> @@ -32,7 +32,7 @@ $this->title = 'Yii Debugger';
-
+
$panel) { @@ -44,7 +44,7 @@ $this->title = 'Yii Debugger'; ?>
-
+