yuncms / framework

src/helpers/UploadHelper.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
      */
     public static function getImageMaxSizeByte()
     {
-        $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize','attachment');
+        $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize', 'attachment');
         return self::getMaxUploadByte($imageMaxSize);
     }
 
@@ -56,7 +56,7 @@ 
      */
     public static function getVideoMaxSizeByte()
     {
-        $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize','attachment');
+        $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize', 'attachment');
         return self::getMaxUploadByte($videoMaxSize);
     }
 
@@ -66,7 +66,7 @@ 
      */
     public static function getFileMaxSizeByte()
     {
-        $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize','attachment');
+        $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize', 'attachment');
         return self::getMaxUploadByte($fileMaxSize);
     }
 
@@ -76,9 +76,9 @@ 
      */
     public static function getAcceptImageMimeTypes()
     {
-        $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles','attachment');
+        $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles', 'attachment');
         $extensions = explode(',', $imageAllowFiles);
-        array_walk($extensions, function (&$value) {
+        array_walk($extensions, function(&$value) {
             $value = 'image/' . $value;
         });
         return $extensions;
@@ -93,7 +93,7 @@ 
     public static function normalizeExtension($extensions)
     {
         $extensions = explode(',', $extensions);
-        array_walk($extensions, function (&$value) {
+        array_walk($extensions, function(&$value) {
             $value = '.' . $value;
         });
         return $extensions;

src/user/models/User.php

Spacing +9 added lines, -9 removed lines

@@ -48,13 +48,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';
 
     /**
@@ -95,8 +95,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'], //只修改密码
         ]);
     }
 

src/payment/Channel.php

Spacing +15 added lines, -15 removed lines

@@ -26,23 +26,23 @@
     const DEFAULT_TIMEOUT = 5.0;
 
     //交易类型
-    const TRADE_TYPE_QR_CODE = 'qr-code';//扫码支付
-    const TRADE_TYPE_JS_API = 'js-api';//应用内JS API,如微信
-    const TRADE_TYPE_APP = 'app';//app支付
-    const TRADE_TYPE_WAP = 'wap';//H5支付
-    const TRADE_TYPE_WEB = 'web';//PC支付
-    const TRADE_TYPE_POS = 'pos';//刷卡支付
+    const TRADE_TYPE_QR_CODE = 'qr-code'; //扫码支付
+    const TRADE_TYPE_JS_API = 'js-api'; //应用内JS API,如微信
+    const TRADE_TYPE_APP = 'app'; //app支付
+    const TRADE_TYPE_WAP = 'wap'; //H5支付
+    const TRADE_TYPE_WEB = 'web'; //PC支付
+    const TRADE_TYPE_POS = 'pos'; //刷卡支付
 
     //交易状态
-    const STATE_NOT_PAY = 0b0;//未支付
-    const STATE_SUCCESS = 0b1;//支付成功
-    const STATE_FAILED = 0b10;//支付失败
-    const STATE_CLOSED = 0b100;//已关闭
-    const STATE_REVOKED = 0b101;//已撤销
-    const STATE_ERROR = 0b110;//错误
-    const STATE_REFUND = 0b111;//转入退款
-    const STATE_REFUND_SUCCESS = 0b11;//转入退款
-    const STATE_REFUND_FAILED = 0b11;//转入退款
+    const STATE_NOT_PAY = 0b0; //未支付
+    const STATE_SUCCESS = 0b1; //支付成功
+    const STATE_FAILED = 0b10; //支付失败
+    const STATE_CLOSED = 0b100; //已关闭
+    const STATE_REVOKED = 0b101; //已撤销
+    const STATE_ERROR = 0b110; //错误
+    const STATE_REFUND = 0b111; //转入退款
+    const STATE_REFUND_SUCCESS = 0b11; //转入退款
+    const STATE_REFUND_FAILED = 0b11; //转入退款
 
     /**
      * @var float 连接超时时间

src/payment/channels/WeChat.php

Spacing +14 added lines, -14 removed lines

@@ -71,11 +71,11 @@ 
      * @var array 交易类型和Trade映射
      */
     public $tradeTypeMap = [
-        self::TRADE_TYPE_QR_CODE => 'NATIVE',//WEB 原生扫码支付
-        self::TRADE_TYPE_JS_API => 'JSAPI',//应用内JS API,如微信
-        self::TRADE_TYPE_APP => 'APP',//app支付
-        self::TRADE_TYPE_WAP => 'MWEB',//H5支付
-        self::TRADE_TYPE_POS => 'MICROPAY',//刷卡支付
+        self::TRADE_TYPE_QR_CODE => 'NATIVE', //WEB 原生扫码支付
+        self::TRADE_TYPE_JS_API => 'JSAPI', //应用内JS API,如微信
+        self::TRADE_TYPE_APP => 'APP', //app支付
+        self::TRADE_TYPE_WAP => 'MWEB', //H5支付
+        self::TRADE_TYPE_POS => 'MICROPAY', //刷卡支付
         self::TRADE_TYPE_WEB => 'NATIVE'//PC支付
     ];
 
@@ -90,19 +90,19 @@ 
             trigger_error('need openssl support sha256', E_USER_ERROR);
         }
         if (empty ($this->appId)) {
-            throw new InvalidConfigException ('The "appId" property must be set.');
+            throw new InvalidConfigException('The "appId" property must be set.');
         }
         if (empty ($this->apiKey)) {
-            throw new InvalidConfigException ('The "apiKey" property must be set.');
+            throw new InvalidConfigException('The "apiKey" property must be set.');
         }
         if (empty ($this->mchId)) {
-            throw new InvalidConfigException ('The "mchId" property must be set.');
+            throw new InvalidConfigException('The "mchId" property must be set.');
         }
         if (empty ($this->privateKey)) {
-            throw new InvalidConfigException ('The "privateKey" property must be set.');
+            throw new InvalidConfigException('The "privateKey" property must be set.');
         }
         if (empty ($this->publicKey)) {
-            throw new InvalidConfigException ('The "publicKey" property must be set.');
+            throw new InvalidConfigException('The "publicKey" property must be set.');
         }
         $this->initPrivateKey();
         $this->initPublicKey();
@@ -115,7 +115,7 @@ 
     protected function initPrivateKey()
     {
         $privateKey = Yii::getAlias($this->privateKey);
-        if (!is_file ($privateKey)) {
+        if (!is_file($privateKey)) {
             $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" .
                 wordwrap($this->privateKey, 64, "\n", true) .
                 "\n-----END RSA PRIVATE KEY-----";
@@ -180,7 +180,7 @@ 
                 $weParams = $trade->user->socialAccounts['wechat']->getDecodedData();
                 $data['openid'] = $weParams['openid'];
             } else {
-                throw new PaymentException ('Non-WeChat authorized login.');
+                throw new PaymentException('Non-WeChat authorized login.');
             }
         }
         $response = $this->post('pay/unifiedorder', $data)->send();
@@ -192,7 +192,7 @@ 
                 throw new PaymentException($response->data['return_msg']);
             }
         } else {
-            throw new Exception ('Http request failed.');
+            throw new Exception('Http request failed.');
         }
     }
 
@@ -256,7 +256,7 @@ 
         } elseif ($this->signType == self::SIGNATURE_METHOD_SHA256) {
             $sign = hash_hmac('sha256', $this->getSignatureContent($params), $this->apiKey);
         } else {
-            throw new InvalidConfigException ('This encryption is not supported');
+            throw new InvalidConfigException('This encryption is not supported');
         }
         return strtoupper($sign);
     }

src/payment/channels/Alipay.php

Spacing +4 added lines, -4 removed lines

@@ -63,13 +63,13 @@ 
             trigger_error('need openssl support sha256', E_USER_ERROR);
         }
         if (empty ($this->appId)) {
-            throw new InvalidConfigException ('The "appId" property must be set.');
+            throw new InvalidConfigException('The "appId" property must be set.');
         }
         if (empty ($this->privateKey)) {
-            throw new InvalidConfigException ('The "privateKey" property must be set.');
+            throw new InvalidConfigException('The "privateKey" property must be set.');
         }
         if (empty ($this->publicKey)) {
-            throw new InvalidConfigException ('The "publicKey" property must be set.');
+            throw new InvalidConfigException('The "publicKey" property must be set.');
         }
         $this->initPrivateKey();
         $this->initPublicKey();
@@ -138,7 +138,7 @@ 
         } elseif ($this->signType == self::SIGNATURE_METHOD_RSA) {
             $sign = openssl_sign($this->getSignatureContent($params), $sign, $this->privateKey, OPENSSL_ALGO_SHA1) ? base64_encode($sign) : null;
         } else {
-            throw new InvalidConfigException ('This encryption is not supported');
+            throw new InvalidConfigException('This encryption is not supported');
         }
         return $sign;
     }

src/user/models/UserSupport.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     public function rules()
     {
         return [
-            [[ 'model_id'], 'required'],
+            [['model_id'], 'required'],
             [['user_id', 'model_id'], 'integer'],
             [['user_id'], 'exist', 'skipOnError' => true, 'targetClass' => User::class, 'targetAttribute' => ['user_id' => 'id']],
         ];