From 9a416f3cc46d511ea5116c985929aea779cecbd3 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 31 Dec 2013 01:16:58 +0400 Subject: [PATCH] CS fixes --- extensions/yii/debug/models/search/Db.php | 2 +- extensions/yii/debug/models/search/Log.php | 2 +- extensions/yii/debug/models/search/Profile.php | 2 +- extensions/yii/debug/panels/DbPanel.php | 4 ++-- extensions/yii/debug/panels/LogPanel.php | 4 ++-- extensions/yii/debug/panels/ProfilingPanel.php | 6 +++--- extensions/yii/debug/views/default/panels/db/detail.php | 11 ++++------- extensions/yii/debug/views/default/panels/log/detail.php | 14 +++++--------- .../yii/debug/views/default/panels/profile/detail.php | 6 ++---- 9 files changed, 21 insertions(+), 30 deletions(-) diff --git a/extensions/yii/debug/models/search/Db.php b/extensions/yii/debug/models/search/Db.php index c5592fe..25cdbbd 100644 --- a/extensions/yii/debug/models/search/Db.php +++ b/extensions/yii/debug/models/search/Db.php @@ -53,7 +53,7 @@ class Db extends Base 'pageSize' => 10, ], 'sort' => [ - 'attributes' => ['duration','type','query'], + 'attributes' => ['duration', 'type', 'query'], 'defaultOrder' => [ 'duration' => SORT_DESC, ], diff --git a/extensions/yii/debug/models/search/Log.php b/extensions/yii/debug/models/search/Log.php index 38fa343..1a170b2 100644 --- a/extensions/yii/debug/models/search/Log.php +++ b/extensions/yii/debug/models/search/Log.php @@ -59,7 +59,7 @@ class Log extends Base 'pageSize' => 10, ], 'sort' => [ - 'attributes' => ['time','level','category','message'], + 'attributes' => ['time', 'level', 'category', 'message'], ], ]); diff --git a/extensions/yii/debug/models/search/Profile.php b/extensions/yii/debug/models/search/Profile.php index 357c019..ef630a3 100644 --- a/extensions/yii/debug/models/search/Profile.php +++ b/extensions/yii/debug/models/search/Profile.php @@ -53,7 +53,7 @@ class Profile extends Base 'pageSize' => 10, ], 'sort' => [ - 'attributes' => ['category','info','duration'], + 'attributes' => ['category', 'info', 'duration'], 'defaultOrder' => [ 'duration' => SORT_DESC, ], diff --git a/extensions/yii/debug/panels/DbPanel.php b/extensions/yii/debug/panels/DbPanel.php index 73b2fa7..043cfab 100644 --- a/extensions/yii/debug/panels/DbPanel.php +++ b/extensions/yii/debug/panels/DbPanel.php @@ -53,9 +53,9 @@ class DbPanel extends Panel public function getDetail() { $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, 'dataProvider' => $dataProvider, 'searchModel' => $searchModel, diff --git a/extensions/yii/debug/panels/LogPanel.php b/extensions/yii/debug/panels/LogPanel.php index 427fb54..160bca8 100644 --- a/extensions/yii/debug/panels/LogPanel.php +++ b/extensions/yii/debug/panels/LogPanel.php @@ -33,13 +33,13 @@ class LogPanel extends Panel 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() { $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',[ 'dataProvider' => $dataProvider, diff --git a/extensions/yii/debug/panels/ProfilingPanel.php b/extensions/yii/debug/panels/ProfilingPanel.php index e3037e9..71b76aa 100644 --- a/extensions/yii/debug/panels/ProfilingPanel.php +++ b/extensions/yii/debug/panels/ProfilingPanel.php @@ -38,7 +38,7 @@ class ProfilingPanel extends Panel 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), 'time' => number_format($this->data['time'] * 1000) . ' ms', 'panel' => $this @@ -48,9 +48,9 @@ class ProfilingPanel extends Panel public function getDetail() { $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, 'dataProvider' => $dataProvider, 'searchModel' => $searchModel, diff --git a/extensions/yii/debug/views/default/panels/db/detail.php b/extensions/yii/debug/views/default/panels/db/detail.php index 218bdf4..4faaae3 100644 --- a/extensions/yii/debug/views/default/panels/db/detail.php +++ b/extensions/yii/debug/views/default/panels/db/detail.php @@ -15,29 +15,26 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'duration', - 'value' => function ($data) - { + 'value' => function ($data) { return sprintf('%.1f ms',$data['duration']); }, ], [ 'attribute' => 'type', - 'value' => function ($data) - { + 'value' => function ($data) { return Html::encode(mb_strtoupper($data['type'],'utf8')); }, ], [ 'attribute' => 'query', - 'value' => function ($data) - { + 'value' => function ($data) { $query = Html::encode($data['query']); if (!empty($data['trace'])) { $query .= Html::ul($data['trace'], [ 'class' => 'trace', 'item' => function ($trace) { - return "
  • {$trace['file']}({$trace['line']})
  • "; + return "
  • {$trace['file']} ({$trace['line']})
  • "; }, ]); } diff --git a/extensions/yii/debug/views/default/panels/log/detail.php b/extensions/yii/debug/views/default/panels/log/detail.php index 10fb879..d40996a 100644 --- a/extensions/yii/debug/views/default/panels/log/detail.php +++ b/extensions/yii/debug/views/default/panels/log/detail.php @@ -12,7 +12,7 @@ echo GridView::widget([ 'id' => 'log-panel-detailed-grid', 'filterModel' => $searchModel, 'filterUrl' => $panel->getUrl(), - 'rowOptions' => function ($model, $key, $index, $grid){ + 'rowOptions' => function ($model, $key, $index, $grid) { switch($model['level']) { case Logger::LEVEL_ERROR : return ['class' => 'danger']; case Logger::LEVEL_WARNING : return ['class' => 'warning']; @@ -24,8 +24,7 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'time', - 'value' => function ($data) - { + 'value' => function ($data) { $timeInSeconds = $data['time'] / 1000; $millisecondsDiff = (int)(($timeInSeconds - (int)$timeInSeconds) * 1000); return date('H:i:s.',$timeInSeconds) . sprintf('%03d',$millisecondsDiff); @@ -33,8 +32,7 @@ echo GridView::widget([ ], [ 'attribute' => 'level', - 'value' => function ($data) - { + 'value' => function ($data) { return Logger::getLevelName($data['level']); }, 'filter' => [ @@ -47,15 +45,13 @@ echo GridView::widget([ 'category', [ 'attribute' => 'message', - 'value' => function ($data) - { + 'value' => function ($data) { $message = nl2br(Html::encode($data['message'])); if (!empty($data['trace'])) { $message .= Html::ul($data['trace'], [ 'class' => 'trace', - 'item' => function ($trace) - { + 'item' => function ($trace) { return "
  • {$trace['file']} ({$trace['line']})
  • "; } ]); diff --git a/extensions/yii/debug/views/default/panels/profile/detail.php b/extensions/yii/debug/views/default/panels/profile/detail.php index 0431c74..4eceb82 100644 --- a/extensions/yii/debug/views/default/panels/profile/detail.php +++ b/extensions/yii/debug/views/default/panels/profile/detail.php @@ -13,16 +13,14 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'duration', - 'value' => function ($data) - { + 'value' => function ($data) { return sprintf('%.1f ms',$data['duration']); }, ], 'category', [ 'attribute' => 'info', - 'value' => function ($data) - { + 'value' => function ($data) { return str_repeat('', $data['level']) . $data['info']; }, 'options' => [