php-guard / oauth-server

src/OAuth2OLD/Repositories/ConfigurationRepository.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function __construct(array $config = [])
     {
         if (array_diff(self::MINIMAL_CONFIG, array_keys($config))) {
-            throw new \Exception('Missing minimal configuration. Required : ' . implode(', ', self::MINIMAL_CONFIG));
+            throw new \Exception('Missing minimal configuration. Required : '.implode(', ', self::MINIMAL_CONFIG));
         }
 
         $this->config = array_merge(self::DEFAULT_CONFIG, $config);
@@ -52,7 +52,7 @@ 
      * @throws \Exception
      */
     public function getConfig(string $name) {
-        if(!array_key_exists($name, $this->config)) {
+        if (!array_key_exists($name, $this->config)) {
             throw new \Exception("Unknown config '$name' in ".implode(', ', array_keys($this->config)));
         }
         return $this->config[$name];

src/OAuth2OLD/Repositories/StorageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -34,10 +34,10 @@ 
     public function __construct(array $storages)
     {
         foreach (static::STORAGES_INTERFACES as $name => $interface) {
-            if(!isset($storages[$name])) {
+            if (!isset($storages[$name])) {
                 throw new \Exception("Missing storage '$name'");
             }
-            if(!is_a($storages[$name], $interface)) {
+            if (!is_a($storages[$name], $interface)) {
                 throw new \Exception("Storage '$name' must implement '$interface'");
             }
             $this->storages[$name] = $storages[$name];
@@ -50,7 +50,7 @@ 
      * @throws \Exception
      */
     public function getStorage(string $name) {
-        if(!isset($this->storages[$name])) {
+        if (!isset($this->storages[$name])) {
             throw new \Exception("Unknown storage '$name'");
         }
         return $this->storages[$name];

src/OAuth2OLD/Repositories/ClientAuthenticatorRepository.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     public function __construct(array $authenticators)
     {
-        if(!isset($authenticators[ClientPasswordAuthenticator::class])) {
+        if (!isset($authenticators[ClientPasswordAuthenticator::class])) {
             throw new \Exception('Authorization server MUST support the HTTP Basic authentication scheme');
         }
         $this->authenticators = $authenticators;

src/OAuth2/Endpoints/AuthorizationEndpoint.php

Indentation +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
         }
         else {
             if (count($redirectUris) == 1) {
-               $redirectUri = $redirectUris[0];
+                $redirectUri = $redirectUris[0];
             }
             else {
                 throw new OAuthException('invalid_request', 'The request is missing the required parameter redirect_uri.',

Spacing +7 added lines, -7 removed lines

@@ -85,10 +85,10 @@ 
 
     function handleRequest(ServerRequestInterface $request): ResponseInterface
     {
-        if($request->getMethod() === 'GET') {
+        if ($request->getMethod() === 'GET') {
             $requestData = $request->getQueryParams();
         }
-        else if($request->getMethod() === 'POST') {
+        else if ($request->getMethod() === 'POST') {
             $requestData = $request->getParsedBody();
         }
         else {
@@ -132,15 +132,15 @@ 
             $responseData = [
                 'error' => $e->getError()
             ];
-            if($e->getErrorDescription()) {
+            if ($e->getErrorDescription()) {
                 $responseData['error_description'] = $e->getErrorDescription();
             }
-            if($e->getErrorUri()) {
+            if ($e->getErrorUri()) {
                 $responseData['error_uri'] = $e->getErrorUri();
             }
         }
 
-        if(!empty($this->state)) {
+        if (!empty($this->state)) {
             $responseData['state'] = $this->state;
         }
 
@@ -179,7 +179,7 @@ 
 
         $supportedResponseTypes = $this->client->getMetadata()->getResponseTypes() ?: ['code'];
         foreach (explode(' ', $requestData['response_type']) as $responseType) {
-            if(!in_array($responseType, $supportedResponseTypes)) {
+            if (!in_array($responseType, $supportedResponseTypes)) {
             throw new OAuthException('unsupported_response_type',
                 'The authorization server does not support obtaining an authorization code using this method.',
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
@@ -227,7 +227,7 @@ 
         }
         try {
             $redirectUri = new Uri($redirectUri);
-            if($redirectUri->getFragment()) {
+            if ($redirectUri->getFragment()) {
                 throw new \InvalidArgumentException('The endpoint URI must not include a fragment component.');
             }
             $this->redirectUri = $redirectUri;

Braces +5 added lines, -10 removed lines

@@ -87,11 +87,9 @@ 
     {
         if($request->getMethod() === 'GET') {
             $requestData = $request->getQueryParams();
-        }
-        else if($request->getMethod() === 'POST') {
+        } else if($request->getMethod() === 'POST') {
             $requestData = $request->getParsedBody();
-        }
-        else {
+        } else {
             return new Response(404);
         }
 
@@ -215,12 +213,10 @@ 
                 throw new OAuthException('invalid_request', 'The request includes the invalid parameter redirect_uri.',
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
-        }
-        else {
+        } else {
             if (count($redirectUris) == 1) {
                $redirectUri = $redirectUris[0];
-            }
-            else {
+            } else {
                 throw new OAuthException('invalid_request', 'The request is missing the required parameter redirect_uri.',
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
@@ -231,8 +227,7 @@ 
                 throw new \InvalidArgumentException('The endpoint URI must not include a fragment component.');
             }
             $this->redirectUri = $redirectUri;
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             throw new OAuthException('invalid_request', 'The request includes the malformed parameter redirect_uri. '.$e->getMessage(),
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
         }

src/OAuth2/ScopePolicy/ScopePolicyManager.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function verifyScopes(ClientInterface $client, array $scopes): void
     {
-        if(empty($scopes)) {
+        if (empty($scopes)) {
             throw new OAuthException('invalid_scope',
                 'The request scope is unknown.',
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
@@ -57,7 +57,7 @@ 
 
         if ($client instanceof RegisteredClient && is_array($client->getMetadata()->getScope())) {
             $supportedScopes = explode(' ', $client->getMetadata()->getScope());
-            if(!empty(array_diff($scopes, $supportedScopes))) {
+            if (!empty(array_diff($scopes, $supportedScopes))) {
                 throw new OAuthException('invalid_scope',
                     'The request scope is invalid. Supported scopes : '.$client->getMetadata()->getScope(),
                     'https://tools.ietf.org/html/rfc6749#section-4.1');

src/OAuth2/Extensions/OpenID/Endpoints/AuthorizationEndpoint.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
              */
             $scope = $requestData['scope'] ?? '';
             $scopes = explode(' ', $scope);
-            if(!in_array('openid', $scopes)) {
+            if (!in_array('openid', $scopes)) {
                 return parent::handleRequest($request);
             }
 

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
              * specified in the Authorization Request using the application/x-www-form-urlencoded format,
              * unless a different Response Mode was specified.
              */
-        }
-        catch (OAuthException $e) {
+        } catch (OAuthException $e) {
             /**
              * If the Authorization Server encounters any error, it MUST return an error response, per Section 3.1.2.6.
              */

src/OAuth2/Extensions/PKCE/Credentials/AuthorizationCode.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                                 int $expiresAt, ?string $requestedScope = null, ?string $redirectUri = null,
                                 ?string $codeChallenge = null, ?string $codeChallengeMethod = null)
     {
-       parent::__construct($code, $scope, $clientIdentifier, $resourceOwnerIdentifier, $expiresAt, $requestedScope, $redirectUri);
+        parent::__construct($code, $scope, $clientIdentifier, $resourceOwnerIdentifier, $expiresAt, $requestedScope, $redirectUri);
         $this->codeChallenge = $codeChallenge;
         $this->codeChallengeMethod = $codeChallengeMethod;
     }

src/OAuth2/Endpoints/TokenEndpoint.php

Spacing +2 added lines, -2 removed lines

@@ -88,9 +88,9 @@
              */
             $status = 400;
             $headers = ['Content-Type' => 'application/json'];
-            if($e->getError() === 'invalid_client') {
+            if ($e->getError() === 'invalid_client') {
                 $status = 401;
-                    if($request->hasHeader('Authorization')) {
+                    if ($request->hasHeader('Authorization')) {
                         $headers['WWW-Authenticate'] = 'Basic';
                 }
             }

src/OAuth2/ClientAuthentication/ClientAuthenticationMethodManager.php

Spacing +6 added lines, -6 removed lines

@@ -57,8 +57,8 @@ 
         $clientAuthenticationMethodUsed = null;
         $authenticated = false;
         foreach ($this->clientAuthenticationMethods as $identifier => $clientAuthenticationMethod) {
-            if($clientAuthenticationMethod->support($request, $requestData))  {
-                if($clientAuthenticationMethodUsedIdentifier) {
+            if ($clientAuthenticationMethod->support($request, $requestData)) {
+                if ($clientAuthenticationMethodUsedIdentifier) {
                     throw new OAuthException('invalid_request',
                         'The request utilizes more than one mechanism for authenticating the client.',
                         'https://tools.ietf.org/html/rfc6749#section-3.2.1');
@@ -68,8 +68,8 @@ 
             }
         }
 
-        if($clientAuthenticationMethodUsed) {
-            if(!$client = $clientAuthenticationMethod->authenticate($request, $requestData)) {
+        if ($clientAuthenticationMethodUsed) {
+            if (!$client = $clientAuthenticationMethod->authenticate($request, $requestData)) {
                 throw new OAuthException('invalid_client',
                     'Client authentication failed. Unknown client.',
                     'https://tools.ietf.org/html/rfc6749#section-3.2.1');
@@ -85,7 +85,7 @@ 
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
 
-            if($client->hasCredentials()) {
+            if ($client->hasCredentials()) {
                 if (!$authenticated) {
                     throw new OAuthException('invalid_client', 'Client authentication failed. No client authentication included',
                         'https://tools.ietf.org/html/rfc6749#section-3.2.1');
@@ -96,7 +96,7 @@ 
         }
 
         $tokenEndpointAuthMethod = $client->getMetadata()->getTokenEndpointAuthMethod() ?: 'client_secret_basic';
-        if($tokenEndpointAuthMethod !== $clientAuthenticationMethodUsedIdentifier) {
+        if ($tokenEndpointAuthMethod !== $clientAuthenticationMethodUsedIdentifier) {
             throw new OAuthException('invalid_client',
                 'Client authentication failed. Unsupported authentication method.',
                 'https://tools.ietf.org/html/rfc6749#section-3.2.1');