Use guzzlehttp client

Author: lokielse

src/BaseAbstractGateway.php

@@ -7,12 +7,6 @@
 abstract class BaseAbstractGateway extends AbstractGateway
 {
 
-    public function getTradeType()
-    {
-        return $this->getParameter('trade_type');
-    }
-
-
     public function setTradeType($tradeType)
     {
         $this->setParameter('trade_type', $tradeType);
@@ -116,6 +110,12 @@ public function purchase($parameters = array ())
     }
 
 
+    public function getTradeType()
+    {
+        return $this->getParameter('trade_type');
+    }
+
+
     /**
      * @param array $parameters
      *

src/Helper.php

@@ -5,25 +5,6 @@
 class Helper
 {
 
-    public static function post($url, $data = array(), $timeout = 30, $options = array())
-    {
-        $ch = curl_init($url);
-
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, self::array2xml($data));
-        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-        curl_setopt_array($ch, $options);
-
-        $result = curl_exec($ch);
-
-        $result = self::xml2array($result);
-
-        return $result;
-    }
-
-
     public static function array2xml($arr, $root = 'xml')
     {
         $xml = "<$root>";
@@ -48,7 +29,7 @@ public static function xml2array($xml)
 
     public static function sign($data, $key)
     {
-        unset( $data['sign'] );
+        unset($data['sign']);
 
         ksort($data);
 

src/Message/CloseOrderRequest.php

@@ -71,7 +71,9 @@ public function setOutTradeNo($outTradeNo)
      */
     public function sendData($data)
     {
-        $responseData = Helper::post($this->endpoint, $data);
+        $request      = $this->httpClient->post($this->endpoint)->setBody(Helper::array2xml($data));
+        $response     = $request->send()->getBody();
+        $responseData = Helper::xml2array($response);
 
         return $this->response = new CloseOrderResponse($this, $responseData);
     }

src/Message/CompletePurchaseRequest.php

@@ -15,36 +15,12 @@
 class CompletePurchaseRequest extends BaseAbstractRequest
 {
 
-    /**
-     * Get the raw data array for this message. The format of this varies from gateway to
-     * gateway, but will usually be either an associative array, or a SimpleXMLElement.
-     *
-     * @return mixed
-     */
-    public function getData()
-    {
-        $data = $this->getRequestParams();
-
-        if (is_string($data)) {
-            $data = Helper::xml2array($data);
-        }
-
-        return $data;
-    }
-
-
     public function setRequestParams($requestParams)
     {
         $this->setParameter('request_params', $requestParams);
     }
 
 
-    public function getRequestParams()
-    {
-        return $this->getParameter('request_params');
-    }
-
-
     /**
      * Send the request with specified data
      *
@@ -73,4 +49,28 @@ public function sendData($data)
 
         return $this->response = new CompletePurchaseResponse($this, $responseData);
     }
+
+
+    /**
+     * Get the raw data array for this message. The format of this varies from gateway to
+     * gateway, but will usually be either an associative array, or a SimpleXMLElement.
+     *
+     * @return mixed
+     */
+    public function getData()
+    {
+        $data = $this->getRequestParams();
+
+        if (is_string($data)) {
+            $data = Helper::xml2array($data);
+        }
+
+        return $data;
+    }
+
+
+    public function getRequestParams()
+    {
+        return $this->getParameter('request_params');
+    }
 }

src/Message/CompletePurchaseResponse.php

@@ -24,21 +24,22 @@ public function isSuccessful()
     }
 
 
-    public function isSignMatch()
+    public function isPaid()
     {
         $data = $this->getData();
 
-        return $data['sign_match'];
+        return $data['paid'];
     }
 
 
-    public function isPaid()
+    public function isSignMatch()
     {
         $data = $this->getData();
 
-        return $data['paid'];
+        return $data['sign_match'];
     }
 
+
     public function getRequestData()
     {
         return $this->request->getData();

src/Message/CreateMicroOrderRequest.php

@@ -25,14 +25,7 @@ class CreateMicroOrderRequest extends CreateOrderRequest
      */
     public function getData()
     {
-        $this->validate(
-            'app_id',
-            'mch_id',
-            'body',
-            'out_trade_no',
-            'total_fee',
-            'auth_code'
-        );
+        $this->validate('app_id', 'mch_id', 'body', 'out_trade_no', 'total_fee', 'auth_code');
 
         $data = array (
             'appid'            => $this->getAppId(),//*
@@ -59,7 +52,6 @@ public function getData()
     }
 
 
-
     /**
      * @return mixed
      */
@@ -84,7 +76,9 @@ public function setAuthCode($authCode)
      */
     public function sendData($data)
     {
-        $responseData = Helper::post($this->endpoint, $data);
+        $request      = $this->httpClient->post($this->endpoint)->setBody(Helper::array2xml($data));
+        $response     = $request->send()->getBody();
+        $responseData = Helper::xml2array($response);
 
         return $this->response = new CreateOrderResponse($this, $responseData);
     }

src/Message/CreateMicroOrderResponse.php

@@ -39,20 +39,20 @@ public function getOrderData()
     }
 
 
-    public function getCodeUrl()
+    public function getPrepayId()
     {
-        if ($this->isSuccessful() && $this->request->getTradeType() == 'NATIVE') {
-            return $this->getData()['code_url'];
+        if ($this->isSuccessful()) {
+            return $this->getData()['prepay_id'];
         } else {
             return null;
         }
     }
 
 
-    public function getPrepayId()
+    public function getCodeUrl()
     {
-        if ($this->isSuccessful()) {
-            return $this->getData()['prepay_id'];
+        if ($this->isSuccessful() && $this->request->getTradeType() == 'NATIVE') {
+            return $this->getData()['code_url'];
         } else {
             return null;
         }