Completed
Push — master ( c7c4dd...431352 )
by Xu
759:10 queued 719:12
created
src/payment/migrations/m180315_104659_create_trade_refunds_table.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,18 +21,18 @@
 block discarded – undo
21 21
         }
22 22
         $this->createTable($this->tableName, [
23 23
             'id' => $this->bigPrimaryKey(),
24
-            'amount' => $this->unsignedInteger()->notNull(),//退款金额大于 0, 单位为对应币种的最小货币单位,例如:人民币为分(如退款金额为 1 元,此处请填 100)。必须小于等于可退款金额,默认为全额退款。
25
-            'succeed' => $this->boolean()->defaultValue(false),//退款是否成功。
26
-            'status' => $this->string(10)->defaultValue('pending'),//退款状态(目前支持三种状态: pending: 处理中; succeeded: 成功; failed: 失败)。
27
-            'time_succeed' => $this->unixTimestamp(),//退款成功的时间,用 Unix 时间戳表示。
28
-            'description' => $this->string(255)->notNull(),//退款详情,最多 255 个 Unicode 字符。
29
-            'failure_code' => $this->string(),//退款的错误码,详见 错误 中的错误码。
30
-            'failure_msg' => $this->string(),//退款消息的描述。
24
+            'amount' => $this->unsignedInteger()->notNull(), //退款金额大于 0, 单位为对应币种的最小货币单位,例如:人民币为分(如退款金额为 1 元,此处请填 100)。必须小于等于可退款金额,默认为全额退款。
25
+            'succeed' => $this->boolean()->defaultValue(false), //退款是否成功。
26
+            'status' => $this->string(10)->defaultValue('pending'), //退款状态(目前支持三种状态: pending: 处理中; succeeded: 成功; failed: 失败)。
27
+            'time_succeed' => $this->unixTimestamp(), //退款成功的时间,用 Unix 时间戳表示。
28
+            'description' => $this->string(255)->notNull(), //退款详情,最多 255 个 Unicode 字符。
29
+            'failure_code' => $this->string(), //退款的错误码,详见 错误 中的错误码。
30
+            'failure_msg' => $this->string(), //退款消息的描述。
31 31
             //'metadata',
32
-            'charge_id' => $this->unsignedBigInteger()->notNull(),//支付  charge 对象的  id
33
-            'charge_order_no',//商户订单号,这边返回的是  charge 对象中的  order_no 参数。
34
-            'transaction_no' => $this->string(64),//支付渠道返回的交易流水号,部分渠道返回该字段为空。
35
-            'funding_source' => $this->string(20),//微信及 QQ 类退款资金来源。取值范围: unsettled_funds :使用未结算资金退款; recharge_funds :微信-使用可用余额退款,QQ-使用可用现金账户资金退款。注:默认值  unsettled_funds ,该参数对于微信渠道的退款来说仅适用于微信老资金流商户使用,包括  wx 、 wx_pub 、 wx_pub_qr 、 wx_lite 、 wx_wap 、 wx_pub_scan 六个渠道;新资金流退款资金默认从基本账户中扣除。该参数仅在请求退款,传入该字段时返回。
32
+            'charge_id' => $this->unsignedBigInteger()->notNull(), //支付  charge 对象的  id
33
+            'charge_order_no', //商户订单号,这边返回的是  charge 对象中的  order_no 参数。
34
+            'transaction_no' => $this->string(64), //支付渠道返回的交易流水号,部分渠道返回该字段为空。
35
+            'funding_source' => $this->string(20), //微信及 QQ 类退款资金来源。取值范围: unsettled_funds :使用未结算资金退款; recharge_funds :微信-使用可用余额退款,QQ-使用可用现金账户资金退款。注:默认值  unsettled_funds ,该参数对于微信渠道的退款来说仅适用于微信老资金流商户使用,包括  wx 、 wx_pub 、 wx_pub_qr 、 wx_lite 、 wx_wap 、 wx_pub_scan 六个渠道;新资金流退款资金默认从基本账户中扣除。该参数仅在请求退款,传入该字段时返回。
36 36
             //'extra',
37 37
             'created_at' => $this->unixTimestamp(),
38 38
         ], $tableOptions);
Please login to merge, or discard this patch.
src/admin/controllers/AttachmentController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
     public function actionDelete($id)
84 84
     {
85 85
         $this->findModel($id)->delete();
86
-        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Delete success.'));
86
+        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Delete success.'));
87 87
         return $this->redirect(['index']);
88 88
     }
89 89
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         if (($model = Attachment::findOne($id)) !== null) {
120 120
             return $model;
121 121
         } else {
122
-            throw new NotFoundHttpException (Yii::t('yuncms', 'The requested page does not exist.'));
122
+            throw new NotFoundHttpException(Yii::t('yuncms', 'The requested page does not exist.'));
123 123
         }
124 124
     }
125 125
 }
Please login to merge, or discard this patch.
src/models/Attachment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
                 'attributes' => [
71 71
                     ActiveRecord::EVENT_BEFORE_INSERT => 'user_id'
72 72
                 ],
73
-                'value' => function ($event) {
73
+                'value' => function($event) {
74 74
                     return Yii::$app->user->id;
75 75
                 }
76 76
             ],
Please login to merge, or discard this patch.
src/admin/controllers/VolumesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
         $variables = [];
30 30
         $variables['volumes'] = Yii::$app->getFilesystem()->getFilesystems();
31 31
 
32
-        print_r($variables);exit;
32
+        print_r($variables); exit;
33 33
         return $this->renderTemplate('settings/assets/volumes/_index', $variables);
34 34
     }
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
src/user/models/AvatarForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
     {
82 82
         if ($this->validate()) {
83 83
             $user = $this->getUser();
84
-            if(AvatarHelper::save($user, $this->getOriginalImage())){
84
+            if (AvatarHelper::save($user, $this->getOriginalImage())) {
85 85
                 return true;
86 86
             } else {
87 87
                 return false;
Please login to merge, or discard this patch.
src/rest/models/UserEmailRegistrationForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
             $user = new User();
82 82
             $user->setScenario(User::SCENARIO_EMAIL_REGISTER);
83 83
             $this->loadAttributes($user);
84
-            if($user->createUser()){
84
+            if ($user->createUser()) {
85 85
                 return $user;
86 86
             }
87 87
         }
Please login to merge, or discard this patch.
src/web/Response.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
     public function startBuffering($content)
93 93
     {
94 94
         $this->getHeaders()
95
-            ->set('Surrogate-Control','BigPipe/1.0')
95
+            ->set('Surrogate-Control', 'BigPipe/1.0')
96 96
             ->set('X-Accel-Buffering', 'no');
97 97
         $this->data = $content;
98 98
         $this->send();
Please login to merge, or discard this patch.
src/oauth2/actions/QRCode.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         if (empty($code)) {
46 46
             $code = Yii::$app->security->generateRandomString(40);
47 47
         }
48
-        $attributes = Yii::$app->cache->getOrSet([self::CACHE_PREFIX, 'code' => $code], function ($cache) use ($code) {
48
+        $attributes = Yii::$app->cache->getOrSet([self::CACHE_PREFIX, 'code' => $code], function($cache) use ($code) {
49 49
             return [
50 50
                 'code' => $code,
51 51
                 'msg' => Yii::t('yuncms', 'Please use App Scan QR code to login.'),
Please login to merge, or discard this patch.
src/oauth2/actions/Token.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,10 +32,10 @@
 block discarded – undo
32 32
     public $grantTypes = [
33 33
         'authorization_code' => 'yuncms\oauth2\grant\types\Authorization',
34 34
         'refresh_token' => 'yuncms\oauth2\grant\types\RefreshToken',
35
-        'client_credentials' => 'yuncms\oauth2\grant\types\ClientCredentials',//个人账户密码
36
-        'password' => 'yuncms\oauth2\grant\types\UserCredentials',//账户密码
37
-        'wechat' => 'yuncms\oauth2\grant\types\WechatCredentials',//微信
38
-        'qrcode' => 'yuncms\oauth2\grant\types\QRCode',//客户端扫码
35
+        'client_credentials' => 'yuncms\oauth2\grant\types\ClientCredentials', //个人账户密码
36
+        'password' => 'yuncms\oauth2\grant\types\UserCredentials', //账户密码
37
+        'wechat' => 'yuncms\oauth2\grant\types\WechatCredentials', //微信
38
+        'qrcode' => 'yuncms\oauth2\grant\types\QRCode', //客户端扫码
39 39
 //        'urn:ietf:params:oauth:grant-type:jwt-bearer' => 'yuncms\oauth2\grant\types\JwtBearer',//JWT 客户端签名
40 40
     ];
41 41
 
Please login to merge, or discard this patch.