Apply styleCI fixes

examples/public/api.php

@@ -33,18 +33,18 @@
     function (ServerRequestInterface $request, ResponseInterface $response) use ($app) {
         $users = [
             [
-                'id'    => 123,
-                'name'  => 'Alex',
+                'id' => 123,
+                'name' => 'Alex',
                 'email' => '[email protected]',
             ],
             [
-                'id'    => 124,
-                'name'  => 'Frank',
+                'id' => 124,
+                'name' => 'Frank',
                 'email' => '[email protected]',
             ],
             [
-                'id'    => 125,
-                'name'  => 'Phil',
+                'id' => 125,
+                'name' => 'Phil',
                 'email' => '[email protected]',
             ],
         ];

examples/public/auth_code.php

@@ -24,7 +24,7 @@
 include __DIR__ . '/../vendor/autoload.php';
 
 $app = new App([
-    'settings'    => [
+    'settings' => [
         'displayErrorDetails' => true,
     ],
     AuthorizationServer::class => function () {

examples/public/client_credentials.php

@@ -20,7 +20,7 @@
 include __DIR__ . '/../vendor/autoload.php';
 
 $app = new App([
-    'settings'                 => [
+    'settings' => [
         'displayErrorDetails' => true,
     ],
     AuthorizationServer::class => function () {

examples/public/implicit.php

@@ -22,7 +22,7 @@
 include __DIR__ . '/../vendor/autoload.php';
 
 $app = new App([
-    'settings'    => [
+    'settings' => [
         'displayErrorDetails' => true,
     ],
     AuthorizationServer::class => function () {

examples/public/middleware_use.php

@@ -26,7 +26,7 @@
 include __DIR__ . '/../vendor/autoload.php';
 
 $app = new App([
-    'settings'                 => [
+    'settings' => [
         'displayErrorDetails' => true,
     ],
     AuthorizationServer::class => function () {
@@ -89,7 +89,7 @@
 
         if (\in_array('basic', $request->getAttribute('oauth_scopes', []))) {
             $params = [
-                'id'   => 1,
+                'id' => 1,
                 'name' => 'Alex',
                 'city' => 'London',
             ];

examples/public/refresh_token.php

@@ -21,7 +21,7 @@
 include __DIR__ . '/../vendor/autoload.php';
 
 $app = new App([
-    'settings'    => [
+    'settings' => [
         'displayErrorDetails' => true,
     ],
     AuthorizationServer::class => function () {

examples/src/Repositories/ClientRepository.php

@@ -39,9 +39,9 @@ public function validateClient($clientIdentifier, $clientSecret, $grantType)
     {
         $clients = [
             'myawesomeapp' => [
-                'secret'          => \password_hash('abc123', PASSWORD_BCRYPT),
-                'name'            => self::CLIENT_NAME,
-                'redirect_uri'    => self::REDIRECT_URI,
+                'secret' => \password_hash('abc123', PASSWORD_BCRYPT),
+                'name' => self::CLIENT_NAME,
+                'redirect_uri' => self::REDIRECT_URI,
                 'is_confidential' => true,
             ],
         ];

src/Grant/AuthCodeGrant.php

@@ -366,13 +366,13 @@ public function completeAuthorizationRequest(AuthorizationRequest $authorization
             );
 
             $payload = [
-                'client_id'             => $authCode->getClient()->getIdentifier(),
-                'redirect_uri'          => $authCode->getRedirectUri(),
-                'auth_code_id'          => $authCode->getIdentifier(),
-                'scopes'                => $authCode->getScopes(),
-                'user_id'               => $authCode->getUserIdentifier(),
-                'expire_time'           => (new DateTimeImmutable())->add($this->authCodeTTL)->getTimestamp(),
-                'code_challenge'        => $authorizationRequest->getCodeChallenge(),
+                'client_id' => $authCode->getClient()->getIdentifier(),
+                'redirect_uri' => $authCode->getRedirectUri(),
+                'auth_code_id' => $authCode->getIdentifier(),
+                'scopes' => $authCode->getScopes(),
+                'user_id' => $authCode->getUserIdentifier(),
+                'expire_time' => (new DateTimeImmutable())->add($this->authCodeTTL)->getTimestamp(),
+                'code_challenge' => $authorizationRequest->getCodeChallenge(),
                 'code_challenge_method' => $authorizationRequest->getCodeChallengeMethod(),
             ];
 
@@ -387,7 +387,7 @@ public function completeAuthorizationRequest(AuthorizationRequest $authorization
                 $this->makeRedirectUri(
                     $finalRedirectUri,
                     [
-                        'code'  => $this->encrypt($jsonPayload),
+                        'code' => $this->encrypt($jsonPayload),
                         'state' => $authorizationRequest->getState(),
                     ]
                 )

src/Grant/ImplicitGrant.php

@@ -207,9 +207,9 @@ public function completeAuthorizationRequest(AuthorizationRequest $authorization
                     $finalRedirectUri,
                     [
                         'access_token' => (string) $accessToken,
-                        'token_type'   => 'Bearer',
-                        'expires_in'   => $accessToken->getExpiryDateTime()->getTimestamp() - \time(),
-                        'state'        => $authorizationRequest->getState(),
+                        'token_type' => 'Bearer',
+                        'expires_in' => $accessToken->getExpiryDateTime()->getTimestamp() - \time(),
+                        'state' => $authorizationRequest->getState(),
                     ],
                     $this->queryDelimiter
                 )

src/ResponseTypes/BearerTokenResponse.php

@@ -26,19 +26,19 @@ public function generateHttpResponse(ResponseInterface $response)
         $expireDateTime = $this->accessToken->getExpiryDateTime()->getTimestamp();
 
         $responseParams = [
-            'token_type'   => 'Bearer',
-            'expires_in'   => $expireDateTime - \time(),
+            'token_type' => 'Bearer',
+            'expires_in' => $expireDateTime - \time(),
             'access_token' => (string) $this->accessToken,
         ];
 
         if ($this->refreshToken instanceof RefreshTokenEntityInterface) {
             $refreshTokenPayload = \json_encode([
-                'client_id'        => $this->accessToken->getClient()->getIdentifier(),
+                'client_id' => $this->accessToken->getClient()->getIdentifier(),
                 'refresh_token_id' => $this->refreshToken->getIdentifier(),
-                'access_token_id'  => $this->accessToken->getIdentifier(),
-                'scopes'           => $this->accessToken->getScopes(),
-                'user_id'          => $this->accessToken->getUserIdentifier(),
-                'expire_time'      => $this->refreshToken->getExpiryDateTime()->getTimestamp(),
+                'access_token_id' => $this->accessToken->getIdentifier(),
+                'scopes' => $this->accessToken->getScopes(),
+                'user_id' => $this->accessToken->getUserIdentifier(),
+                'expire_time' => $this->refreshToken->getExpiryDateTime()->getTimestamp(),
             ]);
 
             if ($refreshTokenPayload === false) {

tests/AuthorizationServerTest.php

@@ -301,7 +301,7 @@ public function testValidateAuthorizationRequest()
             $cookies = [],
             $queryParams = [
                 'response_type' => 'code',
-                'client_id'     => 'foo',
+                'client_id' => 'foo',
             ]
         );
 
@@ -342,7 +342,7 @@ public function testValidateAuthorizationRequestWithMissingRedirectUri()
             $cookies = [],
             $queryParams = [
                 'response_type' => 'code',
-                'client_id'     => 'foo',
+                'client_id' => 'foo',
             ]
         );
 
@@ -369,7 +369,7 @@ public function testValidateAuthorizationRequestUnregistered()
             'client_id' => 'foo',
         ]);
 
-        $this->expectException(\League\OAuth2\Server\Exception\OAuthServerException::class);
+        $this->expectException(OAuthServerException::class);
         $this->expectExceptionCode(2);
 
         $server->validateAuthorizationRequest($request);

tests/Grant/AbstractGrantTest.php

@@ -109,7 +109,7 @@ public function testGetClientCredentialsClientSecretNotAString()
             [],
             [],
             [
-                'client_id'     => 'client_id',
+                'client_id' => 'client_id',
                 'client_secret' => ['not', 'a', 'string'],
             ]
         );
@@ -161,9 +161,9 @@ public function testValidateClientConfidential()
         $abstractGrantReflection = new \ReflectionClass($grantMock);
 
         $serverRequest = (new ServerRequest())->withParsedBody([
-            'client_id'     => 'foo',
+            'client_id' => 'foo',
             'client_secret' => 'bar',
-            'redirect_uri'  => 'http://foo/bar',
+            'redirect_uri' => 'http://foo/bar',
         ]);
 
         $validateClientMethod = $abstractGrantReflection->getMethod('validateClient');
@@ -229,7 +229,7 @@ public function testValidateClientInvalidClientSecret()
         $abstractGrantReflection = new \ReflectionClass($grantMock);
 
         $serverRequest = (new ServerRequest())->withParsedBody([
-            'client_id'     => 'foo',
+            'client_id' => 'foo',
             'client_secret' => 'foo',
         ]);
 
@@ -255,7 +255,7 @@ public function testValidateClientInvalidRedirectUri()
         $abstractGrantReflection = new \ReflectionClass($grantMock);
 
         $serverRequest = (new ServerRequest())->withParsedBody([
-            'client_id'    => 'foo',
+            'client_id' => 'foo',
             'redirect_uri' => 'http://bar/foo',
         ]);
 
@@ -281,7 +281,7 @@ public function testValidateClientInvalidRedirectUriArray()
         $abstractGrantReflection = new \ReflectionClass($grantMock);
 
         $serverRequest = (new ServerRequest())->withParsedBody([
-            'client_id'    => 'foo',
+            'client_id' => 'foo',
             'redirect_uri' => 'http://bar/foo',
         ]);
 
@@ -307,7 +307,7 @@ public function testValidateClientMalformedRedirectUri()
         $abstractGrantReflection = new \ReflectionClass($grantMock);
 
         $serverRequest = (new ServerRequest())->withParsedBody([
-            'client_id'    => 'foo',
+            'client_id' => 'foo',
             'redirect_uri' => ['not', 'a', 'string'],
         ]);
 
@@ -331,7 +331,7 @@ public function testValidateClientBadClient()
         $abstractGrantReflection = new \ReflectionClass($grantMock);
 
         $serverRequest = (new ServerRequest())->withParsedBody([
-            'client_id'     => 'foo',
+            'client_id' => 'foo',
             'client_secret' => 'bar',
         ]);