Completed
Push — master ( 989fd4...c30846 )
by Xu
73:44 queued 33:19
created
src/rest/views/auth/authorize.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
 <div class="modal-body">
43 43
     <div class="row">
44 44
         <div class="col-sm-12 col-md-8 col-lg-8 col-md-offset-2 col-lg-offset-2">
45
-            <?= $form->field($model, 'login', ['inputOptions' => ['autofocus' => 'autofocus',]]) ?>
45
+            <?= $form->field($model, 'login', ['inputOptions' => ['autofocus' => 'autofocus', ]]) ?>
46 46
             <?= $form->field($model, 'password')->passwordInput() ?>
47 47
             <?= Html::submitButton(Yii::t('yuncms', 'Login'), ['class' => 'btn btn-primary btn-block  mt-10']) ?>
48 48
         </div>
Please login to merge, or discard this patch.
src/admin/views/layouts/_navigation_header.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 use yii\helpers\Url;
3 3
 use yuncms\helpers\Html;
4
- ?>
4
+    ?>
5 5
 <li class="nav-header">
6 6
     <div class="logo-element-main">
7 7
         YUNCMS
Please login to merge, or discard this patch.
src/widgets/MultipleUpload.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -161,8 +161,9 @@
 block discarded – undo
161 161
             return ['url' => $attachment, 'path' => $attachment,];
162 162
         } else if (is_array($attachment)) {
163 163
             return $attachment;
164
-        } else if ($attachment instanceof Arrayable)
165
-            return $attachment->toArray();
164
+        } else if ($attachment instanceof Arrayable) {
165
+                    return $attachment->toArray();
166
+        }
166 167
         return [];
167 168
     }
168 169
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         if (empty($this->url)) {
96 96
             if ($this->onlyImage === false) {
97 97
                 $this->url = $this->multiple ? ['/upload/files-upload'] : ['/upload/file-upload'];
98
-                $fileAllowFiles = Yii::$app->getSettings()->get('fileAllowFiles','attachment');
98
+                $fileAllowFiles = Yii::$app->getSettings()->get('fileAllowFiles', 'attachment');
99 99
                 $regExp = '/(\.|\/)(';
100 100
                 $extensions = explode(',', $fileAllowFiles);
101 101
                 foreach ($extensions as $extension) {
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
         }
131 131
         $this->fileInputName = md5($this->name);
132 132
         if (!array_key_exists('file_param', $this->url)) {
133
-            $this->url['file_param'] = $this->fileInputName;//服务器需要通过这个判断是哪一个input name上传的
133
+            $this->url['file_param'] = $this->fileInputName; //服务器需要通过这个判断是哪一个input name上传的
134 134
         }
135 135
 
136 136
         $this->clientOptions = ArrayHelper::merge($this->clientOptions, [
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     protected function formatAttachment($attachment)
161 161
     {
162 162
         if (!empty($attachment) && is_string($attachment)) {
163
-            return ['url' => $attachment, 'path' => $attachment,];
163
+            return ['url' => $attachment, 'path' => $attachment, ];
164 164
         } else if (is_array($attachment)) {
165 165
             return $attachment;
166 166
         } else if ($attachment instanceof Arrayable)
Please login to merge, or discard this patch.
src/helpers/UploadHelper.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      */
47 47
     public static function getImageMaxSizeByte()
48 48
     {
49
-        $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize','attachment');
49
+        $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize', 'attachment');
50 50
         return self::getMaxUploadByte($imageMaxSize);
51 51
     }
52 52
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      */
57 57
     public static function getVideoMaxSizeByte()
58 58
     {
59
-        $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize','attachment');
59
+        $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize', 'attachment');
60 60
         return self::getMaxUploadByte($videoMaxSize);
61 61
     }
62 62
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      */
67 67
     public static function getFileMaxSizeByte()
68 68
     {
69
-        $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize','attachment');
69
+        $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize', 'attachment');
70 70
         return self::getMaxUploadByte($fileMaxSize);
71 71
     }
72 72
 
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
      */
77 77
     public static function getAcceptImageMimeTypes()
78 78
     {
79
-        $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles','attachment');
79
+        $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles', 'attachment');
80 80
         $extensions = explode(',', $imageAllowFiles);
81
-        array_walk($extensions, function (&$value) {
81
+        array_walk($extensions, function(&$value) {
82 82
             $value = 'image/' . $value;
83 83
         });
84 84
         return $extensions;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     public static function normalizeExtension($extensions)
94 94
     {
95 95
         $extensions = explode(',', $extensions);
96
-        array_walk($extensions, function (&$value) {
96
+        array_walk($extensions, function(&$value) {
97 97
             $value = '.' . $value;
98 98
         });
99 99
         return $extensions;
Please login to merge, or discard this patch.
src/models/Attachment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
                 'attributes' => [
73 73
                     ActiveRecord::EVENT_BEFORE_INSERT => 'user_id'
74 74
                 ],
75
-                'value' => function () {
75
+                'value' => function() {
76 76
                     return Yii::$app->user->id;
77 77
                 }
78 78
             ],
Please login to merge, or discard this patch.
config/console.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 $config = [
4 4
     'components' => [
5 5
         'cache' => [
6
-            'keyPrefix' => 'rest',       //前缀
6
+            'keyPrefix' => 'rest', //前缀
7 7
         ],
8 8
         'request' => [
9 9
             'class' => yuncms\console\Request::class,
Please login to merge, or discard this patch.
src/gii/generators/model/model.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
21 21
 use Yii;
22 22
 use <?= $generator->baseClass?>;
23 23
 use yii\db\Connection;
24
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
24
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
25 25
 use yii\helpers\Inflector;
26 26
 <?php endif; ?>
27 27
 
28 28
 use yii\caching\DbDependency;
29 29
 use yii\caching\ChainedDependency;
30
-<?php if(isset($labels['created_at'])): ?>
30
+<?php if (isset($labels['created_at'])): ?>
31 31
 use yii\behaviors\TimestampBehavior;
32 32
 <?php endif; ?>
33
-<?php if(isset($labels['user_id'])): ?>
33
+<?php if (isset($labels['user_id'])): ?>
34 34
 use yii\behaviors\BlameableBehavior;
35 35
 <?php endif; ?>
36
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
36
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
37 37
 use yii\behaviors\AttributeBehavior;
38 38
 <?php endif; ?>
39 39
 use yuncms\helpers\DateHelper;
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 <?php endif; ?>
54 54
  *
55 55
  * @property-read boolean $isAuthor 是否是作者
56
-<?php if(isset($labels['status'])): ?>
56
+<?php if (isset($labels['status'])): ?>
57 57
  * @property-read boolean $isDraft 是否草稿
58 58
  * @property-read boolean $isPublished 是否发布
59 59
 <?php endif; ?>
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
     //场景定义
65 65
     const SCENARIO_CREATE = 'create';//创建
66 66
     const SCENARIO_UPDATE = 'update';//更新
67
-<?php if(isset($labels['status'])): ?>
67
+<?php if (isset($labels['status'])): ?>
68 68
     //状态定义
69 69
     const STATUS_DRAFT = 0b0;//草稿
70 70
     const STATUS_REVIEW = 0b1;//待审核
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $behaviors['timestamp'] = [
98 98
             'class' => TimestampBehavior::className()
99 99
         ];
100
-<?php elseif(isset($labels['created_at'])): ?>
100
+<?php elseif (isset($labels['created_at'])): ?>
101 101
         $behaviors['timestamp'] = [
102 102
             'class' => TimestampBehavior::className(),
103 103
             'attributes' => [
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
             ],
106 106
         ];
107 107
 <?php endif; ?>
108
-<?php if(isset($labels['user_id'])): ?>
108
+<?php if (isset($labels['user_id'])): ?>
109 109
         $behaviors['user'] = [
110 110
             'class' => BlameableBehavior::className(),
111 111
             'attributes' => [
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
             ],
114 114
         ];
115 115
 <?php endif; ?>
116
-<?php if(isset($labels['slug'])): ?>
116
+<?php if (isset($labels['slug'])): ?>
117 117
         $behaviors['slug'] = [
118 118
             'class' => AttributeBehavior::className(),
119 119
             'attributes' => [
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
             }
125 125
         ];
126 126
 <?php endif; ?>
127
-<?php if(isset($labels['uuid'])): ?>
127
+<?php if (isset($labels['uuid'])): ?>
128 128
         $behaviors['uuid'] = [
129 129
             'class' => AttributeBehavior::className(),
130 130
             'attributes' => [
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
      */
167 167
     public function rules()
168 168
     {
169
-        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if(isset($labels['status'])): ?>// status rule
169
+        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if (isset($labels['status'])): ?>// status rule
170 170
             ['status', 'default', 'value' => self::STATUS_REVIEW],
171 171
             ['status', 'in', 'range' => [self::STATUS_DRAFT, self::STATUS_REVIEW, self::STATUS_REJECTED, self::STATUS_PUBLISHED]],<?php endif; ?>
172 172
         ];
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     {
216 216
         return $this->user_id == Yii::$app->user->id;
217 217
     }
218
-<?php if(isset($labels['status'])): ?>
218
+<?php if (isset($labels['status'])): ?>
219 219
     /**
220 220
      * 是否草稿状态
221 221
      * @return bool
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
         ]));
365 365
         return $total;
366 366
     }
367
-<?php if(isset($labels['created_at'])): ?>
367
+<?php if (isset($labels['created_at'])): ?>
368 368
 
369 369
     /**
370 370
      * 获取模型今日新增总数
Please login to merge, or discard this patch.
src/user/models/UserAuthItem.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
         return [
69 69
             [['ruleName'], 'checkRule'],
70 70
             [['name', 'type'], 'required'],
71
-            [['name'], 'checkUnique', 'when' => function () {
71
+            [['name'], 'checkUnique', 'when' => function() {
72 72
                 return $this->isNewRecord || ($this->_item->name != $this->name);
73 73
             }],
74 74
             [['type'], 'integer'],
Please login to merge, or discard this patch.
src/admin/UserItemController.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
         $model = new UserAuthItem(null);
82 82
         $model->type = $this->type;
83 83
         if ($model->load(Yii::$app->getRequest()->post()) && $model->save()) {
84
-            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Create success.'));
84
+            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Create success.'));
85 85
             return $this->redirect(['view', 'id' => $model->name]);
86 86
         } else {
87 87
             return $this->render('create', ['model' => $model]);
Please login to merge, or discard this patch.