Merge pull request #110 from thephpleague/upgrade-v3

Update to v3

Author: barryvdh

.travis.yml

@@ -1,18 +1,31 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 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/
+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

composer.json

@@ -28,14 +28,22 @@
         "psr-4": { "Omnipay\\AuthorizeNet\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.2"
+        "omnipay/common": "^3"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "^3",
+        "squizlabs/php_codesniffer": "^3",
+        "phpro/grumphp": "^0.14"
     },
     "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
 }

grumphp.yml

@@ -0,0 +1,15 @@
+parameters:
+    git_dir: .
+    bin_dir: vendor/bin
+    tasks:
+        phpunit:
+            config_file: ~
+            testsuite: ~
+            group: []
+            always_execute: false
+        phpcs:
+            standard: PSR2
+            warning_severity: ~
+            ignore_patterns:
+              - tests/
+            triggered_by: [php]

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

@@ -224,9 +224,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

@@ -79,11 +79,9 @@ public function getReasonCode()
         if (isset($this->data->transactionResponse->messages)) {
             // In case of a successful transaction, a "messages" element is present
             $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->errors->error->errorCode);
-
         } elseif (isset($this->data->messages->message)) {
             // In case of invalid request, the top-level message provides details.
             $code = (string)$this->data->messages->message->code;
@@ -104,11 +102,9 @@ public function getMessage()
         if (isset($this->data->transactionResponse->messages)) {
             // In case of a successful transaction, a "messages" element is present
             $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->errors->error->errorText;
-
         } elseif (isset($this->data->messages->message)) {
             // In case of invalid request, the top-level message provides details.
             $message = (string)$this->data->messages->message->text;

src/Message/CIMAbstractRequest.php

@@ -104,8 +104,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

@@ -67,7 +67,6 @@ public function getResultCode()
                 return static::TRANSACTION_RESULT_CODE_ERROR;
             default:
                 return null;
-
         }
     }
 
@@ -115,7 +114,6 @@ public function getMessage()
         if (isset($this->data['messages'])) {
             // In case of a successful transaction, a "messages" element is present
             $message = (string)$this->data['messages']['message']['text'];
-
         }
 
         return $message;

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());
     }
 }