Merge pull request #24 from sudiptpa/upgrading-v3

Support new v3 of Omnipay

Author: sudiptpa

.travis.yml

@@ -1,14 +1,27 @@
 language: php
 
 php:
-  - '5.3'
-  - '5.4'
-  - '5.5'
-  - '5.6'
-  - '7.0'
-  - '7.1'
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
 
-before_script:
-  - composer install -n --dev --prefer-source
+env:
+  global:
+    - setup=basic
 
-script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
+matrix:
+  include:
+    - php: 5.6
+      env: setup=lowest
+
+sudo: false
+
+before_install:
+  - travis_retry composer self-update
+
+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,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 
+Copyright (c) 2016-2018 Sujip Thapa
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,7 +3,7 @@
 **NAB Transact driver for the Omnipay PHP payment processing library**
 
 [Omnipay](https://github.com/thephpleague/omnipay) is a framework agnostic, multi-gateway payment
-processing library for PHP 5.3+. This package implements NAB Transact support for Omnipay.
+processing library for PHP. This package implements NAB Transact support for Omnipay.
 
 [![StyleCI](https://styleci.io/repos/74269379/shield?style=flat&branch=master)](https://styleci.io/repos/74269379)
 [![Build Status](https://travis-ci.org/sudiptpa/omnipay-nabtransact.svg?branch=master&style=flat-square)](https://travis-ci.org/sudiptpa/omnipay-nabtransact)
@@ -13,26 +13,20 @@ processing library for PHP 5.3+. This package implements NAB Transact support fo
 
 ## Installation
 
-Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply add it
-to your `composer.json` file:
+Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply require `league/omnipay` and `sudiptpa/omnipay-nabtransact` with Composer:
 
-```json
-{
-    "require": {
-        "sudiptpa/omnipay-nabtransact": "~2.0"
-    }
-}
 ```
-
-And run composer to update your dependencies:
-
-    $ curl -s http://getcomposer.org/installer | php
-    $ php composer.phar update
+composer require league/omnipay sudiptpa/omnipay-nabtransact
+```
 
 ## Basic Usage
 
 The following gateways are provided by this package:
 
+* NABTransact_DirectPost (NAB Transact Direct Post v2)
+* NABTransact_SecureXML (NAB Transact SecurePay XML)
+* NABTransact_UnionPay (UnionPay via NAB Transact)
+
 ### NAB Transact SecureXML API
 
 ```php
@@ -43,27 +37,27 @@ The following gateways are provided by this package:
     $gateway->setMerchantId('XYZ0010');
     $gateway->setTransactionPassword('abcd1234');
     $gateway->setTestMode(true);
- 
+
     $card = new CreditCard([
             'firstName' => 'Sujip',
-            'lastName' => 'Thapa',            
+            'lastName' => 'Thapa',
             'number'      => '4444333322221111',
             'expiryMonth' => '06',
             'expiryYear'  => '2030',
             'cvv'         => '123',
         ]
     );
- 
+
     $transaction = $gateway->purchase([
             'amount'        => '10.00',
             'currency'      => 'AUD',
             'transactionId' => 'XYZ100',
             'card'          => $card,
         ]
     );
- 
+
     $response = $transaction->send();
- 
+
     if ($response->isSuccessful()) {
         echo sprintf('Transaction %s was successful!', $response->getTransactionReference());
     } else {

composer.json

@@ -1,45 +1,45 @@
 {
-    "name": "sudiptpa/omnipay-nabtransact",
-    "type": "library",
-    "description": "NAB Transact driver for the Omnipay payment processing library",
-    "keywords": [
-        "gateway",
-        "merchant",
-        "omnipay",
-        "pay",
-        "payment",
-        "nabtransact"
-    ],
-    "homepage": "https://github.com/sudiptpa/nabtransact",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Sujip Thapa",
-            "email": "sudiptpa@gmail.com"
-        }
-    ],
-    "autoload": {
-        "psr-4": { 
-            "Omnipay\\NABTransact\\" : "src/"
-        }
-    },
-    "require": {
-        "cweagans/composer-patches": "~1.6",
-        "omnipay/common": "~2.3"
-    },
-    "require-dev": {
-        "omnipay/tests": "~2.0",
-        "satooshi/php-coveralls": "1.0.0",
-        "fzaninotto/faker": "~1.4"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        },
-        "patches": {
-            "guzzle/guzzle": {
-                "Update CA": "patches/guzzle-guzzle-update-cacert.patch"
-            }
-        }
-    }
-}
+   "name":"sudiptpa/omnipay-nabtransact",
+   "type":"library",
+   "description":"National Australia Bank (NAB) Transact driver for the Omnipay payment processing library.",
+   "keywords":[
+      "gateway",
+      "merchant",
+      "omnipay",
+      "pay",
+      "payment",
+      "nabtransact"
+   ],
+   "homepage":"https://github.com/sudiptpa/nabtransact",
+   "license":"MIT",
+   "authors":[
+      {
+         "name":"Sujip Thapa",
+         "email":"sudiptpa@gmail.com"
+      }
+   ],
+   "autoload":{
+      "psr-4":{
+         "Omnipay\\NABTransact\\":"src/"
+      }
+   },
+   "require":{
+      "omnipay/common":"^3"
+   },
+   "require-dev":{
+      "omnipay/tests":"^3",
+      "squizlabs/php_codesniffer":"^3",
+      "phpro/grumphp":"^0.14.0"
+   },
+   "extra":{
+      "branch-alias":{
+         "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]

index.php

@@ -12,22 +12,21 @@
 
 $gateway->setTestMode(true);
 
-$card = new CreditCard(array(
+$card = new CreditCard([
     'firstName'   => 'Sujip',
     'lastName'    => 'Thapa',
     'number'      => '4444333322221111',
-    'expiryMonth' => '10',
-    'expiryYear'  => '2030',
+    'expiryMonth' => '12',
+    'expiryYear'  => date('Y'),
     'cvv'         => '123',
-));
+]);
 
-$response = $gateway->purchase(array(
+$response = $gateway->purchase([
     'amount'        => '12.00',
-    'transactionId' => 'ORDER-ZYX8',
+    'transactionId' => 'ORDER-ZYX8789',
     'currency'      => 'AUD',
     'card'          => $card,
-))
-    ->send();
+])->send();
 
 $message = sprintf(
     'Transaction with reference code  (%s) - %s',