yuncms / framework

src/models/User.php

Indentation -1 removed lines

@@ -40,7 +40,6 @@
  * @property-read boolean $isBlocked 账户是否锁定
  * @property-read bool $isMobileConfirmed 是否已经手机激活
  * @property-read bool $isEmailConfirmed 是否已经邮箱激活
-
  *
  */
 class User extends ActiveRecord implements IdentityInterface, RateLimitInterface, NotifiableInterface

src/user/models/User.php

Spacing +11 added lines, -11 removed lines

@@ -41,13 +41,13 @@ 
 class User extends \yuncms\models\User
 {
     //场景定义
-    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';
 
     //头像
@@ -70,7 +70,7 @@ 
     public function behaviors()
     {
         $behaviors = parent::behaviors();
-        return ArrayHelper::merge($behaviors,[
+        return ArrayHelper::merge($behaviors, [
             'taggable' => [
                 'class' => TaggableBehavior::class,
                 'tagValuesAsArray' => true,
@@ -93,8 +93,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'], //只修改密码
         ]);
     }
 
@@ -104,7 +104,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/models/UserProfile.php

Spacing +8 added lines, -8 removed lines

@@ -52,13 +52,13 @@ 
     const GENDER_FEMALE = 0b10;
 
     //当前状态
-    const CURRENT_OTHER = 0b0;//其他
-    const CURRENT_WORK = 0b1;//正常工作
-    const CURRENT_FREELANCE = 0b10;//自由职业者
-    const CURRENT_START = 0b11;//创业
-    const CURRENT_OUTSOURCE = 0b100;//外包
-    const CURRENT_JOB = 0b101;//求职
-    const CURRENT_STUDENT = 0b110;//学生
+    const CURRENT_OTHER = 0b0; //其他
+    const CURRENT_WORK = 0b1; //正常工作
+    const CURRENT_FREELANCE = 0b10; //自由职业者
+    const CURRENT_START = 0b11; //创业
+    const CURRENT_OUTSOURCE = 0b100; //外包
+    const CURRENT_JOB = 0b101; //求职
+    const CURRENT_STUDENT = 0b110; //学生
 
     /**
      * @inheritdoc
@@ -100,7 +100,7 @@ 
             [
                 'mobile',
                 'yuncms\core\validators\MobileValidator',
-                'when' => function ($model) {
+                'when' => function($model) {
                     return $model->country == 'China';
                 }
             ],