yuncms / framework

src/user/models/SettingsForm.php

Spacing +3 added lines, -3 removed lines

@@ -91,12 +91,12 @@ 
             'emailRequired' => ['email', 'required'],
             'emailTrim' => ['email', 'filter', 'filter' => 'trim'],
             'emailPattern' => ['email', 'email'],
-            'emailUsernameUnique' => [['email', 'username'], 'unique', 'when' => function ($model, $attribute) {
+            'emailUsernameUnique' => [['email', 'username'], 'unique', 'when' => function($model, $attribute) {
                 return $this->user->$attribute != $model->$attribute;
             }, 'targetClass' => User::class],
             'newPasswordLength' => ['new_password', 'string', 'min' => 6],
             'currentPasswordRequired' => ['current_password', 'required'],
-            'currentPasswordValidate' => ['current_password', function ($attr) {
+            'currentPasswordValidate' => ['current_password', function($attr) {
                 if (!PasswordHelper::validate($this->$attr, $this->user->password_hash)) {
                     $this->addError($attr, Yii::t('yuncms', 'Current password is not valid'));
                 }
@@ -140,7 +140,7 @@ 
             if ($this->email == $this->user->email && $this->user->unconfirmed_email != null) {
                 $this->user->unconfirmed_email = null;
             } elseif ($this->email != $this->user->email) {
-                switch (Yii::$app->settings->get('emailChangeStrategy','user')) {
+                switch (Yii::$app->settings->get('emailChangeStrategy', 'user')) {
                     case UserSettings::STRATEGY_INSECURE:
                         $this->insecureEmailChange();
                         break;

src/user/models/ResendForm.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
             'emailRequired' => ['email', 'required'],
             'emailPattern' => ['email', 'email'],
             'emailExist' => ['email', 'exist', 'targetClass' => User::class],
-            'emailConfirmed' => ['email', function () {
+            'emailConfirmed' => ['email', function() {
                 if ($this->user != null && $this->user->isEmailConfirmed) {
                     $this->addError('email', Yii::t('yuncms', 'This account has already been confirmed'));
                 }
@@ -88,7 +88,7 @@ 
         /** @var UserToken $token */
         $token = new UserToken(['user_id' => $this->user->id, 'type' => UserToken::TYPE_CONFIRMATION]);
         $token->save(false);
-        Yii::$app->sendMail($this->user->email,Yii::t('yuncms', 'Confirm account on {0}', Yii::$app->name),'user/confirmation',['user' => $this->user, 'token' => $token]);
+        Yii::$app->sendMail($this->user->email, Yii::t('yuncms', 'Confirm account on {0}', Yii::$app->name), 'user/confirmation', ['user' => $this->user, 'token' => $token]);
         Yii::$app->session->setFlash('info', Yii::t('yuncms', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.'));
         return true;
     }

src/user/models/RecoveryForm.php

Spacing +4 added lines, -4 removed lines

@@ -63,9 +63,9 @@ 
             'emailRequired' => ['email', 'required'],
             'emailPattern' => ['email', 'email'],
             'emailExist' => ['email', 'exist', 'targetClass' => User::class, 'message' => Yii::t('yuncms', 'There is no user with this email address')],
-            'emailUnconfirmed' => ['email', function ($attribute) {
+            'emailUnconfirmed' => ['email', function($attribute) {
                 $this->user = User::findByEmail($this->email);
-                if ($this->user !== null && Yii::$app->settings->get('enableConfirmation','user') && !$this->user->isEmailConfirmed) {
+                if ($this->user !== null && Yii::$app->settings->get('enableConfirmation', 'user') && !$this->user->isEmailConfirmed) {
                     $this->addError($attribute, Yii::t('yuncms', 'You need to confirm your email address.'));
                 }
             }],
@@ -83,9 +83,9 @@ 
     {
         if ($this->validate()) {
             /** @var UserToken $token */
-            $token = new UserToken([ 'user_id' => $this->user->id, 'type' => UserToken::TYPE_RECOVERY]);
+            $token = new UserToken(['user_id' => $this->user->id, 'type' => UserToken::TYPE_RECOVERY]);
             $token->save(false);
-            Yii::$app->sendMail($this->user->email,Yii::t('yuncms', 'Complete password reset on {0}', Yii::$app->name),'user/recovery',['user' => $this->user, 'token' => $token]);
+            Yii::$app->sendMail($this->user->email, Yii::t('yuncms', 'Complete password reset on {0}', Yii::$app->name), 'user/recovery', ['user' => $this->user, 'token' => $token]);
             Yii::$app->session->setFlash('info', Yii::t('yuncms', 'An email has been sent with instructions for resetting your password'));
             return true;
         }

src/user/migrations/m180223_102826Create_user_profile_table.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
             'location' => $this->string()->comment('Location'),
             'address' => $this->string()->comment('Address'),
             'website' => $this->string()->comment('Website'),
-            'timezone' => $this->string(100)->comment('Timezone'),//默认格林威治时间
+            'timezone' => $this->string(100)->comment('Timezone'), //默认格林威治时间
             'birthday' => $this->string(15)->comment('Birthday'),
             'current' => $this->smallInteger(1)->comment('Current'),
             'qq' => $this->string(11)->comment('QQ'),

src/db/jobs/CreateActiveRecordJob.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     {
         /** @var ActiveRecord $class */
         $class = $this->modelClass;
-        $class::create($this->attributes,$this->runValidation);
+        $class::create($this->attributes, $this->runValidation);
     }
 
     /**

src/user/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         if ($app->hasModule('user') && ($module = $app->getModule('user')) instanceof Module) {
             //监听用户活动时间
             /** @var \yii\web\UserEvent $event */
-            $app->on(Application::EVENT_AFTER_REQUEST, function ($event) use ($app) {
+            $app->on(Application::EVENT_AFTER_REQUEST, function($event) use ($app) {
                 if (!$app->user->isGuest && Yii::$app->has('queue')) {
                     $user = UserExtra::findOne(['user_id' => $app->user->id]);
                     $user->updateAttributesAsync(['last_visit' => time()]);
@@ -39,7 +39,7 @@ 
 
             //监听用户登录事件
             /** @var \yii\web\UserEvent $event */
-            $app->user->on(User::EVENT_AFTER_LOGIN, function ($event) use ($app) {
+            $app->user->on(User::EVENT_AFTER_LOGIN, function($event) use ($app) {
                 //记录最后登录时间记录最后登录IP记录登录次数
                 $user = UserExtra::findOne(['user_id' => $app->user->id]);
                 $user->updateAttributesAsync(['login_at' => time(), 'login_ip' => Yii::$app->request->userIP]);

src/gii/generators/model/model.php

Spacing +14 added lines, -14 removed lines

@@ -21,19 +21,19 @@ 
 use Yii;
 use <?= $generator->baseClass?>;
 use yii\db\Connection;
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
 use yii\helpers\Inflector;
 <?php endif; ?>
 
 use yii\caching\DbDependency;
 use yii\caching\ChainedDependency;
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 use yii\behaviors\TimestampBehavior;
 <?php endif; ?>
-<?php if(isset($labels['user_id'])): ?>
+<?php if (isset($labels['user_id'])): ?>
 use yii\behaviors\BlameableBehavior;
 <?php endif; ?>
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
 use yii\behaviors\AttributeBehavior;
 <?php endif; ?>
 use yuncms\helpers\DateHelper;
@@ -53,18 +53,18 @@ 
 <?php endif; ?>
  *
  * @property-read boolean $isAuthor 是否是作者
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
  * @property-read boolean $isDraft 是否草稿
  * @property-read boolean $isPublished 是否发布
 <?php endif; ?>
  */
-class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') ?><?php if(isset($labels['status'])): ?> implements ScanInterface<?php endif; ?>
+class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') ?><?php if (isset($labels['status'])): ?> implements ScanInterface<?php endif; ?>
 {
 
     //场景定义
     const SCENARIO_CREATE = 'create';//创建
     const SCENARIO_UPDATE = 'update';//更新
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
     //状态定义
     const STATUS_DRAFT = 0b0;//草稿
     const STATUS_REVIEW = 0b1;//待审核
@@ -97,7 +97,7 @@ 
         $behaviors['timestamp'] = [
             'class' => TimestampBehavior::className()
         ];
-<?php elseif(isset($labels['created_at'])): ?>
+<?php elseif (isset($labels['created_at'])): ?>
         $behaviors['timestamp'] = [
             'class' => TimestampBehavior::className(),
             'attributes' => [
@@ -105,7 +105,7 @@ 
             ],
         ];
 <?php endif; ?>
-<?php if(isset($labels['user_id'])): ?>
+<?php if (isset($labels['user_id'])): ?>
         $behaviors['user'] = [
             'class' => BlameableBehavior::className(),
             'attributes' => [
@@ -113,7 +113,7 @@ 
             ],
         ];
 <?php endif; ?>
-<?php if(isset($labels['slug'])): ?>
+<?php if (isset($labels['slug'])): ?>
         $behaviors['slug'] = [
             'class' => AttributeBehavior::className(),
             'attributes' => [
@@ -124,7 +124,7 @@ 
             }
         ];
 <?php endif; ?>
-<?php if(isset($labels['uuid'])): ?>
+<?php if (isset($labels['uuid'])): ?>
         $behaviors['uuid'] = [
             'class' => AttributeBehavior::className(),
             'attributes' => [
@@ -166,7 +166,7 @@ 
      */
     public function rules()
     {
-        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if(isset($labels['status'])): ?>// status rule
+        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if (isset($labels['status'])): ?>// status rule
             ['status', 'default', 'value' => self::STATUS_REVIEW],
             ['status', 'in', 'range' => [self::STATUS_DRAFT, self::STATUS_REVIEW, self::STATUS_REJECTED, self::STATUS_PUBLISHED]],<?php endif; ?>
         ];
@@ -215,7 +215,7 @@ 
     {
         return $this->user_id == Yii::$app->user->id;
     }
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
     /**
      * 是否草稿状态
      * @return bool
@@ -396,7 +396,7 @@ 
         ]));
         return $total;
     }
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 
     /**
      * 获取模型今日新增总数

src/gii/generators/model/query.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     {
         return parent::one($db);
     }
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 
     /**
      * 热门模型

src/gii/generators/crud/controller.php

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
 use <?= ltrim($generator->modelClass, '\\') ?>;
 <?php if (!empty($generator->searchModelClass)): ?>
 use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
-<?php else: ?>
+<?php else : ?>
 use yii\data\ActiveDataProvider;
 <?php endif; ?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
@@ -77,7 +77,7 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);
@@ -114,7 +114,7 @@ 
             return ActiveForm::validate($model);
         }
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Create success.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Create success.'); ?>);
             return $this->redirect(['view', <?= $urlParams ?>]);
         } else {
             return $this->render('create', [
@@ -137,7 +137,7 @@ 
             return ActiveForm::validate($model);
         }
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Update success.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Update success.'); ?>);
             return $this->redirect(['view', <?= $urlParams ?>]);
         } else {
             return $this->render('update', [
@@ -155,7 +155,7 @@ 
     public function actionDelete(<?= $actionParams ?>)
     {
         $this->findModel(<?= $actionParams ?>)->delete();
-        Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.');?>);
+        Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.'); ?>);
         return $this->redirect(['index']);
     }
      /**
@@ -170,9 +170,9 @@ 
                 $model = $this->findModel($id);
                 $model->delete();
             }
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.'); ?>);
         } else {
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete failed.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete failed.'); ?>);
         }
         return $this->redirect(['index']);
     }

Braces +10 added lines, -4 removed lines

@@ -36,9 +36,12 @@ 
 use <?= ltrim($generator->modelClass, '\\') ?>;
 <?php if (!empty($generator->searchModelClass)): ?>
 use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
-<?php else: ?>
+<?php else {
+    : ?>
 use yii\data\ActiveDataProvider;
-<?php endif; ?>
+<?php endif;
+}
+?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
 use yuncms\web\Response;
 
@@ -77,7 +80,8 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else {
+    : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);
@@ -85,7 +89,9 @@ 
         return $this->render('index', [
             'dataProvider' => $dataProvider,
         ]);
-<?php endif; ?>
+<?php endif;
+}
+?>
     }
 
     /**