Update v3 changes

Author: barryvdh

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
 
 # This triggers builds to run on the new TravisCI infrastructure.
 # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
@@ -20,9 +19,7 @@ env:
 
 matrix:
   include:
-    - php: 5.6
-      env: setup=lowest
-    - php: 7.0
+    - php: 7.1
       env: setup=lowest
 
 install:

composer.json

@@ -24,7 +24,7 @@
         "psr-4": { "Omnipay\\Sisow\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "^3"
+        "omnipay/common": "v3.0-alpha.4"
     },
     "require-dev": {
         "omnipay/tests": "^3",

src/Message/AbstractRequest.php

@@ -3,6 +3,7 @@
 namespace Omnipay\Sisow\Message;
 
 use \Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Sisow Abstract Request
@@ -12,9 +13,12 @@ abstract class AbstractRequest extends BaseAbstractRequest
     /**
      * Generate the message signature
      *
-     * @return string
+     * @return string|null
      */
-    abstract protected function generateSignature();
+    protected function generateSignature()
+    {
+        return null;
+    }
 
     public function getMerchantId()
     {
@@ -45,4 +49,13 @@ public function setShopId($value)
     {
         return $this->setParameter('shopId', $value);
     }
+
+    /**
+     * @param ResponseInterface $response
+     * @return \SimpleXMLElement
+     */
+    protected function parseXmlResponse(ResponseInterface $response)
+    {
+        return simplexml_load_string($response->getBody()->getContents());
+    }
 }

src/Message/CompletePurchaseRequest.php

@@ -3,6 +3,7 @@
 namespace Omnipay\Sisow\Message;
 
 use Omnipay\Common\Http\ResponseParser;
+use Psr\Http\Message\ResponseInterface;
 
 class CompletePurchaseRequest extends PurchaseRequest
 {
@@ -48,8 +49,8 @@ public function getTransactionReference()
     public function sendData($data)
     {
         if ($data['trxid']) {
-            $httpResponse = $this->httpClient->post($this->endpoint, [], http_build_query($data));
-            return $this->response = new CompletePurchaseResponse($this, ResponseParser::xml($httpResponse));
+            $httpResponse = $this->httpClient->request('POST', $this->endpoint, [], http_build_query($data));
+            return $this->response = new CompletePurchaseResponse($this, $this->parseXmlResponse($httpResponse));
         } else {
             $data = array('transaction' => (object) $this->httpRequest->query->all());
             return $this->response = new CompletePurchaseResponse($this, (object) $data);

src/Message/FetchIssuersRequest.php

@@ -5,7 +5,7 @@
 use Omnipay\Common\Http\ResponseParser;
 use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
 
-class FetchIssuersRequest extends BaseAbstractRequest
+class FetchIssuersRequest extends AbstractRequest
 {
     protected $endpoint = 'https://www.sisow.nl/Sisow/iDeal/RestHandler.ashx/DirectoryRequest';
 
@@ -27,8 +27,8 @@ public function sendData($data)
             $endpoint .= '?test=true';
         }
 
-        $httpResponse = $this->httpClient->get($endpoint);
+        $httpResponse = $this->httpClient->request('GET', $endpoint);
 
-        return $this->response = new FetchIssuersResponse($this, ResponseParser::xml($httpResponse));
+        return $this->response = new FetchIssuersResponse($this, $this->parseXmlResponse($httpResponse));
     }
 }

src/Message/FetchPaymentMethodsRequest.php

@@ -39,8 +39,8 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->endpoint, [], http_build_query($data));
+        $httpResponse = $this->httpClient->request('POST', $this->endpoint, [], http_build_query($data));
 
-        return $this->response = new FetchPaymentMethodsResponse($this, ResponseParser::xml($httpResponse));
+        return $this->response = new FetchPaymentMethodsResponse($this, $this->parseXmlResponse($httpResponse));
     }
 }

src/Message/PurchaseRequest.php

@@ -209,8 +209,8 @@ protected function getItemData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->endpoint, [], http_build_query($data));
+        $httpResponse = $this->httpClient->request('POST', $this->endpoint, [], http_build_query($data));
 
-        return $this->response = new PurchaseResponse($this, ResponseParser::xml($httpResponse));
+        return $this->response = new PurchaseResponse($this, $this->parseXmlResponse($httpResponse));
     }
 }