Merge pull request #26 from sudiptpa/v3-release

Omnipay v3 release

Author: barryvdh

.travis.yml

@@ -1,23 +1,27 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
+
+env:
+  global:
+    - setup=basic
+
+matrix:
+  include:
+    - php: 5.6
+      env: setup=lowest
 
-# 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
+before_install:
+  - travis_retry composer self-update
 
-before_script:
-  - composer install -n --dev --prefer-source
+install:
+  - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-dist; 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

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Adrian Macneil
+Copyright (c) 2012-2018 Adrian Macneil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -14,21 +14,12 @@ in 8 countries.
 
 ## Installation
 
-Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply add it
-to your `composer.json` file:
-
-```json
-{
-    "require": {
-        "omnipay/eway": "~2.0"
-    }
-}
-```
+Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply require `league/omnipay` and `omnipay/eway` with Composer:
 
-And run composer to update your dependencies:
+```
+composer require league/omnipay omnipay/eway
 
-    $ curl -s http://getcomposer.org/installer | php
-    $ php composer.phar update
+```
 
 ## Basic Usage
 

composer.json

@@ -26,14 +26,22 @@
         "psr-4": { "Omnipay\\Eway\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.0"
+        "omnipay/common": "^3"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "^3",
+        "squizlabs/php_codesniffer": "^3",
+        "phpro/grumphp": "^0.14.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
-    }
+    },
+    "scripts": {
+        "test": "vendor/bin/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/DirectGateway.php

@@ -24,10 +24,10 @@ public function getName()
 
     public function getDefaultParameters()
     {
-        return array(
+        return [
             'customerId' => '',
-            'testMode'   => false,
-        );
+            'testMode' => false,
+        ];
     }
 
     public function getCustomerId()
@@ -40,27 +40,27 @@ public function setCustomerId($value)
         return $this->setParameter('customerId', $value);
     }
 
-    public function authorize(array $parameters = array())
+    public function authorize(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\Eway\Message\DirectAuthorizeRequest', $parameters);
     }
 
-    public function capture(array $parameters = array())
+    public function capture(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\Eway\Message\DirectCaptureRequest', $parameters);
     }
 
-    public function purchase(array $parameters = array())
+    public function purchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\Eway\Message\DirectPurchaseRequest', $parameters);
     }
 
-    public function refund(array $parameters = array())
+    public function refund(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\Eway\Message\DirectRefundRequest', $parameters);
     }
 
-    public function void(array $parameters = array())
+    public function void(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\Eway\Message\DirectVoidRequest', $parameters);
     }

src/Message/DirectAbstractRequest.php

@@ -3,6 +3,7 @@
 namespace Omnipay\Eway\Message;
 
 use Omnipay\Common\Message\AbstractRequest;
+use SimpleXMLElement;
 
 /**
  * eWAY Direct Abstract Request
@@ -12,9 +13,11 @@ abstract class DirectAbstractRequest extends AbstractRequest
 
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, $data->asXML())->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), [], $data->asXML());
 
-        return $this->response = new DirectResponse($this, $httpResponse->xml());
+        $xml = new SimpleXMLElement($httpResponse->getBody()->getContents());
+
+        return $this->response = new DirectResponse($this, $xml);
     }
 
     public function getCustomerId()

src/Message/RapidCaptureRequest.php

@@ -33,9 +33,9 @@ public function getData()
     {
         $this->validate('amount', 'transactionReference');
 
-        $data = array();
+        $data = [];
 
-        $data['Payment'] = array();
+        $data['Payment'] = [];
         $data['Payment']['TotalAmount'] = $this->getAmountInteger();
         $data['Payment']['InvoiceNumber'] = $this->getTransactionId();
         $data['Payment']['InvoiceDescription'] = $this->getDescription();
@@ -49,20 +49,15 @@ public function getData()
 
     public function getEndpoint()
     {
-        return $this->getEndpointBase().'/CapturePayment';
+        return $this->getEndpointBase() . '/CapturePayment';
     }
 
     public function sendData($data)
     {
-        // This request uses the REST endpoint and requires the JSON content type header
-        $httpResponse = $this->httpClient->post(
-            $this->getEndpoint(),
-            array('content-type' => 'application/json'),
-            json_encode($data)
-        )
-        ->setAuth($this->getApiKey(), $this->getPassword())
-        ->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), [
+            'content-type' => 'application/json',
+        ], json_encode($data));
 
-        return $this->response = new RapidResponse($this, $httpResponse->json());
+        return $this->response = new RapidResponse($this, json_decode((string) $httpResponse->getBody(), true));
     }
 }

src/Message/RapidDirectAbstractRequest.php

@@ -60,7 +60,7 @@ protected function getBaseData()
         }
 
         if ($this->getCard()) {
-            $data['Customer']['CardDetails'] = array();
+            $data['Customer']['CardDetails'] = [];
             $data['Customer']['CardDetails']['Name'] = $this->getCard()->getName();
 
             if ($this->getCard()->getExpiryYear() && $this->getCard()->getExpiryMonth()) {
@@ -101,10 +101,8 @@ protected function getBaseData()
 
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, json_encode($data))
-            ->setAuth($this->getApiKey(), $this->getPassword())
-            ->send();
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), [], json_encode($data));
 
-        return $this->response = new RapidResponse($this, $httpResponse->json());
+        return $this->response = new RapidResponse($this, json_decode((string) $httpResponse->getBody(), true));
     }
 }