Updated code for Omnipay 3

README.md

@@ -2,11 +2,13 @@
 
 **BluePay driver for the Omnipay PHP payment processing library**
 
-[![Build Status](https://travis-ci.org/zburke/omnipay-bluepay.png?branch=master)](https://travis-ci.org/zburke/omnipay-bluepay)
+[![Build Status](https://travis-ci.org/emergingdzns/omnipay-bluepay.png?branch=master)](https://travis-ci.org/emergingdzns/omnipay-bluepay)
 
 [Omnipay](https://github.com/omnipay/omnipay) is a framework agnostic, multi-gateway payment
 processing library for PHP 5.3+. This package implements BluePay support for Omnipay.
 
+This build is a fork of the package from https://github.com/zburke/omnipay-bluepay
+
 ## Installation
 
 Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply add it
@@ -15,7 +17,7 @@ to your `composer.json` file:
 ```json
 {
     "require": {
-        "zburke/omnipay-bluepay": "~1.0"
+        "emergingdzns/omnipay-bluepay": "~2.0"
     }
 }
 ```
@@ -44,5 +46,5 @@ If you want to keep up to date with release anouncements, discuss ideas for the
 or ask more detailed questions, there is also a [mailing list](https://groups.google.com/forum/#!forum/omnipay) which
 you can subscribe to.
 
-If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/zburke/omnipay-bluepay/issues),
+If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/emergingdzns/omnipay-bluepay/issues),
 or better yet, fork the library and submit a pull request.

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "zburke/omnipay-bluepay",
+    "name": "emergingdzns/omnipay-bluepay",
     "type": "library",
     "description": "BluePay gateway for the Omnipay payment processing library",
     "keywords": [
@@ -10,7 +10,7 @@
         "pay",
         "payment"
     ],
-    "homepage": "https://github.com/zburke/omnipay-bluepay",
+    "homepage": "https://github.com/emergingdzns/omnipay-bluepay",
     "license": "MIT",
     "authors": [
         {
@@ -19,17 +19,17 @@
         },
         {
             "name": "Omnipay Contributors",
-            "homepage": "https://github.com/zburke/omnipay-bluepay/contributors"
+            "homepage": "https://github.com/emergingdzns/omnipay-bluepay/contributors"
         }
     ],
     "autoload": {
         "psr-4": { "Omnipay\\BluePay\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.0"
+        "omnipay/common": "~3"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "~3"
     },
     "extra": {
         "branch-alias": {

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/Gateway.php

@@ -37,6 +37,10 @@ public function getDefaultParameters()
         );
     }
 
+    public function setCard($value)
+    {
+        return $this->setParameter('card', $value);
+    }
 
     public function getAccountId()
     {

src/Message/AbstractRequest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Log;
 namespace Omnipay\BluePay\Message;
 
 /**
@@ -35,7 +36,6 @@ public function setSecretKey($value)
         return $this->setParameter('secretKey', $value);
     }
 
-
     public function getToken()
     {
         return $this->getParameter('token');
@@ -185,21 +185,12 @@ public function tps($data)
 
     public function sendData($data)
     {
-        // don't throw exceptions for 4xx errors
-        // cribbed from https://github.com/thephpleague/omnipay-stripe/blob/master/src/Message/AbstractRequest.php
         // Fist add in my tamper-proof-seal
         $data = array_merge($data, $this->tps($data));
-        $this->httpClient->getEventDispatcher()->addListener(
-            'request.error',
-            function ($event) {
-                if ($event['response']->isClientError()) {
-                    $event->stopPropagation();
-                }
-            }
-        );
 
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, $data)->send();
-        return $this->response = new Response($this, $httpResponse->getBody());
+        $httpResponse = $this->httpClient->request('POST', $this->getEndpoint(), [], http_build_query($data));
+
+        return $this->response = new Response($this, $httpResponse->getBody()->getContents());
     }
 
 

src/Message/RefundRequest.php

@@ -11,12 +11,11 @@ class RefundRequest extends AbstractRequest
 
     public function getData()
     {
-        $this->getCard()->validate();
+
+        $this->validate('transactionReference', 'amount');
 
         $data = $this->getBaseData();
-        $data['PAYMENT_ACCOUNT'] = $this->getCard()->getNumber();
-        $data['CARD_EXPIRE'] = $this->getCard()->getExpiryDate('my');
-        $data['CARD_CVV2'] = $this->getCard()->getCvv();
+        $data['MASTER_ID'] = $this->getParameter('transactionReference');
 
         return array_merge($data, $this->getBillingData());
     }