Merge pull request #1 from dpfaffenbauer/master

Rename namespaces to OmnipayV3Bridge and refactoring to support Omnipay 3.0

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
+  - 7.0
+  - 7.1
   - hhvm
   - nightly
 

composer.json

@@ -1,9 +1,9 @@
 {
-    "name": "payum/omnipay-bridge",
+    "name": "payum/omnipay-v3-bridge",
     "type": "library",
-    "description": "This  bridge allows you to use omnipay gateways but in payum like way.",
+    "description": "This bridge allows you to use omnipay gateways but in payum like way.",
     "keywords": ["payment", "omnipay"],
-    "homepage": "https://github.com/Payum/OmnipayBridge",
+    "homepage": "https://github.com/Payum/OmnipayV3Bridge",
     "license": "MIT",
     "authors": [
         {
@@ -22,24 +22,27 @@
     "require": {
         "php": ">=5.5.0",
         "payum/core": "^1.3",
-        "omnipay/common": "^2.3"
+        "omnipay/common": "^3.0@alpha",
+        "php-http/guzzle6-adapter": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^4",
-        "omnipay/dummy": "^2"
+        "omnipay/dummy": "^3.0@alpha"
     },
     "config": {
         "bin-dir": "bin"
     },
     "autoload": {
-        "psr-4": { "Payum\\OmnipayBridge\\": "src" }
+        "psr-4": { "Payum\\OmnipayV3Bridge\\": "src" }
     },
     "autoload-dev": {
-        "psr-4": { "Payum\\OmnipayBridge\\Tests\\": "tests" }
+        "psr-4": { "Payum\\OmnipayV3Bridge\\Tests\\": "tests" }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/Action/BaseApiAwareAction.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Action;
+namespace Payum\OmnipayV3Bridge\Action;
 
 use Omnipay\Common\GatewayInterface;
 

src/Action/CaptureAction.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Action;
+namespace Payum\OmnipayV3Bridge\Action;
 
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\LogicException;

src/Action/ConvertPaymentAction.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Action;
+namespace Payum\OmnipayV3Bridge\Action;
 
 use Payum\Core\Action\GatewayAwareAction;
 use Payum\Core\Exception\RequestNotSupportedException;

src/Action/NotifyAction.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Payum\OmnipayBridge\Action;
+namespace Payum\OmnipayV3Bridge\Action;
 
 use Omnipay\Common\GatewayInterface;
 use Payum\Core\Action\ActionInterface;

src/Action/OffsiteCaptureAction.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Action;
+namespace Payum\OmnipayV3Bridge\Action;
 
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\RequestNotSupportedException;

src/Action/StatusAction.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Action;
+namespace Payum\OmnipayV3Bridge\Action;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;

src/OmnipayGatewayFactory.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge;
+namespace Payum\OmnipayV3Bridge;
 
 use Omnipay\Common\Exception\OmnipayException;
 use Omnipay\Common\GatewayFactory as OmnipayOmnipayGatewayFactory;
@@ -9,19 +9,14 @@
 use Payum\Core\Exception\LogicException;
 use Payum\Core\GatewayFactory;
 use Payum\Core\GatewayFactoryInterface;
-use Payum\OmnipayBridge\Action\CaptureAction;
-use Payum\OmnipayBridge\Action\ConvertPaymentAction;
-use Payum\OmnipayBridge\Action\NotifyAction;
-use Payum\OmnipayBridge\Action\OffsiteCaptureAction;
-use Payum\OmnipayBridge\Action\StatusAction;
+use Payum\OmnipayV3Bridge\Action\CaptureAction;
+use Payum\OmnipayV3Bridge\Action\ConvertPaymentAction;
+use Payum\OmnipayV3Bridge\Action\NotifyAction;
+use Payum\OmnipayV3Bridge\Action\OffsiteCaptureAction;
+use Payum\OmnipayV3Bridge\Action\StatusAction;
 
 class OmnipayGatewayFactory extends GatewayFactory
 {
-    /**
-     * @var string
-     */
-    private $omnipayGatewayTypeOrClass;
-
     /**
      * @var OmnipayOmnipayGatewayFactory|null
      */
@@ -30,14 +25,12 @@ class OmnipayGatewayFactory extends GatewayFactory
     /**
      * {@inheritDoc}
      *
-     * @param string $omnipayGatewayTypeOrClass
      * @param OmnipayOmnipayGatewayFactory|null $omnipayGatewayFactory
      */
-    public function __construct($omnipayGatewayTypeOrClass = null, OmnipayOmnipayGatewayFactory $omnipayGatewayFactory = null, array $defaultConfig = array(), GatewayFactoryInterface $coreGatewayFactory = null)
+    public function __construct(OmnipayOmnipayGatewayFactory $omnipayGatewayFactory = null, array $defaultConfig = array(), GatewayFactoryInterface $coreGatewayFactory = null)
     {
         parent::__construct($defaultConfig, $coreGatewayFactory);
 
-        $this->omnipayGatewayTypeOrClass = $omnipayGatewayTypeOrClass;
         $this->omnipayGatewayFactory = $omnipayGatewayFactory ?: Omnipay::getFactory();
     }
 
@@ -60,10 +53,6 @@ protected function populateConfig(ArrayObject $config)
                 $config->defaults($config['options']);
             }
 
-            $config->defaults([
-                'type' => $this->omnipayGatewayTypeOrClass,
-            ]);
-
             // omnipay does not provide required options.
             $config['payum.required_options'] = ['type'];
 
@@ -74,9 +63,8 @@ protected function populateConfig(ArrayObject $config)
                     $gateway = $this->omnipayGatewayFactory->create($config['type']);
                 } catch (OmnipayException $e) {
                     throw new LogicException(sprintf(
-                        'Given omnipay gateway type %s or class is not supported. Supported: %s',
-                        $config['type'],
-                        implode(', ', $this->omnipayGatewayFactory->getSupportedGateways())
+                        'Given omnipay gateway type %s or class is not supported.',
+                        $config['type']
                     ), 0, $e);
                 }
 

src/Resources/docs/get-it-started.md

@@ -33,7 +33,8 @@ $payum = (new PayumBuilder())
     // direct payment like Stripe or Authorize.Net
 
     ->addGateway('gatewayName', [
-        'factory' => 'omnipay_stripe',
+        'factory' => 'omnipay',
+        'type' => 'stripe',
         'username' => 'REPLACE IT',
         'password' => 'REPLACE IT',
         'signature' => 'REPLACE IT',
@@ -43,7 +44,8 @@ $payum = (new PayumBuilder())
     // or offsite payment like Paypal ExpressCheckout
 
     ->addGateway('gatewayName', [
-        'factory' => 'omnipay_paypal_express',
+        'factory' => 'omnipay',
+        'type' => 'paypal_express'
         'username' => 'REPLACE IT',
         'password' => 'REPLACE IT',
         'signature' => 'REPLACE IT',

src/Resources/docs/why-should-you-use-this-bridge.md

@@ -35,7 +35,7 @@ use Payum\Core\Model\ArrayObject;
 
 $payum = (new PayumBuilder())
     ->addDefaultStorages()
-    ->addGateway('stripe', ['factory' => 'omnipay_stripe', 'apiKey' => 'abc123'])
+    ->addGateway('stripe', ['factory' => 'omnipay', 'type' => 'stripe', 'apiKey' => 'abc123'])
     ->getPayum()
 ;
 

tests/Action/BaseApiAwareActionTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Tests\Action;
+namespace Payum\OmnipayV3Bridge\Tests\Action;
 
 class BaseApiAwareActionTest extends \PHPUnit_Framework_TestCase
 {
@@ -8,7 +8,7 @@ class BaseApiAwareActionTest extends \PHPUnit_Framework_TestCase
      */
     public function shouldImplementActionInterface()
     {
-        $rc = new \ReflectionClass('Payum\OmnipayBridge\Action\BaseApiAwareAction');
+        $rc = new \ReflectionClass('Payum\OmnipayV3Bridge\Action\BaseApiAwareAction');
 
         $this->assertTrue($rc->isSubclassOf('Payum\Core\Action\ActionInterface'));
     }
@@ -18,7 +18,7 @@ public function shouldImplementActionInterface()
      */
     public function shouldImplementApiAwareInterface()
     {
-        $rc = new \ReflectionClass('Payum\OmnipayBridge\Action\BaseApiAwareAction');
+        $rc = new \ReflectionClass('Payum\OmnipayV3Bridge\Action\BaseApiAwareAction');
 
         $this->assertTrue($rc->isSubclassOf('Payum\Core\ApiAwareInterface'));
     }
@@ -28,7 +28,7 @@ public function shouldImplementApiAwareInterface()
      */
     public function shouldBeAbstract()
     {
-        $rc = new \ReflectionClass('Payum\OmnipayBridge\Action\BaseApiAwareAction');
+        $rc = new \ReflectionClass('Payum\OmnipayV3Bridge\Action\BaseApiAwareAction');
 
         $this->assertTrue($rc->isAbstract());
     }
@@ -40,7 +40,7 @@ public function shouldAllowSetApi()
     {
         $expectedApi = $this->createGatewayMock();
 
-        $action = $this->getMockForAbstractClass('Payum\OmnipayBridge\Action\BaseApiAwareAction');
+        $action = $this->getMockForAbstractClass('Payum\OmnipayV3Bridge\Action\BaseApiAwareAction');
 
         $action->setApi($expectedApi);
 
@@ -54,7 +54,7 @@ public function shouldAllowSetApi()
      */
     public function throwIfUnsupportedApiGiven()
     {
-        $action = $this->getMockForAbstractClass('Payum\OmnipayBridge\Action\BaseApiAwareAction');
+        $action = $this->getMockForAbstractClass('Payum\OmnipayV3Bridge\Action\BaseApiAwareAction');
 
         $action->setApi(new \stdClass);
     }

tests/Action/CaptureActionTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Tests\Action;
+namespace Payum\OmnipayV3Bridge\Tests\Action;
 
 use Omnipay\Common\Message\AbstractResponse as OmnipayAbstractResponse;
 use Omnipay\Common\Message\RequestInterface as OmnipayRequestInterface;
@@ -13,10 +13,10 @@
 use Payum\Core\Security\GenericTokenFactoryAwareInterface;
 use Payum\Core\Security\SensitiveValue;
 use Payum\Core\Tests\GenericActionTest;
-use Payum\OmnipayBridge\Action\BaseApiAwareAction;
-use Payum\OmnipayBridge\Action\CaptureAction;
-use Payum\OmnipayBridge\Tests\CreditCardGateway;
-use Payum\OmnipayBridge\Tests\OffsiteGateway;
+use Payum\OmnipayV3Bridge\Action\BaseApiAwareAction;
+use Payum\OmnipayV3Bridge\Action\CaptureAction;
+use Payum\OmnipayV3Bridge\Tests\CreditCardGateway;
+use Payum\OmnipayV3Bridge\Tests\OffsiteGateway;
 
 class CaptureActionTest extends GenericActionTest
 {

tests/Action/ConvertPaymentActionTest.php

@@ -1,17 +1,17 @@
 <?php
-namespace Payum\OmnipayBridge\Tests\Action\Api;
+namespace Payum\OmnipayV3Bridge\Tests\Action\Api;
 
 use Payum\Core\Model\CreditCard;
 use Payum\Core\Request\GetCurrency;
 use Payum\Core\Security\SensitiveValue;
-use Payum\OmnipayBridge\Action\ConvertPaymentAction;
+use Payum\OmnipayV3Bridge\Action\ConvertPaymentAction;
 use Payum\Core\Model\Payment;
 use Payum\Core\Request\Convert;
 use Payum\Core\Tests\GenericActionTest;
 
 class ConvertPaymentActionTest extends GenericActionTest
 {
-    protected $actionClass = 'Payum\OmnipayBridge\Action\ConvertPaymentAction';
+    protected $actionClass = 'Payum\OmnipayV3Bridge\Action\ConvertPaymentAction';
 
     protected $requestClass = 'Payum\Core\Request\Convert';
 

tests/Action/NotifyActionTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Payum\OmnipayBridge\Tests\Action;
+namespace Payum\OmnipayV3Bridge\Tests\Action;
 
 use Omnipay\Common\Message\AbstractResponse as OmnipayAbstractResponse;
 use Omnipay\Common\Message\RequestInterface as OmnipayRequestInterface;
 use Omnipay\Common\Message\ResponseInterface as OmnipayResponseInterface;
 use Payum\Core\Reply\HttpResponse;
 use Payum\Core\Request\Notify;
 use Payum\Core\Tests\GenericActionTest;
-use Payum\OmnipayBridge\Action\NotifyAction;
-use Payum\OmnipayBridge\Tests\OffsiteGateway;
+use Payum\OmnipayV3Bridge\Action\NotifyAction;
+use Payum\OmnipayV3Bridge\Tests\OffsiteGateway;
 
 /**
  * @author Steffen Brem <[email protected]>

tests/Action/OffsiteCaptureActionTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Payum\OmnipayBridge\Tests\Action;
+namespace Payum\OmnipayV3Bridge\Tests\Action;
 
 use Omnipay\Common\Message\AbstractResponse as OmnipayAbstractResponse;
 use Omnipay\Common\Message\RequestInterface as OmnipayRequestInterface;
@@ -12,10 +12,10 @@
 use Payum\Core\Security\GenericTokenFactoryAwareInterface;
 use Payum\Core\Security\GenericTokenFactoryInterface;
 use Payum\Core\Tests\GenericActionTest;
-use Payum\OmnipayBridge\Action\BaseApiAwareAction;
-use Payum\OmnipayBridge\Action\OffsiteCaptureAction;
-use Payum\OmnipayBridge\Tests\CreditCardGateway;
-use Payum\OmnipayBridge\Tests\OffsiteGateway;
+use Payum\OmnipayV3Bridge\Action\BaseApiAwareAction;
+use Payum\OmnipayV3Bridge\Action\OffsiteCaptureAction;
+use Payum\OmnipayV3Bridge\Tests\CreditCardGateway;
+use Payum\OmnipayV3Bridge\Tests\OffsiteGateway;
 
 class OffsiteCaptureActionTest extends GenericActionTest
 {

tests/Action/StatusActionTest.php

@@ -1,13 +1,13 @@
 <?php
-namespace Payum\OmnipayBridge\Tests\Action;
+namespace Payum\OmnipayV3Bridge\Tests\Action;
 
 use Payum\Core\Request\GetBinaryStatus;
 use Payum\Core\Tests\GenericActionTest;
-use Payum\OmnipayBridge\Action\StatusAction;
+use Payum\OmnipayV3Bridge\Action\StatusAction;
 
 class StatusActionTest extends GenericActionTest
 {
-    protected $actionClass = 'Payum\OmnipayBridge\Action\StatusAction';
+    protected $actionClass = 'Payum\OmnipayV3Bridge\Action\StatusAction';
 
     protected $requestClass = 'Payum\Core\Request\GetHumanStatus';