XOL-4975 Upgrade to Omnipay 3 (#22)

* Upgrade to Omnipay 3

* Fixed code sniffer errors

* Enable composer cache on travis

.travis.yml

@@ -1,19 +1,30 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
-  - hhvm
+
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false
+
+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

composer.json

@@ -28,16 +28,23 @@
         "psr-4": { "Omnipay\\AuthorizeNet\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.5",
+        "omnipay/common": "^3",
         "ext-json": "*",
         "ext-simplexml": "*"
     },
     "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"
         }
-    }
+    },
+    "scripts": {
+        "test": "phpunit",
+        "check-style": "phpcs -p --standard=PSR2 src/",
+        "fix-style": "phpcbf -p --standard=PSR2 src/"
+    },
+    "prefer-stable": true
 }

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>

src/Message/AIMAbstractRequest.php

@@ -170,9 +170,9 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        return $this->response = new AIMResponse($this, $httpResponse->getBody());
+        return $this->response = new AIMResponse($this, $httpResponse->getBody()->getContents());
     }
 
     /**

src/Message/AIMResponse.php

@@ -48,7 +48,7 @@ public function isSuccessful()
      */
     public function getResultCode()
     {
-        return intval((string)$this->data->transactionResponse[0]->responseCode);
+        return intval((string)$this->data->transactionResponse->responseCode);
     }
 
     /**
@@ -60,13 +60,12 @@ public function getReasonCode()
     {
         $code = null;
 
-        if (isset($this->data->transactionResponse[0]->messages)) {
+        if (isset($this->data->transactionResponse->messages)) {
             // In case of a successful transaction, a "messages" element is present
-            $code = intval((string)$this->data->transactionResponse[0]->messages[0]->message[0]->code);
-
-        } elseif (isset($this->data->transactionResponse[0]->errors)) {
+            $code = intval((string)$this->data->transactionResponse->messages->message->code);
+        } elseif (isset($this->data->transactionResponse->errors)) {
             // In case of an unsuccessful transaction, an "errors" element is present
-            $code = intval((string)$this->data->transactionResponse[0]->errors[0]->error[0]->errorCode);
+            $code = intval((string)$this->data->transactionResponse->errors->error->errorCode);
         }
 
         return $code;
@@ -81,21 +80,20 @@ public function getMessage()
     {
         $message = null;
 
-        if (isset($this->data->transactionResponse[0]->messages)) {
+        if (isset($this->data->transactionResponse->messages)) {
             // In case of a successful transaction, a "messages" element is present
-            $message = (string)$this->data->transactionResponse[0]->messages[0]->message[0]->description;
-
-        } elseif (isset($this->data->transactionResponse[0]->errors)) {
+            $message = (string)$this->data->transactionResponse->messages->message->description;
+        } elseif (isset($this->data->transactionResponse->errors)) {
             // In case of an unsuccessful transaction, an "errors" element is present
-            $message = (string)$this->data->transactionResponse[0]->errors[0]->error[0]->errorText;
+            $message = (string)$this->data->transactionResponse->errors->error->errorText;
         }
 
         return $message;
     }
 
     public function getAuthorizationCode()
     {
-        return (string)$this->data->transactionResponse[0]->authCode;
+        return (string)$this->data->transactionResponse->authCode;
     }
 
     /**
@@ -105,7 +103,7 @@ public function getAuthorizationCode()
      */
     public function getAVSCode()
     {
-        return (string)$this->data->transactionResponse[0]->avsResultCode;
+        return (string)$this->data->transactionResponse->avsResultCode;
     }
 
     /**
@@ -118,7 +116,7 @@ public function getAVSCode()
     public function getTransactionReference($serialize = true)
     {
         if ($this->isSuccessful()) {
-            $body = $this->data->transactionResponse[0];
+            $body = $this->data->transactionResponse;
             $transactionRef = new TransactionReference();
             $transactionRef->setApprovalCode((string)$body->authCode);
             $transactionRef->setTransId((string)$body->transId);

src/Message/CIMAbstractRequest.php

@@ -101,8 +101,8 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        return $this->response = new CIMResponse($this, $httpResponse->getBody());
+        return $this->response = new CIMResponse($this, $httpResponse->getBody()->getContents());
     }
 }

src/Message/CIMAbstractResponse.php

@@ -19,7 +19,7 @@ public function __construct(RequestInterface $request, $data)
         // Check if this is an error response
         $isError = strpos((string)$data, '<ErrorResponse');
 
-        $xmlRootElement = $isError !== false ? 'ErrorResponse' : $this->responseType;
+        $xmlRootElement = ($isError !== false ? 'ErrorResponse' : $this->responseType);
         // Strip out the xmlns junk so that PHP can parse the XML
         $xml = preg_replace('/<' . $xmlRootElement . '[^>]+>/', '<' . $xmlRootElement . '>', (string)$data);
 
@@ -58,7 +58,6 @@ public function getResultCode()
                 return 3;
             default:
                 return null;
-
         }
     }
 
@@ -125,8 +124,6 @@ public function getCardReference()
     }
 
     /**
-     * http://bookofzeus.com/articles/convert-simplexml-object-into-php-array/
-     *
      * Convert a simpleXMLElement in to an array
      *
      * @param \SimpleXMLElement $xml

src/Message/CIMAuthorizeRequest.php

@@ -14,7 +14,6 @@ protected function addPayment(\SimpleXMLElement $data)
         if ($this->isCardPresent()) {
             // Prefer the track data if present over the payment profile (better rate)
             return parent::addPayment($data);
-
         } else {
             $this->validate('cardReference');
 

src/Message/CIMCreateCardRequest.php

@@ -152,9 +152,9 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        $response = new CIMCreateCardResponse($this, $httpResponse->getBody());
+        $response = new CIMCreateCardResponse($this, $httpResponse->getBody()->getContents());
 
         if (!$response->isSuccessful() && $response->getReasonCode() == 'E00039') {
             // Duplicate profile. Try adding a new payment profile for the same profile and get the response

src/Message/CIMCreatePaymentProfileRequest.php

@@ -43,8 +43,8 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        return $this->response = new CIMCreatePaymentProfileResponse($this, $httpResponse->getBody());
+        return $this->response = new CIMCreatePaymentProfileResponse($this, $httpResponse->getBody()->getContents());
     }
 }

src/Message/CIMGetPaymentProfileRequest.php

@@ -25,8 +25,8 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        return $this->response = new CIMGetPaymentProfileResponse($this, $httpResponse->getBody());
+        return $this->response = new CIMGetPaymentProfileResponse($this, $httpResponse->getBody()->getContents());
     }
 }

src/Message/CIMGetProfileRequest.php

@@ -24,8 +24,8 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        return $this->response = new CIMGetProfileResponse($this, $httpResponse->getBody());
+        return $this->response = new CIMGetProfileResponse($this, $httpResponse->getBody()->getContents());
     }
 }

src/Message/CIMUpdatePaymentProfileRequest.php

@@ -44,8 +44,8 @@ public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
         $data = $data->saveXml();
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), $headers, $data);
 
-        return $this->response = new CIMUpdatePaymentProfileResponse($this, $httpResponse->getBody());
+        return $this->response = new CIMUpdatePaymentProfileResponse($this, $httpResponse->getBody()->getContents());
     }
 }

src/Message/SIMAbstractRequest.php

@@ -170,9 +170,9 @@ protected function getBillingData()
 
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, $data)->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), [], http_build_query($data));
 
-        return $this->response = new AIMResponse($this, $httpResponse->getBody());
+        return $this->response = new AIMResponse($this, $httpResponse->getBody()->getContents());
     }
 
     public function getEndpoint()

tests/CIMGatewayTest.php

@@ -200,6 +200,7 @@ public function testPurchaseFailure()
 
     public function testRefundSuccess()
     {
+        self::markTestSkipped();
 //        $this->setMockHttpResponse('CIMRefundSuccess.txt');
 //
 //        $response = $this->gateway->refund($this->refundOptions)->send();

tests/Message/AIMAbstractRequestTest.php

@@ -1,12 +1,12 @@
 <?php
 
-
 namespace Message;
 
-
 use Omnipay\AuthorizeNet\Message\AIMAbstractRequest;
+use Omnipay\Common\Http\ClientInterface;
+use Omnipay\Tests\TestCase;
 
-class AIMAbstractRequestTest extends \PHPUnit_Framework_TestCase
+class AIMAbstractRequestTest extends TestCase
 {
     /** @var AIMAbstractRequest */
     private $request;
@@ -16,8 +16,8 @@ public function setUp()
         $this->request = $this->getMockForAbstractClass(
             '\Omnipay\AuthorizeNet\Message\AIMAbstractRequest',
             array(
-                $this->getMock('\Guzzle\Http\ClientInterface'),
-                $this->getMock('\Symfony\Component\HttpFoundation\Request')
+                $this->createMock(ClientInterface::class),
+                $this->createMock('\Symfony\Component\HttpFoundation\Request')
             )
         );
     }

tests/Message/AIMResponseTest.php

@@ -18,7 +18,7 @@ public function getMockRequest($className = '\Omnipay\AuthorizeNet\Message\AIMAb
 
     public function testConstructEmpty()
     {
-        $this->setExpectedException('\Omnipay\Common\Exception\InvalidResponseException');
+        $this->expectException('\Omnipay\Common\Exception\InvalidResponseException');
         new AIMResponse($this->getMockRequest(), '');
     }
 

tests/Mock/CIMCreateCardFailure.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml; charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMCreateCardFailureWithDuplicate.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml; charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMCreateCardSuccess.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml;charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMCreatePaymentProfileFailure.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml; charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMCreatePaymentProfileFailureMaxProfileLimit.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml; charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMCreatePaymentProfileSuccess.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml; charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMGetMultipleProfilesSuccess.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml; charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET

tests/Mock/CIMGetPaymentProfileSuccess.txt

@@ -1,8 +1,7 @@
 HTTP/1.1 200 OK
 Cache-Control: private
 Content-Length: 746
-Content-Type: text/xml;
-charset=utf-8
+Content-Type: text/xml;charset=utf-8
 Server: Microsoft-IIS/7.5
 X-AspNet-Version: 2.0.50727
 X-Powered-By: ASP.NET