Completed
Pull Request — master (#317)
by
unknown
02:11
created
components/Helper.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
             }
121 121
             while (($pos = strrpos($r, '/')) > 0) {
122 122
                 $r = substr($r, 0, $pos);
123
-                if ($user->can($r . '/*', $params)) {
123
+                if ($user->can($r.'/*', $params)) {
124 124
                     return true;
125 125
                 }
126 126
             }
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
             }
133 133
             while (($pos = strrpos($r, '/')) > 0) {
134 134
                 $r = substr($r, 0, $pos);
135
-                if (isset($routes[$r . '/*'])) {
135
+                if (isset($routes[$r.'/*'])) {
136 136
                     return true;
137 137
                 }
138 138
             }
@@ -143,15 +143,15 @@  discard block
 block discarded – undo
143 143
     protected static function normalizeRoute($route)
144 144
     {
145 145
         if ($route === '') {
146
-            return '/' . Yii::$app->controller->getRoute();
146
+            return '/'.Yii::$app->controller->getRoute();
147 147
         } elseif (strncmp($route, '/', 1) === 0) {
148 148
             return $route;
149 149
         } elseif (strpos($route, '/') === false) {
150
-            return '/' . Yii::$app->controller->getUniqueId() . '/' . $route;
150
+            return '/'.Yii::$app->controller->getUniqueId().'/'.$route;
151 151
         } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') {
152
-            return '/' . $mid . '/' . $route;
152
+            return '/'.$mid.'/'.$route;
153 153
         }
154
-        return '/' . $route;
154
+        return '/'.$route;
155 155
     }
156 156
 
157 157
     /**
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
             }
221 221
             return implode(' ', $result);
222 222
         }
223
-        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) {
223
+        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) {
224 224
             return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : '';
225 225
         }, $buttons);
226 226
     }
Please login to merge, or discard this patch.
components/MenuHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
                 if (strpos($route, $prefix) !== 0) {
102 102
                     if (substr($route, -1) === '/') {
103 103
                         $prefix = $route;
104
-                        $filter1[] = $route . '%';
104
+                        $filter1[] = $route.'%';
105 105
                     } else {
106 106
                         $filter2[] = $route;
107 107
                     }
Please login to merge, or discard this patch.
views/user/view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Users'), 'url' => ['index']];
12 12
 $this->params['breadcrumbs'][] = $this->title;
13 13
 
14
-$controllerId = $this->context->uniqueId . '/';
14
+$controllerId = $this->context->uniqueId.'/';
15 15
 ?>
16 16
 <div class="user-view">
17 17
 
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
     <p>
21 21
         <?php
22
-        if ($model->status == 0 && Helper::checkRoute($controllerId . 'activate')) {
22
+        if ($model->status == 0 && Helper::checkRoute($controllerId.'activate')) {
23 23
             echo Html::a(Yii::t('rbac-admin', 'Activate'), ['activate', 'id' => $model->id], [
24 24
                 'class' => 'btn btn-primary',
25 25
                 'data' => [
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         }
31 31
         ?>
32 32
         <?php
33
-        if (Helper::checkRoute($controllerId . 'delete')) {
33
+        if (Helper::checkRoute($controllerId.'delete')) {
34 34
             echo Html::a(Yii::t('rbac-admin', 'Delete'), ['delete', 'id' => $model->id], [
35 35
                 'class' => 'btn btn-danger',
36 36
                 'data' => [
Please login to merge, or discard this patch.
views/rule/update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 /* @var $this  yii\web\View */
6 6
 /* @var $model mdm\admin\models\BizRule */
7 7
 
8
-$this->title = Yii::t('rbac-admin', 'Update Rule') . ': ' . $model->name;
8
+$this->title = Yii::t('rbac-admin', 'Update Rule').': '.$model->name;
9 9
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Rules'), 'url' => ['index']];
10 10
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
11 11
 $this->params['breadcrumbs'][] = Yii::t('rbac-admin', 'Update');
Please login to merge, or discard this patch.
views/item/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 <div class="role-index">
22 22
     <h1><?= Html::encode($this->title) ?></h1>
23 23
     <p>
24
-        <?= Html::a(Yii::t('rbac-admin', 'Create ' . $labels['Item']), ['create'], ['class' => 'btn btn-success']) ?>
24
+        <?= Html::a(Yii::t('rbac-admin', 'Create '.$labels['Item']), ['create'], ['class' => 'btn btn-success']) ?>
25 25
     </p>
26 26
     <?=
27 27
     GridView::widget([
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
                 'attribute' => 'description',
43 43
                 'label' => Yii::t('rbac-admin', 'Description'),
44 44
             ],
45
-            ['class' => 'yii\grid\ActionColumn',],
45
+            ['class' => 'yii\grid\ActionColumn', ],
46 46
         ],
47 47
     ])
48 48
     ?>
Please login to merge, or discard this patch.
views/item/update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 
9 9
 $context = $this->context;
10 10
 $labels = $context->labels();
11
-$this->title = Yii::t('rbac-admin', 'Update ' . $labels['Item']) . ': ' . $model->name;
11
+$this->title = Yii::t('rbac-admin', 'Update '.$labels['Item']).': '.$model->name;
12 12
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', $labels['Items']), 'url' => ['index']];
13 13
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
14 14
 $this->params['breadcrumbs'][] = Yii::t('rbac-admin', 'Update');
Please login to merge, or discard this patch.
views/item/create.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 
9 9
 $context = $this->context;
10 10
 $labels = $context->labels();
11
-$this->title = Yii::t('rbac-admin', 'Create ' . $labels['Item']);
11
+$this->title = Yii::t('rbac-admin', 'Create '.$labels['Item']);
12 12
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', $labels['Items']), 'url' => ['index']];
13 13
 $this->params['breadcrumbs'][] = $this->title;
14 14
 ?>
Please login to merge, or discard this patch.
views/menu/update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 /* @var $this yii\web\View */
6 6
 /* @var $model mdm\admin\models\Menu */
7 7
 
8
-$this->title = Yii::t('rbac-admin', 'Update Menu') . ': ' . ' ' . $model->name;
8
+$this->title = Yii::t('rbac-admin', 'Update Menu').': '.' '.$model->name;
9 9
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Menus'), 'url' => ['index']];
10 10
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
11 11
 $this->params['breadcrumbs'][] = Yii::t('rbac-admin', 'Update');
Please login to merge, or discard this patch.
views/layouts/right-menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
                 $label = Html::tag('span', Html::encode($menu['label']), []);
26 26
                 $active = $menu['active'] ? ' active' : '';
27 27
                 echo Html::a($label, $menu['url'], [
28
-                    'class' => 'list-group-item' . $active,
28
+                    'class' => 'list-group-item'.$active,
29 29
                 ]);
30 30
             }
31 31
             ?>
Please login to merge, or discard this patch.