Merge branch 'upgrading-v3' of https://github.com/sudiptpa/omnipay-nabtransact into upgrading-v3

sudiptpa · sudiptpa · commit 0203b02299f5 · 2018-05-26T09:53:48.000+05:45
diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__.'/vendor/autoload.php';
 
 use Omnipay\Common\CreditCard;
 use Omnipay\Omnipay;
@@ -13,19 +13,19 @@
 $gateway->setTestMode(true);
 
 $card = new CreditCard([
-    'firstName' => 'Sujip',
-    'lastName' => 'Thapa',
-    'number' => '4444333322221111',
+    'firstName'   => 'Sujip',
+    'lastName'    => 'Thapa',
+    'number'      => '4444333322221111',
     'expiryMonth' => '12',
-    'expiryYear' => date('Y'),
-    'cvv' => '123',
+    'expiryYear'  => date('Y'),
+    'cvv'         => '123',
 ]);
 
 $response = $gateway->purchase([
-    'amount' => '12.00',
+    'amount'        => '12.00',
     'transactionId' => 'ORDER-ZYX8789',
-    'currency' => 'AUD',
-    'card' => $card,
+    'currency'      => 'AUD',
+    'card'          => $card,
 ])->send();
 
 $message = sprintf(
diff --git a/src/DirectPostGateway.php b/src/DirectPostGateway.php
@@ -22,9 +22,9 @@ public function getName()
     public function getDefaultParameters()
     {
         return [
-            'merchantId' => '',
+            'merchantId'          => '',
             'transactionPassword' => '',
-            'testMode' => false,
+            'testMode'            => false,
         ];
     }
 
@@ -69,7 +69,7 @@ public function setTransactionPassword($value)
      *
      * @return mixed
      */
-    public function authorize(array $parameters = array())
+    public function authorize(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostAuthorizeRequest', $parameters);
     }
@@ -79,7 +79,7 @@ public function authorize(array $parameters = array())
      *
      * @return mixed
      */
-    public function completeAuthorize(array $parameters = array())
+    public function completeAuthorize(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostCompletePurchaseRequest', $parameters);
     }
@@ -89,7 +89,7 @@ public function completeAuthorize(array $parameters = array())
      *
      * @return mixed
      */
-    public function purchase(array $parameters = array())
+    public function purchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostPurchaseRequest', $parameters);
     }
@@ -99,7 +99,7 @@ public function purchase(array $parameters = array())
      *
      * @return mixed
      */
-    public function completePurchase(array $parameters = array())
+    public function completePurchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostCompletePurchaseRequest', $parameters);
     }
diff --git a/src/HostedPaymentGateway.php b/src/HostedPaymentGateway.php
@@ -14,7 +14,7 @@ class HostedPaymentGateway extends AbstractGateway
      *
      * @return mixed
      */
-    public function completePurchase(array $parameters = array())
+    public function completePurchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\HostedPaymentCompletePurchaseRequest', $parameters);
     }
@@ -37,7 +37,7 @@ public function getName()
      *
      * @return mixed
      */
-    public function purchase(array $parameters = array())
+    public function purchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\HostedPaymentPurchaseRequest', $parameters);
     }
diff --git a/src/Message/HostedPaymentPurchaseRequest.php b/src/Message/HostedPaymentPurchaseRequest.php
@@ -30,7 +30,7 @@ public function getData()
             'paymentAlertEmail'
         );
 
-        $data = array();
+        $data = [];
 
         $data['vendor_name'] = $this->getMerchantId();
         $data['payment_alert'] = $this->getPaymentAlertEmail();
diff --git a/src/SecureXMLGateway.php b/src/SecureXMLGateway.php
@@ -17,9 +17,9 @@ public function getName()
     public function getDefaultParameters()
     {
         return [
-            'merchantId' => '',
+            'merchantId'          => '',
             'transactionPassword' => '',
-            'testMode' => false,
+            'testMode'            => false,
         ];
     }
 
@@ -64,7 +64,7 @@ public function setTransactionPassword($value)
      *
      * @return mixed
      */
-    public function authorize(array $parameters = array())
+    public function authorize(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLAuthorizeRequest', $parameters);
     }
@@ -74,7 +74,7 @@ public function authorize(array $parameters = array())
      *
      * @return mixed
      */
-    public function capture(array $parameters = array())
+    public function capture(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLCaptureRequest', $parameters);
     }
@@ -84,7 +84,7 @@ public function capture(array $parameters = array())
      *
      * @return mixed
      */
-    public function purchase(array $parameters = array())
+    public function purchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLPurchaseRequest', $parameters);
     }
@@ -94,7 +94,7 @@ public function purchase(array $parameters = array())
      *
      * @return mixed
      */
-    public function refund(array $parameters = array())
+    public function refund(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLRefundRequest', $parameters);
     }
@@ -104,7 +104,7 @@ public function refund(array $parameters = array())
      *
      * @return mixed
      */
-    public function echoTest(array $parameters = array())
+    public function echoTest(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLEchoTestRequest', $parameters);
     }
diff --git a/src/UnionPayGateway.php b/src/UnionPayGateway.php
@@ -17,7 +17,7 @@ public function getName()
      *
      * @return mixed
      */
-    public function purchase(array $parameters = array())
+    public function purchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\UnionPayPurchaseRequest', $parameters);
     }
@@ -27,7 +27,7 @@ public function purchase(array $parameters = array())
      *
      * @return mixed
      */
-    public function completePurchase(array $parameters = array())
+    public function completePurchase(array $parameters = [])
     {
         return $this->createRequest('\Omnipay\NABTransact\Message\UnionPayCompletePurchaseRequest', $parameters);
     }
diff --git a/tests/Message/DirectPostAuthorizeRequestTest.php b/tests/Message/DirectPostAuthorizeRequestTest.php
@@ -11,15 +11,15 @@ public function setUp()
         $this->request = new DirectPostAuthorizeRequest($this->getHttpClient(), $this->getHttpRequest());
 
         $this->request->initialize([
-            'merchantId' => 'XYZ0010',
+            'merchantId'          => 'XYZ0010',
             'transactionPassword' => 'abcd1234',
-            'amount' => '12.00',
-            'returnUrl' => 'https://www.abc.com/return',
-            'card' => [
-                'number' => '4444333322221111',
+            'amount'              => '12.00',
+            'returnUrl'           => 'https://www.abc.com/return',
+            'card'                => [
+                'number'      => '4444333322221111',
                 'expiryMonth' => '6',
-                'expiryYear' => '2030',
-                'cvv' => '123',
+                'expiryYear'  => '2030',
+                'cvv'         => '123',
             ],
         ]);
     }
diff --git a/tests/Message/DirectPostCompletePurchaseRequestTest.php b/tests/Message/DirectPostCompletePurchaseRequestTest.php
@@ -14,14 +14,14 @@ public function setUp()
     public function testGenerateResponseFingerprint()
     {
         $this->request->initialize([
-            'amount' => '465.18',
+            'amount'              => '465.18',
             'transactionPassword' => 'abcd1234',
         ]);
 
         $data = [
-            'timestamp' => '20161125123332',
-            'merchant' => 'XYZ0010',
-            'refid' => '222',
+            'timestamp'   => '20161125123332',
+            'merchant'    => 'XYZ0010',
+            'refid'       => '222',
             'summarycode' => '2',
         ];
 
@@ -34,24 +34,24 @@ public function testGenerateResponseFingerprint()
     public function testSuccess()
     {
         $this->request->initialize([
-            'amount' => '12.00',
+            'amount'              => '12.00',
             'transactionPassword' => 'abcd1234',
-            'transactionId' => 'ORDER-ZYX8',
+            'transactionId'       => 'ORDER-ZYX8',
         ]);
 
         $this->getHttpRequest()->query->replace([
-            'timestamp' => '20161125130241',
+            'timestamp'            => '20161125130241',
             'callback_status_code' => '-1',
-            'fingerprint' => 'e30eb8381bc41201fbdf54a021d8228a3fbb6a6f',
-            'txnid' => '271337',
-            'merchant' => 'XYZ0010',
-            'restext' => 'Approved',
-            'rescode' => '00',
-            'expirydate' => '20161126',
-            'settdate' => '20161126',
-            'refid' => 'ORDER-ZYX8',
-            'pan' => '444433...111',
-            'summarycode' => '1',
+            'fingerprint'          => 'e30eb8381bc41201fbdf54a021d8228a3fbb6a6f',
+            'txnid'                => '271337',
+            'merchant'             => 'XYZ0010',
+            'restext'              => 'Approved',
+            'rescode'              => '00',
+            'expirydate'           => '20161126',
+            'settdate'             => '20161126',
+            'refid'                => 'ORDER-ZYX8',
+            'pan'                  => '444433...111',
+            'summarycode'          => '1',
         ]);
 
         $response = $this->request->send();
@@ -68,23 +68,23 @@ public function testSuccess()
     public function testFailure()
     {
         $this->request->initialize([
-            'amount' => '465.18',
+            'amount'              => '465.18',
             'transactionPassword' => 'abcd1234',
         ]);
 
         $this->getHttpRequest()->query->replace([
-            'timestamp' => '20161126051715',
+            'timestamp'            => '20161126051715',
             'callback_status_code' => '404',
-            'fingerprint' => 'cd75e2ef38cf63a2fa390024539acc7691eebc1d',
-            'txnid' => '274279',
-            'merchant' => 'XYZ0010',
-            'restext' => 'Customer Dispute',
-            'rescode' => '18',
-            'expirydate' => '102030',
-            'settdate' => '20161126',
-            'refid' => 'ORDER-ZYX8',
-            'pan' => '444433...111',
-            'summarycode' => '2',
+            'fingerprint'          => 'cd75e2ef38cf63a2fa390024539acc7691eebc1d',
+            'txnid'                => '274279',
+            'merchant'             => 'XYZ0010',
+            'restext'              => 'Customer Dispute',
+            'rescode'              => '18',
+            'expirydate'           => '102030',
+            'settdate'             => '20161126',
+            'refid'                => 'ORDER-ZYX8',
+            'pan'                  => '444433...111',
+            'summarycode'          => '2',
         ]);
 
         $response = $this->request->send();
diff --git a/tests/Message/DirectPostPurchaseRequestTest.php b/tests/Message/DirectPostPurchaseRequestTest.php
@@ -11,15 +11,15 @@ public function setUp()
         $this->request = new DirectPostPurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
 
         $this->request->initialize([
-            'merchantId' => 'XYZ0010',
+            'merchantId'          => 'XYZ0010',
             'transactionPassword' => 'abcd1234',
-            'amount' => '12.00',
-            'returnUrl' => 'https://www.example.com/return',
-            'card' => [
-                'number' => '4444333322221111',
+            'amount'              => '12.00',
+            'returnUrl'           => 'https://www.example.com/return',
+            'card'                => [
+                'number'      => '4444333322221111',
                 'expiryMonth' => '06',
-                'expiryYear' => '2020',
-                'cvv' => '123',
+                'expiryYear'  => '2020',
+                'cvv'         => '123',
             ],
         ]);
     }
diff --git a/tests/Message/SecureXMLAuthorizeRequestTest.php b/tests/Message/SecureXMLAuthorizeRequestTest.php
@@ -11,16 +11,16 @@ public function setUp()
         $this->request = new SecureXMLAuthorizeRequest($this->getHttpClient(), $this->getHttpRequest());
 
         $this->request->initialize([
-            'merchantId' => 'XYZ0010',
+            'merchantId'          => 'XYZ0010',
             'transactionPassword' => 'abcd1234',
-            'testMode' => true,
-            'amount' => '12.00',
-            'transactionId' => '1234',
-            'card' => [
-                'number' => '4444333322221111',
-                'expiryMonth' => '10',
-                'expiryYear' => '2030',
-                'cvv' => '123',
+            'testMode'            => true,
+            'amount'              => '12.00',
+            'transactionId'       => '1234',
+            'card'                => [
+                'number'         => '4444333322221111',
+                'expiryMonth'    => '10',
+                'expiryYear'     => '2030',
+                'cvv'            => '123',
                 'cardHolderName' => 'Sujip Thapa',
             ],
         ]);
diff --git a/tests/Message/SecureXMLEchoTestRequestTest.php b/tests/Message/SecureXMLEchoTestRequestTest.php
@@ -11,9 +11,9 @@ public function setUp()
         $this->request = new SecureXMLEchoTestRequest($this->getHttpClient(), $this->getHttpRequest());
 
         $this->request->initialize([
-            'merchantId' => 'XYZ0010',
+            'merchantId'          => 'XYZ0010',
             'transactionPassword' => 'abcd1234',
-            'testMode' => true,
+            'testMode'            => true,
         ]);
     }
 
diff --git a/tests/Message/SecureXMLPurchaseRequestTest.php b/tests/Message/SecureXMLPurchaseRequestTest.php
@@ -11,16 +11,16 @@ public function setUp()
         $this->request = new SecureXMLPurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
 
         $this->request->initialize([
-            'merchantId' => 'XYZ0010',
+            'merchantId'          => 'XYZ0010',
             'transactionPassword' => 'abcd1234',
-            'testMode' => true,
-            'amount' => '12.00',
-            'transactionId' => '1234',
-            'card' => [
-                'number' => '4444333322221111',
-                'expiryMonth' => '10',
-                'expiryYear' => '2030',
-                'cvv' => '123',
+            'testMode'            => true,
+            'amount'              => '12.00',
+            'transactionId'       => '1234',
+            'card'                => [
+                'number'         => '4444333322221111',
+                'expiryMonth'    => '10',
+                'expiryYear'     => '2030',
+                'cvv'            => '123',
                 'cardHolderName' => 'Sujip Thapa',
             ],
         ]);
diff --git a/tests/Message/UnionPayPurchaseRequestTest.php b/tests/Message/UnionPayPurchaseRequestTest.php

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ public function getName()`
`22`	`22`	`public function getDefaultParameters()`
`23`	`23`	`{`
`24`	`24`	`return [`
`25`		`- 'merchantId' => '',`
	`25`	`+ 'merchantId' => '',`
`26`	`26`	`'transactionPassword' => '',`
`27`		`- 'testMode' => false,`
	`27`	`+ 'testMode' => false,`
`28`	`28`	`];`
`29`	`29`	`}`
`30`	`30`
`@@ -69,7 +69,7 @@ public function setTransactionPassword($value)`
`69`	`69`	`*`
`70`	`70`	`* @return mixed`
`71`	`71`	`*/`
`72`		`- public function authorize(array $parameters = array())`
	`72`	`+ public function authorize(array $parameters = [])`
`73`	`73`	`{`
`74`	`74`	`return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostAuthorizeRequest', $parameters);`
`75`	`75`	`}`
`@@ -79,7 +79,7 @@ public function authorize(array $parameters = array())`
`79`	`79`	`*`
`80`	`80`	`* @return mixed`
`81`	`81`	`*/`
`82`		`- public function completeAuthorize(array $parameters = array())`
	`82`	`+ public function completeAuthorize(array $parameters = [])`
`83`	`83`	`{`
`84`	`84`	`return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostCompletePurchaseRequest', $parameters);`
`85`	`85`	`}`
`@@ -89,7 +89,7 @@ public function completeAuthorize(array $parameters = array())`
`89`	`89`	`*`
`90`	`90`	`* @return mixed`
`91`	`91`	`*/`
`92`		`- public function purchase(array $parameters = array())`
	`92`	`+ public function purchase(array $parameters = [])`
`93`	`93`	`{`
`94`	`94`	`return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostPurchaseRequest', $parameters);`
`95`	`95`	`}`
`@@ -99,7 +99,7 @@ public function purchase(array $parameters = array())`
`99`	`99`	`*`
`100`	`100`	`* @return mixed`
`101`	`101`	`*/`
`102`		`- public function completePurchase(array $parameters = array())`
	`102`	`+ public function completePurchase(array $parameters = [])`
`103`	`103`	`{`
`104`	`104`	`return $this->createRequest('\Omnipay\NABTransact\Message\DirectPostCompletePurchaseRequest', $parameters);`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class HostedPaymentGateway extends AbstractGateway`
`14`	`14`	`*`
`15`	`15`	`* @return mixed`
`16`	`16`	`*/`
`17`		`- public function completePurchase(array $parameters = array())`
	`17`	`+ public function completePurchase(array $parameters = [])`
`18`	`18`	`{`
`19`	`19`	`return $this->createRequest('\Omnipay\NABTransact\Message\HostedPaymentCompletePurchaseRequest', $parameters);`
`20`	`20`	`}`
`@@ -37,7 +37,7 @@ public function getName()`
`37`	`37`	`*`
`38`	`38`	`* @return mixed`
`39`	`39`	`*/`
`40`		`- public function purchase(array $parameters = array())`
	`40`	`+ public function purchase(array $parameters = [])`
`41`	`41`	`{`
`42`	`42`	`return $this->createRequest('\Omnipay\NABTransact\Message\HostedPaymentPurchaseRequest', $parameters);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ public function getName()`
`17`	`17`	`public function getDefaultParameters()`
`18`	`18`	`{`
`19`	`19`	`return [`
`20`		`- 'merchantId' => '',`
	`20`	`+ 'merchantId' => '',`
`21`	`21`	`'transactionPassword' => '',`
`22`		`- 'testMode' => false,`
	`22`	`+ 'testMode' => false,`
`23`	`23`	`];`
`24`	`24`	`}`
`25`	`25`
`@@ -64,7 +64,7 @@ public function setTransactionPassword($value)`
`64`	`64`	`*`
`65`	`65`	`* @return mixed`
`66`	`66`	`*/`
`67`		`- public function authorize(array $parameters = array())`
	`67`	`+ public function authorize(array $parameters = [])`
`68`	`68`	`{`
`69`	`69`	`return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLAuthorizeRequest', $parameters);`
`70`	`70`	`}`
`@@ -74,7 +74,7 @@ public function authorize(array $parameters = array())`
`74`	`74`	`*`
`75`	`75`	`* @return mixed`
`76`	`76`	`*/`
`77`		`- public function capture(array $parameters = array())`
	`77`	`+ public function capture(array $parameters = [])`
`78`	`78`	`{`
`79`	`79`	`return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLCaptureRequest', $parameters);`
`80`	`80`	`}`
`@@ -84,7 +84,7 @@ public function capture(array $parameters = array())`
`84`	`84`	`*`
`85`	`85`	`* @return mixed`
`86`	`86`	`*/`
`87`		`- public function purchase(array $parameters = array())`
	`87`	`+ public function purchase(array $parameters = [])`
`88`	`88`	`{`
`89`	`89`	`return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLPurchaseRequest', $parameters);`
`90`	`90`	`}`
`@@ -94,7 +94,7 @@ public function purchase(array $parameters = array())`
`94`	`94`	`*`
`95`	`95`	`* @return mixed`
`96`	`96`	`*/`
`97`		`- public function refund(array $parameters = array())`
	`97`	`+ public function refund(array $parameters = [])`
`98`	`98`	`{`
`99`	`99`	`return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLRefundRequest', $parameters);`
`100`	`100`	`}`
`@@ -104,7 +104,7 @@ public function refund(array $parameters = array())`
`104`	`104`	`*`
`105`	`105`	`* @return mixed`
`106`	`106`	`*/`
`107`		`- public function echoTest(array $parameters = array())`
	`107`	`+ public function echoTest(array $parameters = [])`
`108`	`108`	`{`
`109`	`109`	`return $this->createRequest('\Omnipay\NABTransact\Message\SecureXMLEchoTestRequest', $parameters);`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function getName()`
`17`	`17`	`*`
`18`	`18`	`* @return mixed`
`19`	`19`	`*/`
`20`		`- public function purchase(array $parameters = array())`
	`20`	`+ public function purchase(array $parameters = [])`
`21`	`21`	`{`
`22`	`22`	`return $this->createRequest('\Omnipay\NABTransact\Message\UnionPayPurchaseRequest', $parameters);`
`23`	`23`	`}`
`@@ -27,7 +27,7 @@ public function purchase(array $parameters = array())`
`27`	`27`	`*`
`28`	`28`	`* @return mixed`
`29`	`29`	`*/`
`30`		`- public function completePurchase(array $parameters = array())`
	`30`	`+ public function completePurchase(array $parameters = [])`
`31`	`31`	`{`
`32`	`32`	`return $this->createRequest('\Omnipay\NABTransact\Message\UnionPayCompletePurchaseRequest', $parameters);`
`33`	`33`	`}`