Bring up-to-date for Laravel 5.7

New root namespace and provider name to prevent classes if moving
from a version from upstream.

Author: judgej

Diff for: README.md

@@ -7,74 +7,76 @@ Omnipay for Laravel 5 & Lumen
 
 Integrates the [Omnipay](https://github.com/adrianmacneil/omnipay) PHP library with Laravel 5.6 via a ServiceProvider to make Configuring multiple payment tunnels a breeze!
 
-### Laravel 4 Support
-
-For Laravel 4 see the [version 1.x](https://github.com/ignited/laravel-omnipay/tree/1.1.0) tree
-
 ### Now using Omnipay 3.0
 
-Version `2.0` and onwards has been updated to use Omnipay 3.0.
-
-Version `2.2` and onwards is using Omnipay 2.5
-
-Version `2.3` and onwards supports Laravel 5.4
+* Version `2.0` and onwards has been updated to use Omnipay 3.0.
+* Version `2.2` and onwards is using Omnipay 2.5
+* Version `2.3` and onwards supports Laravel 5.4
 
 ### Composer Configuration
 
 Include the laravel-omnipay package as a dependency in your `composer.json`:
 
-    "laravel-omnipay/laravel-omnipay": "3.*"
-    
+    "academe/laravel-omnipay": "3.*"
+
 **Note:** You don't need to include the `omnipay/common` in your composer.json - it is a requirement of the `laravel-omnipay` package.
 
-Omnipay recently went refactoring that made it so that each package is now a seperate repository. The `omnipay/common` package includes the core framework. You will then need to include each gateway as you require. For example:
+Each gateway driver is a seperate package.
+The `omnipay/common` package includes the core framework.
+You will then need to include each gateway as you require.
+Example:
+
+    "omnipay/eway": "3.*"
 
-    "omnipay/eway": "*"
-    
 Alternatively you can include every gateway by requring:
 
-    "omnipay/omnipay": "*"
+    "omnipay/omnipay": "3.*"
 
-**Note:** this requires a large amount of composer work as it needs to fetch each seperate repository. This is not recommended.
+**Note:** This requires a large amount of composer work as it needs to fetch each seperate repository.
+This is not recommended.
 
 ### Installation
 
 Run `composer install` to download the dependencies.
 
 #### Laravel 5
 
+**Note:** For Laravel 5.6, the following steps are automated through the discovery process,
+so you will not need to add the provider and facade manually.
+
 Add a ServiceProvider to your providers array in `config/app.php`:
 
 ```php
 'providers' => [
 
-	'Ignited\LaravelOmnipay\LaravelOmnipayServiceProvider',
+     Academe\LaravelOmnipay\LaravelOmnipayServiceProvider::class,
 
 ]
 ```
 
 Add the `Omnipay` facade to your facades array:
 
 ```php
-	'Omnipay' => 'Ignited\LaravelOmnipay\Facades\OmnipayFacade',
+	'Omnipay' => Academe\LaravelOmnipay\Facades\OmnipayFacade::class,
 ```
 
 Finally, publish the configuration files:
 
 ```
-php artisan vendor:publish --provider="Ignited\LaravelOmnipay\LaravelOmnipayServiceProvider" --tag=config
+php artisan vendor:publish --provider="Academe\LaravelOmnipay\LaravelOmnipayServiceProvider" --tag=config
 ```
 
 #### Lumen
 
 For `Lumen` add the following in your bootstrap/app.php
 ```php
-$app->register(Ignited\LaravelOmnipay\LumenOmnipayServiceProvider::class);
+$app->register(Academe\LaravelOmnipay\LumenOmnipayServiceProvider::class);
 ```
 
-Copy the laravel-omnipay.php file from the config directory to config/laravel-omnipay.php
+Copy the `laravel-omnipay.php` file from the config directory to `config/laravel-omnipay.php`
+
+Also add the following to `bootstrap/app.php`:
 
-And also add the following to bootstrap/app.php
 ```php
 $app->configure('laravel-omnipay');
 ```
@@ -84,6 +86,7 @@ $app->configure('laravel-omnipay');
 Once you have published the configuration files, you can add your gateway options to the config file in `config/laravel-omnipay.php`.
 
 #### PayPal Express Example
+
 Here is an example of how to configure password, username and, signature with paypal express checkout driver
 
 ```php
@@ -92,58 +95,57 @@ Here is an example of how to configure password, username and, signature with pa
     'paypal' => [
         'driver'  => 'PayPal_Express',
         'options' => [
-            'username'  => env( 'OMNIPAY_PAYPAL_EXPRESS_USERNAME', '' ),
-            'password'  => env( 'OMNIPAY_PAYPAL_EXPRESS_PASSWORD', '' ),
-            'signature' => env( 'OMNIPAY_PAYPAL_EXPRESS_SIGNATURE', '' ),
-            'solutionType' => env( 'OMNIPAY_PAYPAL_EXPRESS_SOLUTION_TYPE', '' ),
-            'landingPage'    => env( 'OMNIPAY_PAYPAL_EXPRESS_LANDING_PAGE', '' ),
-            'headerImageUrl' => env( 'OMNIPAY_PAYPAL_EXPRESS_HEADER_IMAGE_URL', '' ),
-            'brandName' =>  'Your app name',
-            'testMode' => env( 'OMNIPAY_PAYPAL_TEST_MODE', true )
+            'username'          => env('OMNIPAY_PAYPAL_EXPRESS_USERNAME'),
+            'password'          => env('OMNIPAY_PAYPAL_EXPRESS_PASSWORD'),
+            'signature'         => env('OMNIPAY_PAYPAL_EXPRESS_SIGNATURE'),
+            'solutionType'      => env('OMNIPAY_PAYPAL_EXPRESS_SOLUTION_TYPE'),
+            'landingPage'       => env('OMNIPAY_PAYPAL_EXPRESS_LANDING_PAGE'),
+            'headerImageUrl'    => env('OMNIPAY_PAYPAL_EXPRESS_HEADER_IMAGE_URL'),
+            'brandName'         => 'Your app name',
+            'testMode'          => env('OMNIPAY_PAYPAL_TEST_MODE', true)
         ]
     ],
 ]
 ...
 ```
 
-
 ### Usage
 
 ```php
 $cardInput = [
-	'number'      => '4444333322221111',
-	'firstName'   => 'MR. WALTER WHITE',
-	'expiryMonth' => '03',
-	'expiryYear'  => '16',
-	'cvv'         => '333',
+    'number'      => '4444333322221111',
+    'firstName'   => 'MR. WALTER WHITE',
+    'expiryMonth' => '03',
+    'expiryYear'  => '16',
+    'cvv'         => '333',
 ];
 
 $card = Omnipay::creditCard($cardInput);
 $response = Omnipay::purchase([
-	'amount'    => '100.00',
-	'returnUrl' => 'http://bobjones.com/payment/return',
-	'cancelUrl' => 'http://bobjones.com/payment/cancel',
-	'card'      => $cardInput
+    'amount'    => '100.00',
+    'returnUrl' => 'http://bobjones.com/payment/return',
+    'cancelUrl' => 'http://bobjones.com/payment/cancel',
+    'card'      => $cardInput
 ])->send();
 
 dd($response->getMessage());
 ```
 
 This will use the gateway specified in the config as `default`.
 
-However, you can also specify a gateway to use.
+You can explicitly specify a gateway to use:
 
 ```php
 Omnipay::setGateway('eway');
 
 $response = Omnipay::purchase([
-	'amount' => '100.00',
-	'card'   => $cardInput
+    'amount' => '100.00',
+    'card'   => $cardInput
 ])->send();
 
 dd($response->getMessage());
 ```
-    
+
 In addition you can take an instance of the gateway.
 
 ```php

Diff for: composer.json

@@ -1,27 +1,39 @@
 {
-    "name": "laravel-omnipay/laravel-omnipay",
+    "name": "academe/laravel-omnipay",
     "description": "Integerates Omnipay with Laravel and provides an easy configuration.",
-    "keywords": ["omnipay", "payments", "laravel", "laravel5"],
+    "keywords": ["omnipay", "omnipay3", "payments", "laravel", "laravel5"],
     "authors": [
         {
             "name": "Alex Whiteside",
             "email": "[email protected]"
+        },
+        {
+            "name": "Jason Judge",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "php-http/guzzle6-adapter": "^1.1",
+        "php": ">=7.0.0",
+        "laravel/framework": "~5",
         "illuminate/support": "~5",
         "omnipay/common": "~3.0"
     },
     "autoload": {
-        "psr-0": {
-            "Omnipay\\LaravelOmnipay": "src/"
+        "psr-4": {
+            "Academe\\LaravelOmnipay\\": "src/"
         }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.1-dev"
+        },
+        "laravel": {
+            "providers": [
+                "Academe\\LaravelOmnipay\\LaravelOmnipayServiceProvider"
+            ],
+            "aliases": {
+                "Omnipay": "Academe\\LaravelOmnipay\\Facades\\OmnipayFacade"
+            }
         }
     },
     "minimum-stability": "dev"

Diff for: src/config/config.php renamed to config/laravel-omnipay.php

@@ -1,10 +1,13 @@
-<?php namespace Omnipay\LaravelOmnipay;
+<?php
+
+namespace Academe\LaravelOmnipay;
 
 use Illuminate\Support\ServiceProvider;
 use Omnipay\Common\GatewayFactory;
 
 abstract class BaseServiceProvider extends ServiceProvider
 {
+    const PROVIDES = 'laravel-omnipay';
 
     /**
      * Indicates if loading of the provider is deferred.
@@ -28,7 +31,7 @@ public function register()
      */
     public function registerManager()
     {
-        $this->app->singleton('omnipay', function ($app) {
+        $this->app->singleton(static::PROVIDES, function ($app) {
             $factory = new GatewayFactory;
             $manager = new LaravelOmnipayManager($app, $factory);
 
@@ -43,6 +46,6 @@ public function registerManager()
      */
     public function provides()
     {
-        return ['omnipay'];
+        return [static::PROVIDES];
     }
 }

Diff for: src/BaseServiceProvider.php

@@ -1,11 +1,14 @@
-<?php namespace Omnipay\LaravelOmnipay\Facades;
+<?php
+
+namespace Academe\LaravelOmnipay\Facades;
 
 use Illuminate\Support\Facades\Facade;
+use Academe\LaravelOmnipay\BaseServiceProvider;
 
 class OmnipayFacade extends Facade
 {
     protected static function getFacadeAccessor()
     {
-        return 'omnipay';
+        return BaseServiceProvider::PROVIDES;
     }
 }

Diff for: src/Facades/OmnipayFacade.php

@@ -1,10 +1,16 @@
-<?php namespace Omnipay\LaravelOmnipay;
+<?php
+
+namespace Academe\LaravelOmnipay;
 
 use Closure;
 use Omnipay\Common\GatewayFactory;
 use Omnipay\Common\Helper;
 use Omnipay\Common\CreditCard;
 
+use UnexpectedValueException;
+use BadMethodCallException;
+use ReflectionClass;
+
 class LaravelOmnipayManager
 {
     /**
@@ -72,16 +78,22 @@ protected function resolve($name)
         $config = $this->getConfig($name);
 
         if (is_null($config)) {
-            throw new \UnexpectedValueException("Gateway [$name] is not defined.");
+            throw new UnexpectedValueException(sprintf(
+                'Gateway [%s] is not defined.',
+                $name
+            ));
         }
 
-        $gateway = $this->factory->create($config['driver'], $this->getHttpClient());
+        $gateway = $this->factory->create(
+            $config['driver'],
+            $this->getHttpClient()
+        );
 
         $class = trim(Helper::getGatewayClassName($config['driver']), "\\");
 
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
-        foreach ($config['options'] as $optionName=>$value) {
+        foreach ($config['options'] as $optionName => $value) {
             $method = 'set' . ucfirst($optionName);
 
             if ($reflection->hasMethod($method)) {
@@ -99,19 +111,20 @@ public function creditCard($cardInput)
 
     protected function getDefault()
     {
-        return $this->app['config']['laravel-omnipay.default'];
+        return $this->app['config']['laravel-omnipay.default'] ?? null;
     }
 
     protected function getConfig($name)
     {
-        return $this->app['config']["laravel-omnipay.gateways.{$name}"];
+        return $this->app['config']["laravel-omnipay.gateways.{$name}"] ?? null;
     }
 
     public function getGateway()
     {
         if (!isset($this->gateway)) {
             $this->gateway = $this->getDefault();
         }
+
         return $this->gateway;
     }
 
@@ -138,6 +151,10 @@ public function __call($method, $parameters)
             return call_user_func_array($callable, $parameters);
         }
 
-        throw new \BadMethodCallException("Method [$method] is not supported by the gateway [$this->gateway].");
+        throw new BadMethodCallException(sprintf(
+            'Method [%s] is not supported by the gateway [%s].',
+            $method,
+            $this->gateway
+        ));
     }
 }

Diff for: src/LaravelOmnipayManager.php

@@ -1,11 +1,18 @@
-<?php namespace Omnipay\LaravelOmnipay;
+<?php
+
+namespace Academe\LaravelOmnipay;
 
 class LaravelOmnipayServiceProvider extends BaseServiceProvider
 {
     public function boot()
     {
         // Publish config
-        $configPath = __DIR__ . '/config/config.php';
-        $this->publishes([$configPath => config_path('laravel-omnipay.php')], 'config');
+
+        $configPath = __DIR__ . '/../config/laravel-omnipay.php';
+
+        $this->publishes(
+            [$configPath => config_path('laravel-omnipay.php')],
+            'config'
+        );
     }
 }