Fix styling

src/Connection.php

@@ -1,28 +1,29 @@
 <?php
 namespace MacsiDigital\OAuth2;
 
-use MacsiDigital\OAuth2\Traits\ForwardsCalls;
-use MacsiDigital\OAuth2\Support\Providers\GenericProvider;
 use MacsiDigital\OAuth2\Contracts\Connection as ConnectionContract;
+use MacsiDigital\OAuth2\Support\Providers\GenericProvider;
+use MacsiDigital\OAuth2\Traits\ForwardsCalls;
 
 class Connection implements ConnectionContract
 {
-	use ForwardsCalls;
+    use ForwardsCalls;
 
     protected $provider;
-	protected $options;
+    protected $options;
 
     /**
      * Return if the OAuth2 implementation is authenticated.
      *
      * @param  string  $integration
-     * @return boolean
+     * @return bool
      *
      */
-    public function authenticated($integration) 
+    public function authenticated($integration)
     {
         $config = config($integration);
         $token = new $config['tokenModel']($integration);
+
         return $token->authenticated();
     }
 
@@ -33,12 +34,13 @@ public function authenticated($integration)
      * @return self
      *
      */
-	public function withOptions($options)
-	{
+    public function withOptions($options)
+    {
         $this->options = $options;
         $this->provider = new GenericProvider($options);
+
         return $this;
-	}
+    }
 
     /**
      * Handle dynamic method calls into the model. Forward calls to the provider
@@ -51,5 +53,4 @@ public function __call($method, $parameters)
     {
         return $this->forwardCallTo($this->provider, $method, $parameters);
     }
-
-}
+}

src/Contracts/Connection.php

@@ -4,7 +4,4 @@
 
 interface Connection
 {
-
-
-
 }

src/Contracts/Token.php

@@ -1,25 +1,23 @@
 <?php
 namespace MacsiDigital\OAuth2\Contracts;
 
-interface Token 
+interface Token
 {
+    public function set($options);
 
-	public function set($options);
+    public function accessToken();
 
-	public function accessToken();
+    public function setAccessToken($token);
 
-	public function setAccessToken($token);
+    public function refreshToken();
 
-	public function refreshToken();
+    public function setRefreshToken($token);
 
-	public function setRefreshToken($token);
+    public function expires();
 
-	public function expires();
+    public function setExpires($timeStamp);
 
-	public function setExpires($timeStamp);
+    public function hasExpired();
 
-	public function hasExpired();
-
-	public function save();
-
-}
+    public function save();
+}

src/Exceptions/AlreadyAuthenticatedException.php

@@ -4,8 +4,8 @@
 
 class AlreadyAuthenticatedException extends Base
 {
-	public function __construct($name)
+    public function __construct($name)
     {
         parent::__construct($name.' already authorised.');
     }
-}
+}

src/Exceptions/Base.php

@@ -6,5 +6,4 @@
 
 class Base extends Exception
 {
-
-}
+}

src/Exceptions/ConfigDoesntExistException.php

@@ -4,8 +4,8 @@
 
 class ConfigDoesntExistException extends Base
 {
-	public function __construct($name)
+    public function __construct($name)
     {
         parent::__construct('No Config '.$name.' found.');
     }
-}
+}

src/Exceptions/IdentityProviderException.php

@@ -6,5 +6,4 @@
 
 class IdentityProviderException extends LeagueException
 {
-
-}
+}

src/Http/Controllers/AuthorisationController.php

@@ -2,32 +2,29 @@
 
 namespace MacsiDigital\OAuth2\Http\Controllers;
 
-use Str;
-use Illuminate\Http\Request;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Cookie;
-use Illuminate\Support\Facades\Storage;
 use MacsiDigital\OAuth2\Contracts\Connection;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use MacsiDigital\OAuth2\Http\Requests\OAuth2Validation;
-use MacsiDigital\OAuth2\Exceptions\IdentityProviderException;
-use MacsiDigital\OAuth2\Exceptions\ConfigDoesntExistException;
 use MacsiDigital\OAuth2\Exceptions\AlreadyAuthenticatedException;
+use MacsiDigital\OAuth2\Exceptions\ConfigDoesntExistException;
+use MacsiDigital\OAuth2\Exceptions\IdentityProviderException;
+use MacsiDigital\OAuth2\Http\Requests\OAuth2Validation;
 
 class AuthorisationController extends BaseController
 {
     use ValidatesRequests;
 
-    public function create(Connection $connection, $integration) 
+    public function create(Connection $connection, $integration)
     {
         // Are we already authenticated?
-        if($connection->authenticated($integration)){
+        if ($connection->authenticated($integration)) {
             throw new AlreadyAuthenticatedException($integration);
         }
         // If not then we need to ask for a token
         $config = config($integration);
 
-        if($config == []){
+        if ($config == []) {
             throw new ConfigDoesntExistException($integration);
         }
 
@@ -40,16 +37,16 @@ public function create(Connection $connection, $integration)
         return redirect()->away($url);
     }
 
-    public function store(OAuth2Validation $request, Connection $connection, $integration) 
+    public function store(OAuth2Validation $request, Connection $connection, $integration)
     {
         // Are we already authenticated?
-        if($connection->authenticated($integration)){
+        if ($connection->authenticated($integration)) {
             throw new AlreadyAuthenticatedException($integration);
         }
 
         // If not then to prcess the token and save the access token
         $config = config($integration);
-        if($config == []){
+        if ($config == []) {
             throw new ConfigDoesntExistException($integration);
         }
 
@@ -58,12 +55,13 @@ public function store(OAuth2Validation $request, Connection $connection, $integr
         try {
             // Try to get an access token using the authorization code grant.
             $accessToken = $connection->getAccessToken('authorization_code', [
-                'code' => $request->code
+                'code' => $request->code,
             ]);
 
             $token = new $config['tokenProcessor']($accessToken, $integration);
 
             Cookie::forget('oauth2state');
+
             return redirect($config['authorisedRedirect']);
         } catch (IdentityProviderException $e) {
             return redirect($config['failedRedirect'], ['error' => $e->getMessage()]);

src/Integration.php

@@ -5,13 +5,13 @@
 
 class Integration implements Model
 {
-	/**
+    /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'accessToken', 'refreshToken', 'expires', 'additional'
+        'name', 'accessToken', 'refreshToken', 'expires', 'additional',
     ];
 
     /**
@@ -31,7 +31,4 @@ class Integration implements Model
     protected $casts = [
         'additional' => 'array',
     ];
-
-
-
-}
+}

src/Providers/OAuth2ServiceProvider.php

@@ -6,7 +6,7 @@
 
 class OAuth2ServiceProvider extends ServiceProvider
 {
-	public function boot()
+    public function boot()
     {
         $this->loadRoutesFrom(__DIR__.'/../../routes/web.php');
 

src/Support/AuthorisationProcessor.php

@@ -4,11 +4,11 @@
 
 class AuthorisationProcessor
 {
-	public function __construct($accessToken, $integration)
+    public function __construct($accessToken, $integration)
     {
-    	$config = config($integration);
-    	$token = $config['tokenModel'];
+        $config = config($integration);
+        $token = $config['tokenModel'];
+
         return (new $token($integration))->updateAccessToken($accessToken);
     }
-
-}
+}

src/Support/Providers/GenericProvider.php

@@ -5,5 +5,4 @@
 
 class GenericProvider extends LeagueGenericProvider
 {
-
-}
+}