yuncms / framework

config/console.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     ],
     'components' => [
         'cache' => [
-            'keyPrefix' => 'rest',       //前缀
+            'keyPrefix' => 'rest', //前缀
         ],
         'request' => [
             'class' => yuncms\console\Request::class,

config/rest.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
     ],
     'components' => [
         'cache' => [
-            'keyPrefix' => 'rest',       //前缀
+            'keyPrefix' => 'rest', //前缀
         ],
         'request' => [
             'class' => yuncms\web\Request::class,
@@ -28,12 +28,12 @@ 
             'secureProtocolHeaders' => [
                 'X-Forwarded-Proto' => ['https'], // Common
                 'Front-End-Https' => ['on'], // Microsoft
-                'X-Client-Scheme' => ['https'],// Aliyun CDN
+                'X-Client-Scheme' => ['https'], // Aliyun CDN
                 'X-Client-Proto' => ['https'],
             ],
             'ipHeaders' => [
-                'X-Forwarded-For',// Common
-                'ALI-CDN-REAL-IP',// Aliyun CDN
+                'X-Forwarded-For', // Common
+                'ALI-CDN-REAL-IP', // Aliyun CDN
                 'X-Cluster-Client-IP',
             ],
         ],

src/admin/models/Admin.php

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 class Admin extends ActiveRecord implements IdentityInterface
 {
     //场景定义
-    const SCENARIO_CREATE = 'create';//创建
-    const SCENARIO_UPDATE = 'update';//更新
+    const SCENARIO_CREATE = 'create'; //创建
+    const SCENARIO_UPDATE = 'update'; //更新
 
     const STATUS_ACTIVE = 0b0;
     const STATUS_DELETED = 0b1;

src/console/views/migrate/_createTable.php

Braces +3 added lines, -1 removed lines

@@ -11,9 +11,11 @@
 <?php foreach ($fields as $field):
     if (empty($field['decorators'])): ?>
             '<?= $field['property'] ?>',
-<?php else: ?>
+<?php else {
+    : ?>
             <?= "'{$field['property']}' => \$this->{$field['decorators']}" ?>,
 <?php endif;
+}
 endforeach; ?>
         ], $tableOptions);
 <?= $this->render('_addForeignKeys', [

src/admin/views/admin/index.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
                     'email:email',
                     [
                         'attribute' => 'status',
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             return $model->status == Admin::STATUS_ACTIVE ? Yii::t('yuncms', 'Active') : Yii::t('yuncms', 'Disable');
                         },
                         'label' => Yii::t('yuncms', 'Status'),
@@ -66,7 +66,7 @@ 
                         'class' => 'yii\grid\ActionColumn',
                         'header' => Yii::t('yuncms', 'Operation'),
                         'template' => '{assignment} {view} {update} {delete}',
-                        'buttons' => ['assignment' => function ($url, $model, $key) {
+                        'buttons' => ['assignment' => function($url, $model, $key) {
                             return Html::a('<span class="glyphicon glyphicon-dashboard"></span>',
                                 Url::toRoute(['assignment/view', 'id' => $model->id]), [
                                     'title' => Yii::t('yuncms', 'Assignment'),

src/admin/controllers/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
         if (($model = Admin::findOne($id)) !== null) {
             return $model;
         } else {
-            throw new NotFoundHttpException (Yii::t('yuncms', 'The requested page does not exist.'));
+            throw new NotFoundHttpException(Yii::t('yuncms', 'The requested page does not exist.'));
         }
     }
 }

src/widgets/BootstrapTypeAhead.php

Spacing +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
 
         $options = $this->clientOptions !== false && !empty($this->clientOptions) ? Json::encode($this->clientOptions) : 'null';
 
-        foreach($this->dataSets as $dataSet) {
-            if(empty($dataSet)) {
+        foreach ($this->dataSets as $dataSet) {
+            if (empty($dataSet)) {
                 continue;
             }
             $dataSets[] = Json::encode($dataSet);

src/helpers/RBACHelper.php

Spacing +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
             }
             return implode(' ', $result);
         }
-        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) {
+        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) {
             return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : '';
         }, $buttons);
     }

src/admin/views/menu/index.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
                     [
                         'attribute' => 'icon',
                         'value' => function($model) {
-                           return Html::icon($model->icon);
+                            return Html::icon($model->icon);
                         },
                         'format' => 'raw'
                     ],

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
                         'class' => 'yii\grid\ActionColumn',
                         'header' => Yii::t('yuncms', 'Operation'),
                         'template' => '{add} {view} {update} {delete}',
-                        'buttons' => ['add' => function ($url, $model, $key) {
+                        'buttons' => ['add' => function($url, $model, $key) {
                             return Html::a('<span class="fa fa-plus"></span>',
                                 Url::toRoute(['/admin/menu/create', 'parent' => $model->id]), [
                                     'title' => Yii::t('yuncms', 'Add subMenu'),