Develop

src/Payment/API.php

@@ -383,6 +383,7 @@ protected function request($api, array $params, $method = 'post', array $options
         $params['mch_id'] = $this->merchant->merchant_id;
         $params['device_info'] = $this->merchant->device_info;
         $params['nonce_str'] = uniqid();
+        $params = array_filter($params);
         $params['sign'] = generate_sign($params, $this->merchant->key, 'md5');
 
         $options = array_merge([

src/Payment/LuckyMoney/API.php

@@ -181,6 +181,7 @@ public function getMerchant()
      */
     protected function request($api, array $params, $method = 'post')
     {
+        $params = array_filter($params);
         $params['mch_id'] = $this->merchant->merchant_id;
         $params['nonce_str'] = uniqid();
         $params['sign'] = \EasyWeChat\Payment\generate_sign($params, $this->merchant->key, 'md5');

src/Payment/MerchantPay/API.php

@@ -121,6 +121,7 @@ public function getMerchant()
      */
     protected function request($api, array $params, $method = 'post')
     {
+        $params = array_filter($params);
         $params['nonce_str'] = uniqid();
         $params['sign'] = \EasyWeChat\Payment\generate_sign($params, $this->merchant->key, 'md5');
 

src/Payment/Notify.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the overtrue/wechat.
+ *
+ * (c) overtrue <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 /**
  * Notify.php.
  *

src/Payment/Payment.php

@@ -116,7 +116,14 @@ public function handleNotify(callable $callback)
     }
 
     /**
-     * Generate js config for payment.
+     * [WeixinJSBridge] Generate js config for payment.
+     *
+     * <pre>
+     * WeixinJSBridge.invoke(
+     *  'getBrandWCPayRequest',
+     *  ...
+     * );
+     * </pre>
      *
      * @param string $prepayId
      * @param bool   $json
@@ -135,13 +142,30 @@ public function configForPayment($prepayId, $json = true)
 
         $params['paySign'] = generate_sign($params, $this->merchant->key, 'md5');
 
-        // 简直了，这帮人真的是快玩出花儿来了！
-        $params['timestamp'] = $params['timeStamp'];
-        unset($params['timeStamp']);
-
         return $json ? json_encode($params) : $params;
     }
 
+    /**
+     * [JSSDK] Generate js config for payment.
+     *
+     * <pre>
+     * wx.chooseWXPay({...});
+     * </pre>
+     *
+     * @param string $prepayId
+     *
+     * @return array|string
+     */
+    public function configForJSSDKPayment($prepayId)
+    {
+        $config = $this->configForPayment($prepayId, false);
+
+        $config['timestamp'] = $config['timeStamp'];
+        unset($config['timeStamp']);
+
+        return $config;
+    }
+
     /**
      * Generate app payment parameters.
      *

src/Support/File.php

@@ -32,7 +32,7 @@ class File
      *
      * @var array
      */
-    protected static $extensionMap = array(
+    protected static $extensionMap = [
         'audio/wav' => '.wav',
         'audio/x-ms-wma' => '.wma',
         'video/x-ms-wmv' => '.wmv',
@@ -46,7 +46,7 @@ class File
         'image/png' => '.png',
         'image/tiff' => '.tiff',
         'image/jpeg' => '.jpg',
-    );
+    ];
 
     /**
      * File header signatures.

tests/Payment/PaymentPaymentTest.php

@@ -128,11 +128,28 @@ public function testConfigForPayment()
         $this->assertEquals('wxTestAppId', $array['appId']);
         $this->assertEquals('prepay_id=prepayId', $array['package']);
         $this->assertEquals('MD5', $array['signType']);
-        $this->assertArrayHasKey('timestamp', $array);
+        $this->assertArrayHasKey('timeStamp', $array);
         $this->assertArrayHasKey('nonceStr', $array);
         $this->assertArrayHasKey('paySign', $array);
     }
 
+    /**
+     * test configForPayment.
+     */
+    public function testConfigForJSSDKPayment()
+    {
+        $payment = $this->getPayment();
+
+        $config = $payment->configForJSSDKPayment('prepayId');
+
+        $this->assertEquals('wxTestAppId', $config['appId']);
+        $this->assertEquals('prepay_id=prepayId', $config['package']);
+        $this->assertEquals('MD5', $config['signType']);
+        $this->assertArrayHasKey('timestamp', $config);
+        $this->assertArrayHasKey('nonceStr', $config);
+        $this->assertArrayHasKey('paySign', $config);
+    }
+
     /**
      * test configForAppPayment.
      */