Completed
Push — master ( bc534a...767873 )
by Xu
68:21 queued 27:47
created
src/admin/views/user-item/_form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 unset($rules[RouteRule::RULE_NAME]);
16 16
 ?>
17 17
 
18
-<?php $form = ActiveForm::begin(['layout' => 'horizontal',]); ?>
18
+<?php $form = ActiveForm::begin(['layout' => 'horizontal', ]); ?>
19 19
 <?= $form->field($model, 'name')->textInput(['maxlength' => 64]) ?>
20 20
 <div class="hr-line-dashed"></div>
21 21
 <?= $form->field($model, 'description')->textarea(['rows' => 2]) ?>
Please login to merge, or discard this patch.
src/admin/views/user-item/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
                         'attribute' => 'description',
82 82
                         'label' => Yii::t('yuncms', 'Role Description'),
83 83
                     ],
84
-                    ['class' => 'yuncms\grid\ActionColumn',],
84
+                    ['class' => 'yuncms\grid\ActionColumn', ],
85 85
                 ],
86 86
             ])
87 87
             ?>
Please login to merge, or discard this patch.
src/admin/controllers/UserRuleController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -73,10 +73,10 @@  discard block
 block discarded – undo
73 73
         $model = new UserBizRule(null);
74 74
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
75 75
             UserRBACHelper::invalidate();
76
-            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Create success.'));
76
+            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Create success.'));
77 77
             return $this->redirect(['view', 'id' => $model->name]);
78 78
         } else {
79
-            return $this->render('create', ['model' => $model,]);
79
+            return $this->render('create', ['model' => $model, ]);
80 80
         }
81 81
     }
82 82
 
@@ -93,11 +93,11 @@  discard block
 block discarded – undo
93 93
         $model = $this->findModel($id);
94 94
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
95 95
             UserRBACHelper::invalidate();
96
-            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Update success.'));
96
+            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Update success.'));
97 97
             return $this->redirect(['view', 'id' => $model->name]);
98 98
         }
99 99
 
100
-        return $this->render('update', ['model' => $model,]);
100
+        return $this->render('update', ['model' => $model, ]);
101 101
     }
102 102
 
103 103
     /**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $model = $this->findModel($id);
114 114
         Yii::$app->authManager->remove($model->item);
115 115
         UserRBACHelper::invalidate();
116
-        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Delete success.'));
116
+        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Delete success.'));
117 117
         return $this->redirect(['index']);
118 118
     }
119 119
 
Please login to merge, or discard this patch.
src/admin/views/user/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 //                    ],
75 75
                     [
76 76
                         'attribute' => 'registration_ip',
77
-                        'value' => function ($model) {
77
+                        'value' => function($model) {
78 78
                             return $model->registration_ip == null
79 79
                                 ? '<span class="not-set">' . Yii::t('yii', '(not set)') . '</span>'
80 80
                                 : $model->registration_ip;
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
                     ],
97 97
                     [
98 98
                         'header' => Yii::t('yuncms', 'Confirmation'),
99
-                        'value' => function ($model) {
99
+                        'value' => function($model) {
100 100
                             if ($model->isEmailConfirmed) {
101 101
                                 return '<div class="text-center"><span class="text-success">' . Yii::t('yuncms', 'Confirmed') . '</span></div>';
102 102
                             } else {
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
                     ],
113 113
                     [
114 114
                         'header' => Yii::t('yuncms', 'Block status'),
115
-                        'value' => function ($model) {
115
+                        'value' => function($model) {
116 116
                             if ($model->isBlocked) {
117 117
                                 return Html::a(Yii::t('yuncms', 'Unblock'), ['block', 'id' => $model->id], [
118 118
                                     'class' => 'btn btn-xs btn-success btn-block',
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                     [
133 133
                         'class' => 'yuncms\grid\ActionColumn',
134 134
                         'template' => '{assignment} {view} {update} {delete}',
135
-                        'buttons' => ['assignment' => function ($url, $model, $key) {
135
+                        'buttons' => ['assignment' => function($url, $model, $key) {
136 136
                             return Html::a('<span class="glyphicon glyphicon-dashboard"></span>',
137 137
                                 Url::toRoute(['user-assignment/view', 'id' => $model->id]), [
138 138
                                     'title' => Yii::t('yuncms', 'Assignment'),
Please login to merge, or discard this patch.
config/web.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
     ],
8 8
     'components' => [
9 9
         'cache' => [
10
-            'keyPrefix' => 'web',       //前缀
10
+            'keyPrefix' => 'web', //前缀
11 11
         ],
12 12
         'authManager' => [
13 13
             'class' => yuncms\rbac\DbManager::class,
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
             'secureProtocolHeaders' => [
30 30
                 'X-Forwarded-Proto' => ['https'], // Common
31 31
                 'Front-End-Https' => ['on'], // Microsoft
32
-                'X-Client-Scheme' => ['https'],// Aliyun CDN
32
+                'X-Client-Scheme' => ['https'], // Aliyun CDN
33 33
                 'X-Client-Proto' => ['https'],
34 34
             ],
35 35
             'ipHeaders' => [
36
-                'X-Forwarded-For',// Common
36
+                'X-Forwarded-For', // Common
37 37
                 'X-Cluster-Client-IP',
38
-                'ALI-CDN-REAL-IP',// Aliyun CDN
38
+                'ALI-CDN-REAL-IP', // Aliyun CDN
39 39
                 'Client-IP',
40 40
                 'X-Forwarded',
41 41
                 'Forwarded-For',
Please login to merge, or discard this patch.
src/notifications/rest/controllers/NotificationController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
      */
71 71
     public function actionUnreadNotifications()
72 72
     {
73
-        $total = Notification::getDb()->cache(function ($db) {
73
+        $total = Notification::getDb()->cache(function($db) {
74 74
             return Notification::find()->where(['receiver_id' => Yii::$app->user->id, 'is_read' => false])->count();
75 75
         }, 60);
76 76
         return ['total' => $total];
Please login to merge, or discard this patch.
src/notifications/migrations/m180410_092555_create_notification_table.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -24,19 +24,19 @@
 block discarded – undo
24 24
         }
25 25
         // https://segmentfault.com/q/1010000000672529/a-1020000000679702
26 26
         $this->createTable($this->tableName, [
27
-            'id' => $this->bigPrimaryKey()->unsigned()->comment('Id'),//通知ID
28
-            'verb' => $this->string(32)->comment('Verb'),//活动图片
29
-            'template' => $this->string()->comment('Template'),//通知类型
30
-            'channel' => $this->string(64)->comment('Template'),//通知类型
31
-            'is_read' => $this->boolean()->defaultValue(false)->comment('Read'),//是否已读
32
-            'is_pending' => $this->boolean()->defaultValue(false)->comment('Pending'),//是否已经推送
33
-            'sender_id' => $this->integer()->unsigned()->comment('Sender Id'),//发送者ID
34
-            'sender_class' => $this->string()->comment('Sender Class'),//发送者模型
35
-            'receiver_id' => $this->unsignedInteger()->comment('Receiver Id'),//接收器
36
-            'entity_id' => $this->unsignedInteger()->comment('Entity'),//任务对象
37
-            'source_id' => $this->unsignedInteger()->comment('Source'),//原有任务对象
38
-            'target_id' => $this->unsignedInteger()->comment('Target'),//目标对象
39
-            'publish_at' => $this->integer()->unsigned()->notNull()->comment('Publish At'),//发送时间
27
+            'id' => $this->bigPrimaryKey()->unsigned()->comment('Id'), //通知ID
28
+            'verb' => $this->string(32)->comment('Verb'), //活动图片
29
+            'template' => $this->string()->comment('Template'), //通知类型
30
+            'channel' => $this->string(64)->comment('Template'), //通知类型
31
+            'is_read' => $this->boolean()->defaultValue(false)->comment('Read'), //是否已读
32
+            'is_pending' => $this->boolean()->defaultValue(false)->comment('Pending'), //是否已经推送
33
+            'sender_id' => $this->integer()->unsigned()->comment('Sender Id'), //发送者ID
34
+            'sender_class' => $this->string()->comment('Sender Class'), //发送者模型
35
+            'receiver_id' => $this->unsignedInteger()->comment('Receiver Id'), //接收器
36
+            'entity_id' => $this->unsignedInteger()->comment('Entity'), //任务对象
37
+            'source_id' => $this->unsignedInteger()->comment('Source'), //原有任务对象
38
+            'target_id' => $this->unsignedInteger()->comment('Target'), //目标对象
39
+            'publish_at' => $this->integer()->unsigned()->notNull()->comment('Publish At'), //发送时间
40 40
         ], $tableOptions);
41 41
 
42 42
         $this->createIndex('notification_index', $this->tableName, ['sender_id', 'sender_class']);
Please login to merge, or discard this patch.
src/redis/jobs/CreateActiveRecordJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
     {
43 43
         /** @var ActiveRecord $class */
44 44
         $class = $this->modelClass;
45
-        $class::create($this->attributes,$this->runValidation);
45
+        $class::create($this->attributes, $this->runValidation);
46 46
     }
47 47
 
48 48
     /**
Please login to merge, or discard this patch.
src/sphinx/jobs/CreateActiveRecordJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
     {
43 43
         /** @var ActiveRecord $class */
44 44
         $class = $this->modelClass;
45
-        $class::create($this->attributes,$this->runValidation);
45
+        $class::create($this->attributes, $this->runValidation);
46 46
     }
47 47
 
48 48
     /**
Please login to merge, or discard this patch.