Merge remote-tracking branch 'upstream/master'

Author: Maksim Rafalko

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.3.3
   - 5.3
   - 5.4
 

README.md

@@ -64,7 +64,7 @@ to your `composer.json` file:
 ```json
 {
     "require": {
-        "omnipay/omnipay": "0.8.*"
+        "omnipay/omnipay": "0.9.*"
     }
 }
 ```
@@ -254,9 +254,6 @@ $request = $gateway->authorize([
 ]);
 ```
 
-For most transactions, either the `card` or `token` parameter is required. For more information on
-using tokens, see the Token Billing section below.
-
 When calling the `completeAuthorize` or `completePurchase` methods, the exact same arguments should be provided as
 when you made the initial `authorize` or `purchase` call (some gateways will need to verify for example the actual
 amount paid equals the amount requested). The only parameter you can omit is `card`.
@@ -348,13 +345,18 @@ try {
 
 ## Token Billing
 
-Token billing is still under development. Most likely gateways will be able to implement the
-following methods:
+Token billing allows you to store a credit card with your gateway, and charge it at a later date.
+Token billing is not supported by all gateways. For supported gateways, the following methods
+are available:
 
-* `createCard($options)` - returns a response object which includes a `token`, which can be used for future transactions
+* `createCard($options)` - returns a response object which includes a `cardReference`, which can be used for future transactions
 * `updateCard($options)` - update a stored card, not all gateways support this method
 * `deleteCard($options)` - remove a stored card, not all gateways support this method
 
+Once you have a `cardReference`, you can use it instead of the `card` parameter when creating a charge:
+
+    $gateway->purchase(['amount' => 1000, 'cardReference' => 'abc']);
+
 ## Recurring Billing
 
 At this stage, automatic recurring payments functionality is out of scope for this library.

src/Omnipay/Common/Message/AbstractRequest.php

@@ -134,21 +134,21 @@ public function getCard()
 
     public function setCard($value)
     {
-        if (!$value instanceof CreditCard) {
+        if ($value && !$value instanceof CreditCard) {
             $value = new CreditCard($value);
         }
 
         return $this->setParameter('card', $value);
     }
 
-    public function getCardToken()
+    public function getToken()
     {
-        return $this->getParameter('cardToken');
+        return $this->getParameter('token');
     }
 
-    public function setCardToken($value)
+    public function setToken($value)
     {
-        return $this->setParameter('cardToken', $value);
+        return $this->setParameter('token', $value);
     }
 
     public function getCardReference()

src/Omnipay/PayPal/ExpressGateway.php

@@ -30,6 +30,7 @@ public function getDefaultParameters()
         $settings = parent::getDefaultParameters();
         $settings['solutionType'] = array('Sole', 'Mark');
         $settings['landingPage'] = array('Billing', 'Login');
+        $settings['headerImageUrl'] = '';
 
         return $settings;
     }
@@ -54,6 +55,25 @@ public function setLandingPage($value)
         return $this->setParameter('landingPage', $value);
     }
 
+    public function getHeaderImageUrl()
+    {
+        return $this->getParameter('headerImageUrl');
+    }
+
+    /**
+     * Header Image URL (Optional)
+     *
+     * URL for the image you want to appear at the top left of the payment page.
+     * The image has a maximum size of 750 pixels wide by 90 pixels high.
+     * PayPal recommends that you provide an image that is stored on a secure (https) server.
+     * If you do not specify an image, the business name displays.
+     * Character length and limitations: 127 single-byte alphanumeric characters
+     */
+    public function setHeaderImageUrl($value)
+    {
+        return $this->setParameter('headerImageUrl', $value);
+    }
+
     public function authorize(array $parameters = array())
     {
         return $this->createRequest('\Omnipay\PayPal\Message\ExpressAuthorizeRequest', $parameters);

src/Omnipay/PayPal/Message/AbstractRequest.php

@@ -69,6 +69,16 @@ public function setLandingPage($value)
         return $this->setParameter('landingPage', $value);
     }
 
+    public function getHeaderImageUrl()
+    {
+        return $this->getParameter('headerImageUrl');
+    }
+
+    public function setHeaderImageUrl($value)
+    {
+        return $this->setParameter('headerImageUrl', $value);
+    }
+
     protected function getBaseData($method)
     {
         $data = array();

src/Omnipay/PayPal/Message/ExpressAuthorizeRequest.php

@@ -36,6 +36,10 @@ public function getData()
         $data['RETURNURL'] = $this->getReturnUrl();
         $data['CANCELURL'] = $this->getCancelUrl();
 
+        if ($headerImageUrl = $this->getHeaderImageUrl()) {
+            $data['HDRIMG'] = $headerImageUrl;
+        }
+
         if ($card = $this->getCard()) {
             $data['PAYMENTREQUEST_0_SHIPTONAME'] = $card->getName();
             $data['PAYMENTREQUEST_0_SHIPTOSTREET'] = $card->getAddress1();

src/Omnipay/Stripe/Gateway.php

@@ -44,6 +44,16 @@ public function setApiKey($value)
         return $this->setParameter('apiKey', $value);
     }
 
+    public function authorize(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\AuthorizeRequest', $parameters);
+    }
+
+    public function capture(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\CaptureRequest', $parameters);
+    }
+
     public function purchase(array $parameters = array())
     {
         return $this->createRequest('\Omnipay\Stripe\Message\PurchaseRequest', $parameters);

src/Omnipay/Stripe/Message/AbstractRequest.php

@@ -0,0 +1,98 @@
+<?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\Stripe\Message;
+
+/**
+ * Stripe Abstract Request
+ */
+abstract class AbstractRequest extends \Omnipay\Common\Message\AbstractRequest
+{
+    protected $endpoint = 'https://api.stripe.com/v1';
+
+    public function getApiKey()
+    {
+        return $this->getParameter('apiKey');
+    }
+
+    public function setApiKey($value)
+    {
+        return $this->setParameter('apiKey', $value);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function getCardToken()
+    {
+        return $this->getParameter('token');
+    }
+
+    /**
+     * @deprecated
+     */
+    public function setCardToken($value)
+    {
+        return $this->setParameter('token', $value);
+    }
+
+    abstract public function getEndpoint();
+
+    public function getHttpMethod()
+    {
+        return 'POST';
+    }
+
+    public function send()
+    {
+        // don't throw exceptions for 4xx errors
+        $this->httpClient->getEventDispatcher()->addListener(
+            'request.error',
+            function ($event) {
+                if ($event['response']->isClientError()) {
+                    $event->stopPropagation();
+                }
+            }
+        );
+
+        $httpRequest = $this->httpClient->createRequest(
+            $this->getHttpMethod(),
+            $this->getEndpoint(),
+            null,
+            $this->getData()
+        );
+        $httpResponse = $httpRequest
+            ->setHeader('Authorization', 'Basic '.base64_encode($this->getApiKey().':'))
+            ->send();
+
+        return $this->response = new Response($this, $httpResponse->json());
+    }
+
+    protected function getCardData()
+    {
+        $this->getCard()->validate();
+
+        $data = array();
+        $data['number'] = $this->getCard()->getNumber();
+        $data['exp_month'] = $this->getCard()->getExpiryMonth();
+        $data['exp_year'] = $this->getCard()->getExpiryYear();
+        $data['cvc'] = $this->getCard()->getCvv();
+        $data['name'] = $this->getCard()->getName();
+        $data['address_line1'] = $this->getCard()->getAddress1();
+        $data['address_line2'] = $this->getCard()->getAddress2();
+        $data['address_city'] = $this->getCard()->getCity();
+        $data['address_zip'] = $this->getCard()->getPostcode();
+        $data['address_state'] = $this->getCard()->getState();
+        $data['address_country'] = $this->getCard()->getCountry();
+
+        return $data;
+    }
+}

src/Omnipay/Stripe/Message/AuthorizeRequest.php

@@ -0,0 +1,47 @@
+<?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\Stripe\Message;
+
+/**
+ * Stripe Authorize Request
+ */
+class AuthorizeRequest extends AbstractRequest
+{
+    public function getData()
+    {
+        $this->validate('amount', 'currency');
+
+        $data = array();
+        $data['amount'] = $this->getAmount();
+        $data['currency'] = strtolower($this->getCurrency());
+        $data['description'] = $this->getDescription();
+        $data['capture'] = 'false';
+
+        if ($this->getCardReference()) {
+            $data['customer'] = $this->getCardReference();
+        } elseif ($this->getToken()) {
+            $data['card'] = $this->getToken();
+        } elseif ($this->getCard()) {
+            $data['card'] = $this->getCardData();
+        } else {
+            // one of cardReference, token, or card is required
+            $this->validate('card');
+        }
+
+        return $data;
+    }
+
+    public function getEndpoint()
+    {
+        return $this->endpoint.'/charges';
+    }
+}

src/Omnipay/Stripe/Message/CaptureRequest.php

@@ -0,0 +1,36 @@
+<?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\Stripe\Message;
+
+/**
+ * Stripe Capture Request
+ */
+class CaptureRequest extends AbstractRequest
+{
+    public function getData()
+    {
+        $this->validate('transactionReference');
+
+        $data = array();
+
+        if ($amount = $this->getAmount()) {
+            $data['amount'] = $amount;
+        }
+
+        return $data;
+    }
+
+    public function getEndpoint()
+    {
+        return $this->endpoint.'/charges/'.$this->getTransactionReference().'/capture';
+    }
+}