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/models/User.php

Spacing +11 added lines, -11 removed lines

@@ -49,13 +49,13 @@ 
     const AFTER_REGISTER = 'afterRegister';
 
     //场景定义
-    const SCENARIO_CREATE = 'create';//后台或控制台创建用户
-    const SCENARIO_UPDATE = 'update';//后台或控制台修改用户
-    const SCENARIO_REGISTER = 'basic_create';//邮箱注册
-    const SCENARIO_EMAIL_REGISTER = 'email_create';//邮箱注册
-    const SCENARIO_MOBILE_REGISTER = 'mobile_create';//手机号注册
-    const SCENARIO_SETTINGS = 'settings';//更新
-    const SCENARIO_CONNECT = 'connect';//账户链接或自动注册新用户
+    const SCENARIO_CREATE = 'create'; //后台或控制台创建用户
+    const SCENARIO_UPDATE = 'update'; //后台或控制台修改用户
+    const SCENARIO_REGISTER = 'basic_create'; //邮箱注册
+    const SCENARIO_EMAIL_REGISTER = 'email_create'; //邮箱注册
+    const SCENARIO_MOBILE_REGISTER = 'mobile_create'; //手机号注册
+    const SCENARIO_SETTINGS = 'settings'; //更新
+    const SCENARIO_CONNECT = 'connect'; //账户链接或自动注册新用户
     const SCENARIO_PASSWORD = 'password';
 
     //头像
@@ -78,7 +78,7 @@ 
     public function behaviors()
     {
         $behaviors = parent::behaviors();
-        return ArrayHelper::merge($behaviors,[
+        return ArrayHelper::merge($behaviors, [
             'taggable' => [
                 'class' => TaggableBehavior::class,
                 'tagValuesAsArray' => true,
@@ -101,8 +101,8 @@ 
             static::SCENARIO_EMAIL_REGISTER => ['nickname', 'email', 'password'],
             static::SCENARIO_MOBILE_REGISTER => ['mobile', 'password'],
             static::SCENARIO_SETTINGS => ['username', 'email', 'password'],
-            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'],//链接账户密码可以为空邮箱可以为空
-            static::SCENARIO_PASSWORD => ['password'],//只修改密码
+            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'], //链接账户密码可以为空邮箱可以为空
+            static::SCENARIO_PASSWORD => ['password'], //只修改密码
         ]);
     }
 
@@ -112,7 +112,7 @@ 
      */
     public function rules()
     {
-        return ArrayHelper::merge(parent::rules(),[
+        return ArrayHelper::merge(parent::rules(), [
             // nickname rules
             'nicknameRequired' => ['nickname', 'required', 'on' => [self::SCENARIO_EMAIL_REGISTER, self::SCENARIO_CONNECT]],
             // email rules

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]);