php-guard / oauth-server

src/OAuth2/EndpointMessages/Token/AccessTokenResponse.php

Doc Comments +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
      * Response constructor.
      * @param string $accessToken
      * @param string $tokenType
-     * @param int|null $expiresIn
+     * @param integer $expiresIn
      * @param null|string $refreshToken
      * @param null|string $scope
      */

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 
 
 use GuzzleHttp\Psr7\Response;
-use Psr\Http\Message\UriInterface;
 
 /**
  * Class AccessTokenResponse

src/OAuth2/EndpointMessages/Token/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

@@ -37,25 +37,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'] = $errorUri;

src/OAuth2/OpenID/ResponseTypes/CodeResponseType.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use OAuth2\Config;
 use OAuth2\Exceptions\OAuthException;
 use OAuth2\Repositories\ConfigurationRepository;
-use OAuth2\ResponseTypes\ResponseTypeInterface;
 use OAuth2\Roles\Clients\RegisteredClient;
 use OAuth2\Roles\ResourceOwnerInterface;
 use OAuth2\Storages\AuthorizationCodeStorageInterface;

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      * @return array
      */
     public function handle(ServerRequestInterface $request, ResourceOwnerInterface $resourceOwner,
-                           RegisteredClient $client, ?array $scope = null): array
+                            RegisteredClient $client, ?array $scope = null): array
     {
         // TODO: Implement handle() method.
     }

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
             );
         }
 
-        if(!$state && $this->configurationRepository->getConfig(Config::ENFORCE_STATE)) {
+        if (!$state && $this->configurationRepository->getConfig(Config::ENFORCE_STATE)) {
             throw new OAuthException('invalid_request',
                 'Missing a required parameter : state',
                 'http://openid.net/specs/openid-connect-core-1_0.html#AuthorizationEndpoint'

src/OAuth2/Server.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     /**
      * Server constructor.
      * @param ResourceOwnerProviderInterface $resourceOwnerProvider
-     * @param null|StorageRepository $storageRepository
+     * @param StorageRepository $storageRepository
      * @param null|ConfigurationRepository $configurationRepository
      * @param ResponseTypeRepository $responseTypeRepository
      * @param null|GrantTypeRepository $grantTypeRepository

src/Old/Endpoint/Endpoint.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      * method available via the user-agent to accomplish this redirection is
      * allowed and is considered to be an implementation detail
      *
-     * @param $uri
+     * @param string $uri
      * @return Response
      */
     protected function redirectResponse($uri)

Spacing +6 added lines, -6 removed lines

@@ -74,18 +74,18 @@ 
     protected function errorResponse(string $redirectUri, string $error, ?string $description = null, ?string $uri = 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));
         }
 
         $data = ['error' => $error];
 
         if ($description) {
             if ($this->containsNotAsciiChar($description)) {
-                throw new \Exception('Malformed error description. Expect ascii string. Got : ' . $description);
+                throw new \Exception('Malformed error description. Expect ascii string. Got : '.$description);
             }
 
             $data['error_description'] = $description;
@@ -93,7 +93,7 @@ 
 
         if ($uri) {
             if ($this->containsNotAsciiChar($uri)) {
-                throw new \Exception('Malformed error uri. Expect ascii string. Got : ' . $uri);
+                throw new \Exception('Malformed error uri. Expect ascii string. Got : '.$uri);
             }
 
             $data['error_uri'] = $uri;
@@ -102,9 +102,9 @@ 
         $redirectUri = new Uri($redirectUri);
         $query = http_build_query($data);
         if ($redirectUri->getQuery()) {
-            $query .= '&' . $redirectUri->getQuery();
+            $query .= '&'.$redirectUri->getQuery();
         }
-        $redirectUri = $redirectUri->getScheme() . ':' . $redirectUri->getHierPart() . '?' . $query;
+        $redirectUri = $redirectUri->getScheme().':'.$redirectUri->getHierPart().'?'.$query;
 
         return $this->redirectResponse($redirectUri);
     }

src/Old/Endpoint/Server/Authorization.php

Doc Comments +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
      * @param RegisteredClient $client
      * @param null|string $redirectUri
      * @param bool $isImplicitGrant
-     * @return Uri|null|string
+     * @return \Psr\Http\Message\UriInterface
      * @throws \Exception
      */
     private function checkClientRedirectUri(RegisteredClient $client, ?string $redirectUri, $isImplicitGrant = false)

Unused Use Statements -4 removed lines

@@ -10,20 +10,16 @@
 
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Uri;
-use OAuth2\Credential\AuthorizationCode;
 use OAuth2\Endpoint\Config;
 use OAuth2\Endpoint\Endpoint;
 use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationRequest as AuthorizationRequest;
-use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationResponse as AuthorizationResponse;
 use OAuth2\Endpoint\Server\Messages\Authorization\ErrorResponse;
 use OAuth2\Exception\MissingResourceOwnerDecision;
 use OAuth2\Exception\ResourceOwnerNotAuthenticatedException;
 use OAuth2\ResponseType\ResponseTypeInterface;
-use OAuth2\Storage\ClientStorage;
 use OAuth2\Role\Client\RegisteredClient;
 use OAuth2\Role\Client\Type\ClientPassword;
 use OAuth2\Role\Client\Type\PublicClient;
-use OAuth2\Role\Client\WebApplication;
 use OAuth2\Role\ResourceOwner;
 
 

Spacing +3 added lines, -3 removed lines

@@ -175,12 +175,12 @@ 
             $responseTypes = [];
             foreach (explode(' ', $request->getResponseType()) as $responseTypeRequested) {
                 $responseType = $this->server->getResponseType($responseTypeRequested);
-                if(!$responseType) {
+                if (!$responseType) {
                     return new ErrorResponse($redirectUri, 'unsupported_response_type', 'Invalid response_type parameter',
                         'https://tools.ietf.org/html/rfc6749#section-3.1.1');
                 }
 
-                if($responseType->isImplicit()) {
+                if ($responseType->isImplicit()) {
                     $isImplicitResponseType = true;
                 }
 
@@ -236,7 +236,7 @@ 
             $params['state'] = $request->getState();
         }
 
-        if($isImplicitResponseType) {
+        if ($isImplicitResponseType) {
             $redirectUri = $redirectUri->withFragment(http_build_query($params));
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -238,8 +238,7 @@
 
         if($isImplicitResponseType) {
             $redirectUri = $redirectUri->withFragment(http_build_query($params));
-        }
-        else {
+        } else {
             foreach ($params as $key => $value) {
                 $redirectUri = Uri::withQueryValue($redirectUri, $key, $value);
             }

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

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
      * @param UriInterface $redirectUri
      * @param string $accessToken
      * @param string $tokenType
-     * @param int|null $expiresIn
+     * @param integer $expiresIn
      * @param null|string $refreshToken
      * @param null|string $scope
      */

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());
         }