Completed
Push — master ( ed0789...77b75e )
by Xu
99:03 queued 58:55
created
src/user/migrations/m180223_102734Create_user_table.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@
 block discarded – undo
30 30
             'unconfirmed_email' => $this->string(150)->comment('Unconfirmed Email'),
31 31
             'unconfirmed_mobile' => $this->string(11)->comment('Unconfirmed Mobile'),
32 32
             'registration_ip' => $this->string()->comment('Registration Ip'),
33
-            'identified' => $this->boolean()->defaultValue(false)->comment('Identified'),//是否经过实名认证
34
-            'balance' => $this->decimal(12, 2)->defaultValue(0),//可提现余额
35
-            'available_balance' => $this->decimal(12, 2)->defaultValue(0),//未结算余额
33
+            'identified' => $this->boolean()->defaultValue(false)->comment('Identified'), //是否经过实名认证
34
+            'balance' => $this->decimal(12, 2)->defaultValue(0), //可提现余额
35
+            'available_balance' => $this->decimal(12, 2)->defaultValue(0), //未结算余额
36 36
             'flags' => $this->integer()->defaultValue(0)->comment('Flags'),
37 37
             'email_confirmed_at' => $this->unixTimestamp()->comment('Email Confirmed At'),
38 38
             'mobile_confirmed_at' => $this->unixTimestamp()->comment('Mobile Confirmed At'),
Please login to merge, or discard this patch.
src/gii/generators/crud/views/update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
 /* @var $this yii\web\View */
20 20
 /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
21 21
 
22
-$this->title = <?= $generator->generateString('Update '.Inflector::camel2words(StringHelper::basename($generator->modelClass)))?> . ': ' . $model-><?= $generator->getNameAttribute() ?>;
22
+$this->title = <?= $generator->generateString('Update ' . Inflector::camel2words(StringHelper::basename($generator->modelClass)))?> . ': ' . $model-><?= $generator->getNameAttribute() ?>;
23 23
 $this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString('Manage ' . Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>, 'url' => ['index']];
24 24
 $this->params['breadcrumbs'][] = ['label' => $model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
25 25
 $this->params['breadcrumbs'][] = Yii::t('yuncms', 'Update');
Please login to merge, or discard this patch.
src/rest/controllers/PersonController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
             }
79 79
             return $model;
80 80
         } else {
81
-            throw new NotFoundHttpException ('User not found.');
81
+            throw new NotFoundHttpException('User not found.');
82 82
         }
83 83
     }
84 84
 
Please login to merge, or discard this patch.
src/user/controllers/SettingsController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                 'rules' => [
50 50
                     [
51 51
                         'allow' => true,
52
-                        'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect','follower-tag'],
52
+                        'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect', 'follower-tag'],
53 53
                         'roles' => ['@'],
54 54
                     ],
55 55
                 ],
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         Yii::$app->response->format = Response::FORMAT_JSON;
130 130
         $tagId = Yii::$app->request->post('tag_id', null);
131 131
         if (($tag = Tag::findOne($tagId)) == null) {
132
-            throw new NotFoundHttpException ();
132
+            throw new NotFoundHttpException();
133 133
         } else {
134 134
             /** @var \yuncms\user\models\User $user */
135 135
             $user = Yii::$app->user->identity;
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
     public function actionConfirm($id, $code)
158 158
     {
159 159
         $user = User::findOne($id);
160
-        if ($user === null || Yii::$app->settings->get('emailChangeStrategy','user') == UserSettings::STRATEGY_INSECURE) {
160
+        if ($user === null || Yii::$app->settings->get('emailChangeStrategy', 'user') == UserSettings::STRATEGY_INSECURE) {
161 161
             throw new NotFoundHttpException();
162 162
         }
163 163
         $user->attemptEmailChange($code);
Please login to merge, or discard this patch.
src/user/controllers/RegistrationController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
         if ($user->load(Yii::$app->request->post()) && $user->createUser()) {
130 130
             $account->connect($user);
131
-            Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor','user'));
131
+            Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor', 'user'));
132 132
             return $this->goBack();
133 133
         }
134 134
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
     public function actionConfirm($id, $code)
150 150
     {
151 151
         $user = User::findOne($id);
152
-        if ($user === null || Yii::$app->settings->get('enableConfirmation','user') == false) {
152
+        if ($user === null || Yii::$app->settings->get('enableConfirmation', 'user') == false) {
153 153
             return $this->goBack();
154 154
         }
155 155
         $user->attemptEmailConfirmation($code);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
      */
164 164
     public function actionResend()
165 165
     {
166
-        if (Yii::$app->settings->get('enableConfirmation','user') == false) {
166
+        if (Yii::$app->settings->get('enableConfirmation', 'user') == false) {
167 167
             return $this->goBack();
168 168
         }
169 169
         /** @var ResendForm $model */
Please login to merge, or discard this patch.
src/rest/models/User.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,17 +26,17 @@
 block discarded – undo
26 26
         return [
27 27
             'id',
28 28
             'nickname',
29
-            'faceUrl' => function () {
29
+            'faceUrl' => function() {
30 30
                 return $this->getAvatar(AvatarHelper::AVATAR_MIDDLE);
31 31
             },
32 32
             'identified',
33
-            "created_datetime" => function () {
33
+            "created_datetime" => function() {
34 34
                 return gmdate(DATE_ISO8601, $this->created_at);
35 35
             },
36
-            "updated_datetime" => function () {
36
+            "updated_datetime" => function() {
37 37
                 return gmdate(DATE_ISO8601, $this->updated_at);
38 38
             },
39
-            'blocked_datetime' => function () {
39
+            'blocked_datetime' => function() {
40 40
                 return gmdate(DATE_ISO8601, $this->blocked_at);
41 41
             }
42 42
         ];
Please login to merge, or discard this patch.