Merge remote-tracking branch 'upstream/master'

Author: Vladislav Veselinov

.travis.yml

@@ -3,14 +3,18 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 
 env:
-  - SYMFONY_VERSION="2.1.*"
-  - SYMFONY_VERSION="2.2.*"
+  - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.1"
+  - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.1"
+  - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.*"
+  - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.*"
 
 before_script:
   - composer self-update
   - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-update
+  - composer require guzzle/http:${GUZZLE_VERSION} --no-update
   - composer install -n --dev --prefer-source
 
 script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog :zap:
+
+# v1.0.1 (2013-06-29)
+
+* Added Buckaroo gateway
+* Added eWAY Rapid 3.0 gateway
+* Added `getRedirectResponse()` method to `AbstractResponse`
+* A few minor bug fixes & typos
+
+# v1.0.0 (2013-06-24)
+
+`amount` is now specified as a decimal (i.e. `'10.00'` instead of `1000`
+to represent $10.00. Passing integers will throw an exception, reminding you
+to update your application code. To be clear, that means instead of this:
+
+    $gateway->purchase(array('amount' => 1000, 'currency' => 'USD'));
+
+You must now create the request like so:
+
+    $gateway->purchase(array('amount' => '10.00', 'currency' => 'USD'));
+
+This should avoid any further confusion over how to specify the amount.
+
+*   Added Mollie payment gateway
+*   Added `notifyUrl` and `issuer` fields to example app

README.md

@@ -19,6 +19,11 @@ is fully unit tested, and even comes with an example application to get you star
 * Because most payment gateways have exceptionally poor documentation
 * Because you are writing a shopping cart and need to support multiple gateways
 
+**Important Note: Upgrading from <1.0**
+
+If you are upgrading from a pre-1.0 version of Omnipay, please note that the currency format has changed.
+See the [changelog](https://github.com/adrianmacneil/omnipay/blob/master/CHANGELOG.md) for more details.
+
 ## TL;DR
 
 Just want to see some code?
@@ -30,7 +35,7 @@ $gateway = GatewayFactory::create('Stripe');
 $gateway->setApiKey('abc123');
 
 $formData = ['number' => '4242424242424242', 'expiryMonth' => '6', 'expiryYear' => '2016', 'cvv' => '123'];
-$response = $gateway->purchase(['amount' => 1000, 'currency' => 'USD', 'card' => $formData])->send();
+$response = $gateway->purchase(['amount' => '10.00', 'currency' => 'USD', 'card' => $formData])->send();
 
 if ($response->isSuccessful()) {
     // payment was successful: update database
@@ -66,7 +71,7 @@ to your `composer.json` file:
 ```json
 {
     "require": {
-        "omnipay/omnipay": "0.9.*"
+        "omnipay/omnipay": "1.*"
     }
 }
 ```
@@ -86,12 +91,15 @@ The following gateways are already implemented:
 * 2Checkout
 * Authorize.Net AIM
 * Authorize.Net SIM
+* Buckaroo
 * CardSave
 * Dummy
+* eWAY Rapid 3.0
 * GoCardless
 * Manual
 * Migs 2-Party
 * Migs 3-Party
+* Mollie
 * Netaxept (BBS)
 * Netbanx
 * PayFast
@@ -107,9 +115,6 @@ The following gateways are already implemented:
 * Stripe
 * WorldPay
 
-More are coming soon! [All of these](https://github.com/expressodev/ci-merchant/tree/develop/libraries/merchant)
-will be implemented before we reach 1.0.
-
 Gateways are created and initialized like so:
 
 ```php
@@ -251,7 +256,7 @@ Pass the options through to the method like so:
 ```php
 $card = new CreditCard($formData);
 $request = $gateway->authorize([
-    'amount' => 1000, // this represents $10.00
+    'amount' => '10.00', // this represents $10.00
     'card' => $card,
     'returnUrl' => 'https://www.example.com/return',
 ]);
@@ -280,7 +285,7 @@ For a successful responses, a reference will normally be generated, which can be
 at a later date. The following methods are always available:
 
 ```php
-$response = $gateway->purchase(['amount' => 1000, 'card' => $card])->send();
+$response = $gateway->purchase(['amount' => '10.00', 'card' => $card])->send();
 
 $response->isSuccessful(); // is the response successful?
 $response->isRedirect(); // is the response a redirect?
@@ -298,7 +303,7 @@ POST (FormRedirectResponse). These could potentially be combined into a single r
 After processing a payment, the cart should check whether the response requires a redirect, and if so, redirect accordingly:
 
 ```php
-$response = $gateway->purchase(['amount' => 1000, 'card' => $card])->send();
+$response = $gateway->purchase(['amount' => '10.00', 'card' => $card])->send();
 if ($response->isSuccessful()) {
     // payment is complete
 } elseif ($response->isRedirect()) {
@@ -331,7 +336,7 @@ You can handle both scenarios by wrapping the entire request in a try-catch bloc
 
 ```php
 try {
-    $response = $gateway->purchase(['amount' => 1000, 'card' => $card])->send();
+    $response = $gateway->purchase(['amount' => '10.00', 'card' => $card])->send();
     if ($response->isSuccessful()) {
         // mark order as complete
     } elseif ($response->isRedirect()) {
@@ -358,7 +363,7 @@ are available:
 
 Once you have a `cardReference`, you can use it instead of the `card` parameter when creating a charge:
 
-    $gateway->purchase(['amount' => 1000, 'cardReference' => 'abc']);
+    $gateway->purchase(['amount' => '10.00', 'cardReference' => 'abc']);
 
 ## Recurring Billing
 

composer.json

@@ -1,12 +1,45 @@
 {
     "name": "omnipay/omnipay",
     "type": "library",
-    "description": "Omnipay is a framework agnostic multi-gateway payment processing library",
+    "description": "A framework agnostic, multi-gateway payment processing library",
     "keywords": [
-        "payment", "gateway", "merchant", "authorize", "purchase", "authorize.net",
-        "auth.net", "cardsave", "gocardless", "netaxept", "payflow", "dps", "paymentexpress",
-        "paypal", "pin", "sagepay", "sage pay", "stripe", "2co", "2checkout", "twocheckout",
-        "worldpay", "tala", "tala-payments"],
+        "2checkout",
+        "2co",
+        "auth.net",
+        "authorize",
+        "authorize.net",
+        "buckaroo",
+        "cardsave",
+        "commweb",
+        "dps",
+        "egate",
+        "eway",
+        "express",
+        "gateway",
+        "gocardless",
+        "ideal",
+        "merchant",
+        "migs",
+        "mollie",
+        "netaxept",
+        "netbanx",
+        "pay",
+        "payfast",
+        "payflow",
+        "payment",
+        "paymentexpress",
+        "paypal",
+        "pin",
+        "purchase",
+        "rapid",
+        "sagepay",
+        "securepay",
+        "stripe",
+        "tala",
+        "tala-payments",
+        "twocheckout",
+        "worldpay"
+    ],
     "homepage": "https://github.com/adrianmacneil/omnipay",
     "license": "MIT",
     "authors": [
@@ -20,11 +53,11 @@
     },
     "require": {
         "php": ">=5.3.2",
-        "guzzle/http": "~3.0",
+        "guzzle/http": "~3.1",
         "symfony/http-foundation": "~2.1"
     },
     "require-dev": {
-        "guzzle/plugin-mock": "~3.0",
+        "guzzle/plugin-mock": "~3.1",
         "mockery/mockery": "~0.7",
         "phpunit/phpunit": "~3.7.16",
         "silex/silex": "1.0.*@dev",

example/views/request.twig

@@ -14,7 +14,7 @@ $response = $gateway->{{ method }}($params);</pre>
         <p>The following parameters are available. Not all options are required by all gateways.</p>
         <p><span class="label label-info">Note</span> Normally these parameters would be generated by your application and not set via form input.</p>
 
-        {% for key in ["amount", "currency", "description", "transactionId", "transactionReference", "cardReference", "returnUrl", "cancelUrl"] %}
+        {% for key in ["amount", "currency", "description", "transactionId", "transactionReference", "cardReference", "returnUrl", "cancelUrl", "notifyUrl", "issuer"] %}
 
             <div class="control-group">
                 <label class="control-label" for="params_{{key}}">{{ key }}</label>

src/Omnipay/AuthorizeNet/Message/AbstractRequest.php

@@ -77,7 +77,7 @@ protected function getBaseData()
     protected function getBillingData()
     {
         $data = array();
-        $data['x_amount'] = $this->getAmountDecimal();
+        $data['x_amount'] = $this->getAmount();
         $data['x_invoice_num'] = $this->getTransactionId();
         $data['x_description'] = $this->getDescription();
 

src/Omnipay/AuthorizeNet/Message/CaptureRequest.php

@@ -23,7 +23,7 @@ public function getData()
         $this->validate('amount', 'transactionReference');
 
         $data = $this->getBaseData();
-        $data['x_amount'] = $this->getAmountDecimal();
+        $data['x_amount'] = $this->getAmount();
         $data['x_trans_id'] = $this->getTransactionReference();
 
         return $data;

src/Omnipay/AuthorizeNet/Message/SIMCompleteAuthorizeRequest.php

@@ -29,7 +29,7 @@ public function getData()
 
     public function getHash()
     {
-        return md5($this->getApiLoginId().$this->getTransactionId().$this->getAmountDecimal());
+        return md5($this->getApiLoginId().$this->getTransactionId().$this->getAmount());
     }
 
     public function send()

src/Omnipay/Buckaroo/Gateway.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Omnipay package.
+ *
+ * (c) Adrian Macneil <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Omnipay\Buckaroo;
+
+use Omnipay\Common\AbstractGateway;
+
+/**
+ * Buckaroo Gateway
+ */
+class Gateway extends AbstractGateway
+{
+    public function getName()
+    {
+        return 'Buckaroo';
+    }
+
+    public function getDefaultParameters()
+    {
+        return array(
+            'merchantId' => '',
+            'secret' => '',
+            'testMode' => false,
+        );
+    }
+
+    public function getMerchantId()
+    {
+        return $this->getParameter('merchantId');
+    }
+
+    public function setMerchantId($value)
+    {
+        return $this->setParameter('merchantId', $value);
+    }
+
+    public function getSecret()
+    {
+        return $this->getParameter('secret');
+    }
+
+    public function setSecret($value)
+    {
+        return $this->setParameter('secret', $value);
+    }
+
+    public function purchase(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Buckaroo\Message\PurchaseRequest', $parameters);
+    }
+
+    public function completePurchase(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Buckaroo\Message\CompletePurchaseRequest', $parameters);
+    }
+}

src/Omnipay/Buckaroo/Message/CompletePurchaseRequest.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Omnipay package.
+ *
+ * (c) Adrian Macneil <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Omnipay\Buckaroo\Message;
+
+use Omnipay\Common\Exception\InvalidRequestException;
+
+/**
+ * Buckaroo Complete Purchase Request
+ */
+class CompletePurchaseRequest extends PurchaseRequest
+{
+    public function getData()
+    {
+        $this->validate('merchantId', 'secret', 'amount');
+
+        if (strtolower($this->httpRequest->request->get('bpe_signature2')) !== $this->generateResponseSignature()) {
+            throw new InvalidRequestException('Incorrect signature');
+        }
+
+        return $this->httpRequest->request->all();
+    }
+
+    public function generateResponseSignature()
+    {
+        return md5(
+            $this->httpRequest->request->get('bpe_trx').
+            $this->httpRequest->request->get('bpe_timestamp').
+            $this->getMerchantId().
+            $this->getTransactionId().
+            $this->getCurrency().
+            $this->getAmountInteger().
+            $this->httpRequest->request->get('bpe_result').
+            (int) $this->getTestMode().
+            $this->getSecret()
+        );
+    }
+
+    public function send()
+    {
+        return $this->response = new CompletePurchaseResponse($this, $this->getData());
+    }
+}