Merge pull request #28 from ruudk/omnipay-v3

Upgrade to Omnipay v3
thephpleague · May 25, 2018 · 532adb6 · 532adb6
2 parents 6d7a6d6 + 5a4b2ea
commit 532adb6
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,31 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
-  - hhvm
+  - 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/
+sudo: false
+
+## Cache composer
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - setup=basic
 
 matrix:
-  allow_failures:
-    - php: hhvm
+  include:
+    - php: 5.6
+      env: setup=lowest
 
-before_script:
-  - composer install -n --dev --prefer-source
+install:
+  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
 
 script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
diff --git a/composer.json b/composer.json
@@ -27,14 +27,15 @@
         "psr-4": { "Omnipay\\MultiSafepay\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.0"
+        "omnipay/common": "^3"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "^3",
+        "squizlabs/php_codesniffer": "^3"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,9 +14,6 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <listeners>
-        <listener class="Mockery\Adapter\Phpunit\TestListener" file="vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php" />
-    </listeners>
     <filter>
         <whitelist>
             <directory>./src</directory>

diff --git a/src/Message/CompletePurchaseRequest.php b/src/Message/CompletePurchaseRequest.php
@@ -41,15 +41,16 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post(
+        $httpResponse = $this->httpClient->request(
+            'POST',
             $this->getEndpoint(),
             $this->getHeaders(),
             $data->asXML()
-        )->send();
+        );
 
         $this->response = new CompletePurchaseResponse(
             $this,
-            $httpResponse->xml()
+            simplexml_load_string($httpResponse->getBody()->getContents())
         );
 
         return $this->response;

diff --git a/src/Message/CompletePurchaseResponse.php b/src/Message/CompletePurchaseResponse.php
@@ -49,7 +49,6 @@ public function isInitialized()
     public function isUncleared()
     {
         return $this->getPaymentStatus() === 'uncleared';
-
     }
 
     /**

diff --git a/src/Message/FetchIssuersRequest.php b/src/Message/FetchIssuersRequest.php
@@ -36,15 +36,16 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post(
+        $httpResponse = $this->httpClient->request(
+            'POST',
             $this->getEndpoint(),
             $this->getHeaders(),
             $data->asXML()
-        )->send();
+        );
 
         $this->response = new FetchIssuersResponse(
             $this,
-            $httpResponse->xml()
+            simplexml_load_string($httpResponse->getBody()->getContents())
         );
 
         return $this->response;

diff --git a/src/Message/FetchPaymentMethodsRequest.php b/src/Message/FetchPaymentMethodsRequest.php
@@ -59,15 +59,16 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post(
+        $httpResponse = $this->httpClient->request(
+            'POST',
             $this->getEndpoint(),
             $this->getHeaders(),
             $data->asXML()
-        )->send();
+        );
 
         $this->response = new FetchPaymentMethodsResponse(
             $this,
-            $httpResponse->xml()
+            simplexml_load_string($httpResponse->getBody()->getContents())
         );
 
         return $this->response;

diff --git a/src/Message/PurchaseRequest.php b/src/Message/PurchaseRequest.php
@@ -258,15 +258,16 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post(
+        $httpResponse = $this->httpClient->request(
+            'POST',
             $this->getEndpoint(),
             $this->getHeaders(),
             $data->asXML()
-        )->send();
+        );
 
         $this->response =  new PurchaseResponse(
             $this,
-            $httpResponse->xml()
+            simplexml_load_string($httpResponse->getBody()->getContents())
         );
 
         return $this->response;

diff --git a/src/Message/RestAbstractRequest.php b/src/Message/RestAbstractRequest.php
@@ -6,7 +6,7 @@
 namespace Omnipay\MultiSafepay\Message;
 
 use Omnipay\Common\Message\AbstractRequest;
-use Guzzle\Common\Event;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * MultiSafepay Rest API Abstract Request class.
@@ -147,33 +147,16 @@ protected function getHeaders()
      *
      * @param $method
      * @param $endpoint
-     * @param null $query
      * @param null $data
-     * @return \Guzzle\Http\Message\Response
+     * @return ResponseInterface
      */
-    protected function sendRequest($method, $endpoint, $query = null, $data = null)
+    protected function sendRequest($method, $endpoint, $data = null)
     {
-        $this->httpClient->getEventDispatcher()->addListener('request.error', function (Event $event) {
-            $response = $event['response'];
-            if ($response->isError()) {
-                $event->stopPropagation();
-            }
-        });
-
-        $httpRequest = $this->httpClient->createRequest(
+        return $this->httpClient->request(
             $method,
             $this->getEndpoint() . $endpoint,
             $this->getHeaders(),
             $data
         );
-
-        // Add query parameters
-        if (is_array($query) && ! empty($query)) {
-            foreach ($query as $itemKey => $itemValue) {
-                $httpRequest->getQuery()->add($itemKey, $itemValue);
-            }
-        }
-
-        return $httpRequest->send();
     }
 }
diff --git a/src/Message/RestCompletePurchaseRequest.php b/src/Message/RestCompletePurchaseRequest.php
@@ -50,7 +50,7 @@ public function sendData($data)
 
         $this->response = new RestCompletePurchaseResponse(
             $this,
-            $httpResponse->json()
+            json_decode($httpResponse->getBody()->getContents(), true)
         );
 
         return $this->response;

diff --git a/src/Message/RestFetchIssuersRequest.php b/src/Message/RestFetchIssuersRequest.php
@@ -58,7 +58,7 @@ public function sendData($data)
 
         $this->response = new RestFetchIssuersResponse(
             $this,
-            $httpResponse->json()
+            json_decode($httpResponse->getBody()->getContents(), true)
         );
 
         return $this->response;

diff --git a/src/Message/RestFetchPaymentMethodsRequest.php b/src/Message/RestFetchPaymentMethodsRequest.php
@@ -72,11 +72,11 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->sendRequest('GET', '/gateways', $data);
+        $httpResponse = $this->sendRequest('GET', '/gateways', json_encode($data));
 
         $this->response = new RestFetchPaymentMethodsResponse(
             $this,
-            $httpResponse->json()
+            json_decode($httpResponse->getBody()->getContents(), true)
         );
 
         return $this->response;

diff --git a/src/Message/RestFetchTransactionRequest.php b/src/Message/RestFetchTransactionRequest.php
@@ -57,7 +57,7 @@ public function sendData($data)
 
         $this->response = new RestFetchTransactionResponse(
             $this,
-            $httpResponse->json()
+            json_decode($httpResponse->getBody()->getContents(), true)
         );
 
         return $this->response;

diff --git a/src/Message/RestPurchaseRequest.php b/src/Message/RestPurchaseRequest.php
@@ -383,7 +383,7 @@ public function setGoogleAnalyticsCode($value)
         return $this->setParameter('google_analytics', $value);
     }
 
-    /** 
+    /**
      * Get items HTML
      *
      * @return  string
@@ -393,7 +393,7 @@ public function setItemsHtml($itemsHtml)
         $this->setParameter('itemsHtml', $itemsHtml);
     }
 
-    /** 
+    /**
      * Get items HTML
      *
      * @return  string
@@ -474,7 +474,7 @@ protected function getGatewayData()
 
     /**
      * Get itembag data.
-     * 
+     *
      * @return array
      */
     protected function getItemBagData()
@@ -521,10 +521,7 @@ public function getData()
 
         // When the gateway is set to IDEAL,
         // the issuer parameter is required.
-        if (
-            $this->getType() == 'direct' &&
-            $this->getGateway() == 'IDEAL'
-        ) {
+        if ($this->getType() == 'direct' && $this->getGateway() == 'IDEAL') {
             $this->validate('issuer');
         }
 
@@ -580,11 +577,11 @@ public function getData()
      */
     public function sendData($data)
     {
-        $httpResponse = $this->sendRequest('POST', '/orders', null, $data);
+        $httpResponse = $this->sendRequest('POST', '/orders', json_encode($data));
 
         $this->response = new RestPurchaseResponse(
             $this,
-            $httpResponse->json()
+            json_decode($httpResponse->getBody()->getContents(), true)
         );
 
         return $this->response;

diff --git a/src/Message/RestRefundRequest.php b/src/Message/RestRefundRequest.php
@@ -67,13 +67,12 @@ public function sendData($data)
         $httpResponse = $this->sendRequest(
             'POST',
             '/orders/' . $data['id'] . '/refunds',
-            null,
-            $data
+            json_encode($data)
         );
 
         $this->response = new RestRefundResponse(
             $this,
-            $httpResponse->json()
+            json_decode($httpResponse->getBody()->getContents(), true)
         );
 
         return $this->response;