Code cleanup and PSR-2 compatible

Cleanup the code and follow PSR-2 guidelines

Author: RSpeekenbrink

.gitignore

@@ -1,3 +1,4 @@
+/.idea
 /vendor
 composer.phar
 composer.lock

config/omnipay.php

@@ -1,21 +1,42 @@
 <?php
 
-return array(
+return [
 
-    /** The default gateway name */
-    'gateway' => 'PayPal_Express',
+    /*
+    |--------------------------------------------------------------------------
+    | Default Gateway
+    |--------------------------------------------------------------------------
+    |
+    | Here you can specify the gateway that the facade should use by default.
+    |
+    */
+    'gateway' => env('OMNIPAY_GATEWAY', 'PayPal_Express'),
 
-    /** The default settings, applied to all gateways */
-    'defaults' => array(
-        'testMode' => false,
-    ),
+    /*
+    |--------------------------------------------------------------------------
+    | Default settings
+    |--------------------------------------------------------------------------
+    |
+    | Here you can specify default settings for gateways.
+    |
+    */
+    'defaults' => [
+        'testMode' => env('OMNIPAY_TESTMODE', false),
+    ],
 
-    /** Gateway specific parameters */
-    'gateways' => array(
-        'PayPal_Express' => array(
-            'username' => '',
-            'landingPage' => array('billing', 'login'), 
-        ),
-    ),
+    /*
+    |--------------------------------------------------------------------------
+    | Gateway specific settings
+    |--------------------------------------------------------------------------
+    |
+    | Here you can specify gateway specific settings.
+    |
+    */
+    'gateways' => [
+        'PayPal_Express' => [
+            'username' => env('OMNIPAY_PAYPAL_USERNAME'),
+            'landingPage' => ['billing', 'login'],
+        ],
+    ],
 
-);
+];

src/Facade.php

@@ -2,8 +2,8 @@
 
 use Omnipay\Common\CreditCard;
 
-class Facade extends \Illuminate\Support\Facades\Facade {
-
+class Facade extends \Illuminate\Support\Facades\Facade
+{
     /**
      * @param  array  $parameters
      * @return CreditCard
@@ -16,6 +16,8 @@ public static function creditCard($parameters = null)
     /**
      * {@inheritDoc}
      */
-    protected static function getFacadeAccessor() { return 'omnipay'; }
-
+    protected static function getFacadeAccessor()
+    {
+        return 'omnipay';
+    }
 }

src/GatewayManager.php

@@ -2,8 +2,8 @@
 
 use Omnipay\Common\GatewayFactory;
 
-class GatewayManager{
-
+class GatewayManager
+{
     /**
      * The application instance.
      *
@@ -45,7 +45,7 @@ public function gateway($class = null)
     {
         $class = $class ?: $this->getDefaultGateway();
 
-        if(!isset($this->gateways[$class])){
+        if (!isset($this->gateways[$class])) {
             $gateway = $this->factory->create($class, null, $this->app['request']);
             $gateway->initialize($this->getConfig($class));
             $this->gateways[$class] = $gateway;
@@ -61,7 +61,7 @@ protected function getConfig($name)
     {
         return array_merge(
             $this->defaults,
-            $this->app['config']->get('omnipay.gateways.'.$name, array())
+            $this->app['config']->get('omnipay.gateways.'.$name, [])
         );
     }
 
@@ -95,7 +95,6 @@ public function setDefaultGateway($name)
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array(array($this->gateway(), $method), $parameters);
+        return call_user_func_array([$this->gateway(), $method], $parameters);
     }
-
 }

src/ServiceProvider.php

@@ -2,7 +2,8 @@
 
 use Omnipay\Common\GatewayFactory;
 
-class ServiceProvider extends \Illuminate\Support\ServiceProvider {
+class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
 
     /**
      * Indicates if loading of the provider is deferred.
@@ -21,7 +22,7 @@ public function register()
         $configPath = __DIR__ . '/../config/omnipay.php';
         $this->publishes([$configPath => config_path('omnipay.php')]);
 
-        $this->app->singleton('omnipay',function ($app){
+        $this->app->singleton('omnipay', function ($app) {
             $defaults = $app['config']->get('omnipay.defaults', array());
             return new GatewayManager($app, new GatewayFactory, $defaults);
         });