Commit 9a416f3c by Mark

CS fixes

parent 24ff3d3d
...@@ -53,7 +53,7 @@ class Db extends Base ...@@ -53,7 +53,7 @@ class Db extends Base
'pageSize' => 10, 'pageSize' => 10,
], ],
'sort' => [ 'sort' => [
'attributes' => ['duration','type','query'], 'attributes' => ['duration', 'type', 'query'],
'defaultOrder' => [ 'defaultOrder' => [
'duration' => SORT_DESC, 'duration' => SORT_DESC,
], ],
......
...@@ -59,7 +59,7 @@ class Log extends Base ...@@ -59,7 +59,7 @@ class Log extends Base
'pageSize' => 10, 'pageSize' => 10,
], ],
'sort' => [ 'sort' => [
'attributes' => ['time','level','category','message'], 'attributes' => ['time', 'level', 'category', 'message'],
], ],
]); ]);
......
...@@ -53,7 +53,7 @@ class Profile extends Base ...@@ -53,7 +53,7 @@ class Profile extends Base
'pageSize' => 10, 'pageSize' => 10,
], ],
'sort' => [ 'sort' => [
'attributes' => ['category','info','duration'], 'attributes' => ['category', 'info', 'duration'],
'defaultOrder' => [ 'defaultOrder' => [
'duration' => SORT_DESC, 'duration' => SORT_DESC,
], ],
......
...@@ -53,9 +53,9 @@ class DbPanel extends Panel ...@@ -53,9 +53,9 @@ class DbPanel extends Panel
public function getDetail() public function getDetail()
{ {
$searchModel = new Db(); $searchModel = new Db();
$dataProvider = $searchModel->search($_GET, $this->getModels()); $dataProvider = $searchModel->search(Yii::$app->request->get(), $this->getModels());
return Yii::$app->view->render('panels/db/detail',[ return Yii::$app->view->render('panels/db/detail', [
'panel' => $this, 'panel' => $this,
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider,
'searchModel' => $searchModel, 'searchModel' => $searchModel,
......
...@@ -33,13 +33,13 @@ class LogPanel extends Panel ...@@ -33,13 +33,13 @@ class LogPanel extends Panel
public function getSummary() public function getSummary()
{ {
return Yii::$app->view->render('panels/log/summary',['data' => $this->data, 'panel' => $this]); return Yii::$app->view->render('panels/log/summary', ['data' => $this->data, 'panel' => $this]);
} }
public function getDetail() public function getDetail()
{ {
$searchModel = new Log(); $searchModel = new Log();
$dataProvider = $searchModel->search($_GET, $this->getModels()); $dataProvider = $searchModel->search(Yii::$app->request->get(), $this->getModels());
return Yii::$app->view->render('panels/log/detail',[ return Yii::$app->view->render('panels/log/detail',[
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider,
......
...@@ -38,7 +38,7 @@ class ProfilingPanel extends Panel ...@@ -38,7 +38,7 @@ class ProfilingPanel extends Panel
public function getSummary() public function getSummary()
{ {
return Yii::$app->view->render('panels/profile/summary',[ return Yii::$app->view->render('panels/profile/summary', [
'memory' => sprintf('%.1f MB', $this->data['memory'] / 1048576), 'memory' => sprintf('%.1f MB', $this->data['memory'] / 1048576),
'time' => number_format($this->data['time'] * 1000) . ' ms', 'time' => number_format($this->data['time'] * 1000) . ' ms',
'panel' => $this 'panel' => $this
...@@ -48,9 +48,9 @@ class ProfilingPanel extends Panel ...@@ -48,9 +48,9 @@ class ProfilingPanel extends Panel
public function getDetail() public function getDetail()
{ {
$searchModel = new Profile(); $searchModel = new Profile();
$dataProvider = $searchModel->search($_GET, $this->getModels()); $dataProvider = $searchModel->search(Yii::$app->request->get(), $this->getModels());
return Yii::$app->view->render('panels/profile/detail',[ return Yii::$app->view->render('panels/profile/detail', [
'panel' => $this, 'panel' => $this,
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider,
'searchModel' => $searchModel, 'searchModel' => $searchModel,
......
...@@ -15,29 +15,26 @@ echo GridView::widget([ ...@@ -15,29 +15,26 @@ echo GridView::widget([
['class' => 'yii\grid\SerialColumn'], ['class' => 'yii\grid\SerialColumn'],
[ [
'attribute' => 'duration', 'attribute' => 'duration',
'value' => function ($data) 'value' => function ($data) {
{
return sprintf('%.1f ms',$data['duration']); return sprintf('%.1f ms',$data['duration']);
}, },
], ],
[ [
'attribute' => 'type', 'attribute' => 'type',
'value' => function ($data) 'value' => function ($data) {
{
return Html::encode(mb_strtoupper($data['type'],'utf8')); return Html::encode(mb_strtoupper($data['type'],'utf8'));
}, },
], ],
[ [
'attribute' => 'query', 'attribute' => 'query',
'value' => function ($data) 'value' => function ($data) {
{
$query = Html::encode($data['query']); $query = Html::encode($data['query']);
if (!empty($data['trace'])) { if (!empty($data['trace'])) {
$query .= Html::ul($data['trace'], [ $query .= Html::ul($data['trace'], [
'class' => 'trace', 'class' => 'trace',
'item' => function ($trace) { 'item' => function ($trace) {
return "<li>{$trace['file']}({$trace['line']})</li>"; return "<li>{$trace['file']} ({$trace['line']})</li>";
}, },
]); ]);
} }
......
...@@ -12,7 +12,7 @@ echo GridView::widget([ ...@@ -12,7 +12,7 @@ echo GridView::widget([
'id' => 'log-panel-detailed-grid', 'id' => 'log-panel-detailed-grid',
'filterModel' => $searchModel, 'filterModel' => $searchModel,
'filterUrl' => $panel->getUrl(), 'filterUrl' => $panel->getUrl(),
'rowOptions' => function ($model, $key, $index, $grid){ 'rowOptions' => function ($model, $key, $index, $grid) {
switch($model['level']) { switch($model['level']) {
case Logger::LEVEL_ERROR : return ['class' => 'danger']; case Logger::LEVEL_ERROR : return ['class' => 'danger'];
case Logger::LEVEL_WARNING : return ['class' => 'warning']; case Logger::LEVEL_WARNING : return ['class' => 'warning'];
...@@ -24,8 +24,7 @@ echo GridView::widget([ ...@@ -24,8 +24,7 @@ echo GridView::widget([
['class' => 'yii\grid\SerialColumn'], ['class' => 'yii\grid\SerialColumn'],
[ [
'attribute' => 'time', 'attribute' => 'time',
'value' => function ($data) 'value' => function ($data) {
{
$timeInSeconds = $data['time'] / 1000; $timeInSeconds = $data['time'] / 1000;
$millisecondsDiff = (int)(($timeInSeconds - (int)$timeInSeconds) * 1000); $millisecondsDiff = (int)(($timeInSeconds - (int)$timeInSeconds) * 1000);
return date('H:i:s.',$timeInSeconds) . sprintf('%03d',$millisecondsDiff); return date('H:i:s.',$timeInSeconds) . sprintf('%03d',$millisecondsDiff);
...@@ -33,8 +32,7 @@ echo GridView::widget([ ...@@ -33,8 +32,7 @@ echo GridView::widget([
], ],
[ [
'attribute' => 'level', 'attribute' => 'level',
'value' => function ($data) 'value' => function ($data) {
{
return Logger::getLevelName($data['level']); return Logger::getLevelName($data['level']);
}, },
'filter' => [ 'filter' => [
...@@ -47,15 +45,13 @@ echo GridView::widget([ ...@@ -47,15 +45,13 @@ echo GridView::widget([
'category', 'category',
[ [
'attribute' => 'message', 'attribute' => 'message',
'value' => function ($data) 'value' => function ($data) {
{
$message = nl2br(Html::encode($data['message'])); $message = nl2br(Html::encode($data['message']));
if (!empty($data['trace'])) { if (!empty($data['trace'])) {
$message .= Html::ul($data['trace'], [ $message .= Html::ul($data['trace'], [
'class' => 'trace', 'class' => 'trace',
'item' => function ($trace) 'item' => function ($trace) {
{
return "<li>{$trace['file']} ({$trace['line']})</li>"; return "<li>{$trace['file']} ({$trace['line']})</li>";
} }
]); ]);
......
...@@ -13,16 +13,14 @@ echo GridView::widget([ ...@@ -13,16 +13,14 @@ echo GridView::widget([
['class' => 'yii\grid\SerialColumn'], ['class' => 'yii\grid\SerialColumn'],
[ [
'attribute' => 'duration', 'attribute' => 'duration',
'value' => function ($data) 'value' => function ($data) {
{
return sprintf('%.1f ms',$data['duration']); return sprintf('%.1f ms',$data['duration']);
}, },
], ],
'category', 'category',
[ [
'attribute' => 'info', 'attribute' => 'info',
'value' => function ($data) 'value' => function ($data) {
{
return str_repeat('<span class="indent">→</span>', $data['level']) . $data['info']; return str_repeat('<span class="indent">→</span>', $data['level']) . $data['info'];
}, },
'options' => [ 'options' => [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment