Merge pull request #11 from lucasmichot/feature/master/cs-fix

Apply some code formatting

Author: taylorotwell

src/Http/Controllers/RetrievesAuthRequestFromSession.php

@@ -18,7 +18,7 @@ protected function getAuthRequestFromSession(Request $request)
     {
         return tap($request->session()->get('authRequest'), function ($authRequest) use ($request) {
             if (! $authRequest) {
-                throw new Exception("Authorization request was not present in the session.");
+                throw new Exception('Authorization request was not present in the session.');
             }
 
             $authRequest->setUser(new User($request->user()->id));

src/Http/Middleware/CreateFreshApiToken.php

@@ -79,7 +79,7 @@ protected function requestShouldReceiveFreshToken($request)
     protected function responseShouldReceiveFreshToken($response)
     {
         return $response instanceof Response &&
-                    !  $this->alreadyContainsToken($response);
+                    ! $this->alreadyContainsToken($response);
     }
 
     /**

src/Passport.php

@@ -100,7 +100,7 @@ public static function scopesFor(array $ids)
                 return new Scope($id, static::$scopes[$id]);
             }
 
-            return null;
+            return;
         })->filter()->values()->all();
     }
 

src/PersonalAccessTokenFactory.php

@@ -75,7 +75,7 @@ public function make($userId, $name, array $scopes = [])
         $token = tap($this->findAccessToken($response), function ($token) use ($userId, $name) {
             $this->tokens->save($token->forceFill([
                 'user_id' => $userId,
-                'name' => $name
+                'name' => $name,
             ]));
         });
 

src/PersonalAccessTokenResult.php

@@ -43,7 +43,7 @@ public function toArray()
     {
         return [
             'accessToken' => $this->accessToken,
-            'token' => $this->token
+            'token' => $this->token,
         ];
     }
 

src/RouteRegistrar.php

@@ -47,18 +47,17 @@ public function forAuthorization()
     {
         $this->router->group(['middleware' => ['web', 'auth']], function ($router) {
             $router->get('/oauth/authorize', [
-                'uses' => 'AuthorizationController@authorize'
+                'uses' => 'AuthorizationController@authorize',
             ]);
 
             $router->post('/oauth/authorize', [
-                'uses' => 'ApproveAuthorizationController@approve'
+                'uses' => 'ApproveAuthorizationController@approve',
             ]);
 
             $router->delete('/oauth/authorize', [
-                'uses' => 'DenyAuthorizationController@deny'
+                'uses' => 'DenyAuthorizationController@deny',
             ]);
         });
-
     }
 
     /**
@@ -69,7 +68,7 @@ public function forAuthorization()
     public function forAccessTokens()
     {
         $this->router->post('/oauth/token', [
-            'uses' => 'AccessTokenController@issueToken'
+            'uses' => 'AccessTokenController@issueToken',
         ]);
 
         $this->router->group(['middleware' => ['web', 'auth']], function ($router) {

tests/AuthorizationControllerTest.php

@@ -31,7 +31,6 @@ public function test_authorization_view_is_presented()
         $authRequest->shouldReceive('getClient->getIdentifier')->andReturn(1);
         $authRequest->shouldReceive('getScopes')->andReturn([new Laravel\Passport\Bridge\Scope('scope-1')]);
 
-
         $response->shouldReceive('view')->once()->andReturnUsing(function ($view, $data) use ($authRequest) {
             $this->assertEquals('passport::authorize', $view);
             $this->assertEquals('client', $data['client']);

tests/AuthorizedAccessTokenControllerTest.php

@@ -24,8 +24,9 @@ public function test_tokens_can_be_retrieved_for_users()
             $token1->client = (object) ['personal_access_client' => true];
             $token2->client = (object) ['personal_access_client' => false];
             $user->tokens->shouldReceive('load')->with('client')->andReturn(collect([
-                $token1, $token2
+                $token1, $token2,
             ]));
+
             return $user;
         });
 
@@ -50,6 +51,7 @@ public function test_tokens_can_be_deleted()
             $user = Mockery::mock();
             $user->id = 1;
             $user->tokens = new Illuminate\Database\Eloquent\Collection([$token1, $token2]);
+
             return $user;
         });
 
@@ -74,6 +76,7 @@ public function test_not_found_response_is_returned_if_user_doesnt_have_token()
             $user = Mockery::mock();
             $user->id = 1;
             $user->tokens = new Illuminate\Database\Eloquent\Collection([$token1, $token2]);
+
             return $user;
         });
 

tests/ClientControllerTest.php

@@ -66,6 +66,7 @@ public function test_clients_can_be_updated()
             $user->clients->shouldReceive('find')->with(1)->andReturn(
                 $client = Mockery::mock('Laravel\Passport\Client')
             );
+
             return $user;
         });
 
@@ -101,6 +102,7 @@ public function test_404_response_if_client_doesnt_belong_to_user()
             $user->id = 1;
             $user->clients = Mockery::mock();
             $user->clients->shouldReceive('find')->with(1)->andReturn(null);
+
             return $user;
         });
 
@@ -128,6 +130,7 @@ public function test_clients_can_be_deleted()
             $user->clients->shouldReceive('find')->with(1)->andReturn(
                 $client = Mockery::mock('Laravel\Passport\Client')
             );
+
             return $user;
         });
 
@@ -155,6 +158,7 @@ public function test_404_response_if_client_doesnt_belong_to_user_on_delete()
             $user->id = 1;
             $user->clients = Mockery::mock();
             $user->clients->shouldReceive('find')->with(1)->andReturn(null);
+
             return $user;
         });
 

tests/PersonalAccessTokenControllerTest.php

@@ -24,8 +24,9 @@ public function test_tokens_can_be_retrieved_for_users()
             $token1->client = (object) ['personal_access_client' => true];
             $token2->client = (object) ['personal_access_client' => false];
             $user->tokens->shouldReceive('load')->with('client')->andReturn(collect([
-                $token1, $token2
+                $token1, $token2,
             ]));
+
             return $user;
         });
 
@@ -48,6 +49,7 @@ public function test_tokens_can_be_updated()
         $request->setUserResolver(function () {
             $user = Mockery::mock();
             $user->shouldReceive('createToken')->once()->with('token name', ['user', 'user-admin'])->andReturn('response');
+
             return $user;
         });
 
@@ -83,6 +85,7 @@ public function test_tokens_can_be_deleted()
             $user = Mockery::mock();
             $user->id = 1;
             $user->tokens = new Illuminate\Database\Eloquent\Collection([$token1, $token2]);
+
             return $user;
         });
 
@@ -107,6 +110,7 @@ public function test_not_found_response_is_returned_if_user_doesnt_have_token()
             $user = Mockery::mock();
             $user->id = 1;
             $user->tokens = new Illuminate\Database\Eloquent\Collection([$token1, $token2]);
+
             return $user;
         });