php-guard / oauth-server

src/Old/Endpoint/Server/Message/AccessToken/ErrorResponse.php

Unused Use Statements -2 removed lines

@@ -10,8 +10,6 @@
 
 
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Uri;
-use Psr\Http\Message\UriInterface;
 
 class ErrorResponse extends Response
 {

Spacing +4 added lines, -4 removed lines

@@ -36,25 +36,25 @@
     public function __construct(string $error, ?string $errorDescription = null, ?string $errorUri = null, int $status = 400, array $headers = [])
     {
         if ($this->containsNotAsciiChar($error)) {
-            throw new \Exception('Malformed error type. Expect ascii string. Got : ' . $error);
+            throw new \Exception('Malformed error type. Expect ascii string. Got : '.$error);
         }
 
         if (!in_array($error, self::errors)) {
-            throw new \Exception('Unexpected error type. Expect one of : ' . implode(', ', self::errors));
+            throw new \Exception('Unexpected error type. Expect one of : '.implode(', ', self::errors));
         }
 
         $data = ['error' => $error];
 
         if ($errorDescription) {
             if ($this->containsNotAsciiChar($errorDescription)) {
-                throw new \Exception('Malformed error description. Expect ascii string. Got : ' . $errorDescription);
+                throw new \Exception('Malformed error description. Expect ascii string. Got : '.$errorDescription);
             }
             $data['error_description'] = $errorDescription;
         }
 
         if ($errorUri) {
             if ($this->containsNotAsciiChar($errorUri)) {
-                throw new \Exception('Malformed error uri. Expect ascii string. Got : ' . $errorUri);
+                throw new \Exception('Malformed error uri. Expect ascii string. Got : '.$errorUri);
             }
 
             $data['error_uri'] = $errorDescription;

src/Old/Endpoint/Server/Server.php

Doc Comments +4 added lines, -1 removed lines

@@ -141,7 +141,7 @@ 
 
     /**
      * @param string $name
-     * @return mixed
+     * @return boolean
      * @throws \Exception
      */
     public function getConfig(string $name)
@@ -161,6 +161,9 @@ 
         return $this->grantTypes[$uri] ?? null;
     }
 
+    /**
+     * @return \OAuth2\Storages\AuthorizationCodeStorageInterface
+     */
     public function getStorage(string $name)
     {
         return $this->storages[$name];

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
 use OAuth2\Storage\AuthorizationCodeStorage;
 use OAuth2\Storage\ClientStorage;
 use OAuth2\Role\Client\RegisteredClient;
-use OAuth2\Role\Client\Type\ClientPassword;
 use Psr\Http\Message\ServerRequestInterface;
 
 class Server

Spacing +5 added lines, -5 removed lines

@@ -90,15 +90,15 @@ 
     {
         foreach (self::STORAGES as $name => $class) {
             if (!isset($storages[$name])) {
-                throw new \Exception('Missing storage "' . $name . '"');
+                throw new \Exception('Missing storage "'.$name.'"');
             }
             if (!is_a($storages[$name], $class)) {
-                throw new \Exception('Storage "' . $name . '" must implement interface "' . $class . '"');
+                throw new \Exception('Storage "'.$name.'" must implement interface "'.$class.'"');
             }
         }
 
         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);
@@ -146,7 +146,7 @@ 
      */
     public function getConfig(string $name)
     {
-        if(!isset($this->config[$name])) {
+        if (!isset($this->config[$name])) {
             throw new \Exception('Config with name "'.$name.'" not found');
         }
         return $this->config[$name];
@@ -392,7 +392,7 @@ 
     public function authenticate(ServerRequestInterface $request)
     {
         $this->client = $this->guard->authenticate($request);
-        return (bool)$this->client;
+        return (bool) $this->client;
     }
 
     /**

src/Old/Endpoint/Server/Token.php

Unused Use Statements -8 removed lines

@@ -11,19 +11,11 @@
 use GuzzleHttp\Psr7\Uri;
 use OAuth2\Credential\AccessToken;
 use OAuth2\Credential\RefreshToken;
-use OAuth2\Credential\TokenType\BearerToken;
-use OAuth2\Endpoint\Config;
 use OAuth2\Endpoint\Server\Messages\AccessToken\AccessTokenRequest;
 use OAuth2\Endpoint\Server\Messages\AccessToken\AccessTokenResponse;
-use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationRequest;
 use OAuth2\Endpoint\Server\Messages\AccessToken\ErrorResponse;
-use OAuth2\GrantType\AuthorizationCode;
 use OAuth2\GrantType\InvalidGrantType;
-use OAuth2\Storage\ClientStorage;
 use OAuth2\Role\Client;
-use OAuth2\Role\Client\RegisteredClient;
-use OAuth2\Role\Client\Type\ClientPassword;
-use Psr\Http\Message\ServerRequestInterface;
 
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
         try {
             $redirectUri = $grantType->grant($request, $client);
         }
-        catch(InvalidGrantType $e) {
+        catch (InvalidGrantType $e) {
             return new ErrorResponse('invalid_grant', $e->getErrorDescription(), $e->getErrorUri());
         }
 

Braces +1 added lines, -2 removed lines

@@ -166,8 +166,7 @@
 
         try {
             $redirectUri = $grantType->grant($request, $client);
-        }
-        catch(InvalidGrantType $e) {
+        } catch(InvalidGrantType $e) {
             return new ErrorResponse('invalid_grant', $e->getErrorDescription(), $e->getErrorUri());
         }
 

src/Old/GrantType/AuthorizationCode.php

Unused Use Statements -5 removed lines

@@ -8,15 +8,10 @@
 
 namespace OAuth2\GrantType;
 use OAuth2\Endpoint\Server\Messages\AccessToken\AccessTokenRequest;
-use OAuth2\Endpoint\Server\Messages\AccessToken\ErrorResponse;
 use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationRequest;
 use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationResponse;
-use OAuth2\Endpoint\Server\Server;
-use OAuth2\Role\Client;
 use OAuth2\Role\Client\RegisteredClient;
-use OAuth2\Storage\AuthorizationCodeStorage;
 use OAuth2\Storages\AuthorizationCodeStorageInterface;
-use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * Class AuthorizationCode

src/Old/Endpoint/Server/Authentication/Guard.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
          * @var AuthenticatorInterface $authenticator
          */
         foreach ($this->authenticators as $authenticator) {
-            if($authenticator->requireAuthentication($client)) {
+            if ($authenticator->requireAuthentication($client)) {
                 return true;
             }
         }
@@ -43,7 +43,7 @@ 
          * @var AuthenticatorInterface $authenticator
          */
         foreach ($this->authenticators as $authenticator) {
-            if($client = $authenticator->authenticate($request)) {
+            if ($client = $authenticator->authenticate($request)) {
                 return $client;
             }
         }

src/Old/Endpoint/Server/Message/Authorization/ErrorResponse.php

Spacing +4 added lines, -4 removed lines

@@ -36,18 +36,18 @@ 
     public function __construct(UriInterface $redirectUri, string $error, ?string $errorDescription = null, ?string $errorUri = null)
     {
         if ($this->containsNotAsciiChar($error)) {
-            throw new \Exception('Malformed error type. Expect ascii string. Got : ' . $error);
+            throw new \Exception('Malformed error type. Expect ascii string. Got : '.$error);
         }
 
         if (!in_array($error, self::errors)) {
-            throw new \Exception('Unexpected error type. Expect one of : ' . implode(', ', self::errors));
+            throw new \Exception('Unexpected error type. Expect one of : '.implode(', ', self::errors));
         }
 
         $redirectUri = Uri::withQueryValue($redirectUri, 'error', $error);
 
         if ($errorDescription) {
             if ($this->containsNotAsciiChar($errorDescription)) {
-                throw new \Exception('Malformed error description. Expect ascii string. Got : ' . $errorDescription);
+                throw new \Exception('Malformed error description. Expect ascii string. Got : '.$errorDescription);
             }
 
             $redirectUri = Uri::withQueryValue($redirectUri, 'error_description', $errorDescription);
@@ -55,7 +55,7 @@ 
 
         if ($errorUri) {
             if ($this->containsNotAsciiChar($errorUri)) {
-                throw new \Exception('Malformed error uri. Expect ascii string. Got : ' . $errorUri);
+                throw new \Exception('Malformed error uri. Expect ascii string. Got : '.$errorUri);
             }
 
             $redirectUri = Uri::withQueryValue($redirectUri, 'error_uri', $errorUri);

src/Old/Endpoint/Server/Message/Authorization/AuthorizationRequest.php

Spacing +2 added lines, -2 removed lines

@@ -96,11 +96,11 @@
      * @throws \Exception
      */
     public function validate() {
-        if(!$this->responseType) {
+        if (!$this->responseType) {
             throw new \Exception('Missing response_type parameter');
         }
 
-        if(!$this->clientId) {
+        if (!$this->clientId) {
             throw new \Exception('Missing client_id parameter');
         }
         return true;

src/OAuth2/EndpointMessages/Token/AccessTokenRequest.php

Spacing +2 added lines, -2 removed lines

@@ -94,10 +94,10 @@
      */
     static public function createFromServerRequest(ServerRequestInterface $request)
     {
-        if(!isset($request->getParsedBody()['grant_type'])) {
+        if (!isset($request->getParsedBody()['grant_type'])) {
             throw new \Exception('Missing a required parameter : grant_type');
         }
-        if(!isset($request->getParsedBody()['code'])) {
+        if (!isset($request->getParsedBody()['code'])) {
             throw new \Exception('Missing a required parameter : code');
         }
 

src/OAuth2/EndpointMessages/Authorization/ErrorResponse.php

Spacing +5 added lines, -5 removed lines

@@ -37,18 +37,18 @@ 
                                 ?string $errorUri = null, ?string $state = null)
     {
         if ($this->containsNotAsciiChar($error)) {
-            throw new \Exception('Malformed error type. Expect ascii string. Got : ' . $error);
+            throw new \Exception('Malformed error type. Expect ascii string. Got : '.$error);
         }
 
         if (!in_array($error, self::errors)) {
-            throw new \Exception('Unexpected error type. Expect one of : ' . implode(', ', self::errors));
+            throw new \Exception('Unexpected error type. Expect one of : '.implode(', ', self::errors));
         }
 
         $redirectUri = Uri::withQueryValue($redirectUri, 'error', $error);
 
         if ($errorDescription) {
             if ($this->containsNotAsciiChar($errorDescription)) {
-                throw new \Exception('Malformed error description. Expect ascii string. Got : ' . $errorDescription);
+                throw new \Exception('Malformed error description. Expect ascii string. Got : '.$errorDescription);
             }
 
             $redirectUri = Uri::withQueryValue($redirectUri, 'error_description', $errorDescription);
@@ -56,13 +56,13 @@ 
 
         if ($errorUri) {
             if ($this->containsNotAsciiChar($errorUri)) {
-                throw new \Exception('Malformed error uri. Expect ascii string. Got : ' . $errorUri);
+                throw new \Exception('Malformed error uri. Expect ascii string. Got : '.$errorUri);
             }
 
             $redirectUri = Uri::withQueryValue($redirectUri, 'error_uri', $errorUri);
         }
 
-        if($state) {
+        if ($state) {
             $redirectUri = Uri::withQueryValue($redirectUri, 'state', $state);
         }