make worldpay compatible with omnipay 3.*

README.md

@@ -17,7 +17,7 @@ to your `composer.json` file:
 ```json
 {
     "require": {
-        "omnipay/worldpay": "~2.0"
+        "omnipay/worldpay": "~3.0"
     }
 }
 ```

composer.json

@@ -26,14 +26,16 @@
         "psr-4": { "Omnipay\\WorldPay\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.0"
+        "omnipay/common": "~3.0"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "~3.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/JsonGateway.php

@@ -2,6 +2,7 @@
 
 namespace Omnipay\WorldPay;
 
+use Http\Adapter\Guzzle6\Client;
 use Omnipay\Common\AbstractGateway;
 
 /**
@@ -74,4 +75,16 @@ public function capture(array $parameters = array())
     {
         return $this->createRequest('\Omnipay\WorldPay\Message\JsonCaptureRequest', $parameters);
     }
+
+    protected function getDefaultHttpClient()
+    {
+        $guzzleClient = Client::createWithConfig([
+            'curl.options' => [
+                CURLOPT_SSLVERSION => 6
+            ]
+        ]);
+
+
+        return new \Omnipay\Common\Http\Client($guzzleClient);
+    }
 }

src/Message/JsonAbstractRequest.php

@@ -43,36 +43,27 @@ public function setClientKey($value)
         return $this->setParameter('clientKey', $value);
     }
 
+    /**
+     * Method required to override for getting the specific request endpoint
+     *
+     * @return string
+     */
+    abstract public function getEndpoint();
 
     public function sendRequest($data)
     {
-        $config = $this->httpClient->getConfig();
-        $curlOptions = $config->get('curl.options');
-        $curlOptions[CURLOPT_SSLVERSION] = 6;
-        $config->set('curl.options', $curlOptions);
-        $this->httpClient->setConfig($config);
-
-        // don't throw exceptions for 4xx errors
-        $this->httpClient->getEventDispatcher()->addListener(
-            'request.error',
-            function ($event) {
-                if ($event['response']->isClientError()) {
-                    $event->stopPropagation();
-                }
-            }
-        );
-
         $httpRequest = $this->httpClient->createRequest(
             $this->getHttpMethod(),
             $this->getEndpoint(),
-            null,
+            [],
             json_encode($data)
         );
 
-        $httpResponse = $httpRequest
-            ->setHeader('Authorization', $this->getServiceKey())
-            ->setHeader('Content-type', 'application/json')
-            ->send();
+        $httpRequest = $httpRequest
+            ->withHeader('Authorization', $this->getServiceKey())
+            ->withHeader('Content-type', 'application/json');
+
+        $httpResponse = $this->httpClient->sendRequest($httpRequest);
 
         return $httpResponse;
     }

src/Message/JsonPurchaseRequest.php

@@ -50,7 +50,6 @@ public function getData()
             $data['deliveryAddress']['telephoneNumber'] = $card->getBillingPhone();
 
             $data['shopperEmailAddress'] = $card->getEmail();
-
         }
 
         $data['shopperIpAddress'] = $this->getClientIp();