style: Apply PHP-CS-Fixer

theofidry · chalasr · commit d7cb055faea5 · 2023-12-20T19:08:49.000+01:00
diff --git a/src/DBAL/Type/Grant.php b/src/DBAL/Type/Grant.php
@@ -16,9 +16,6 @@ final class Grant extends ImplodedArray
      */
     private const NAME = 'oauth2_grant';
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return self::NAME;
diff --git a/src/DBAL/Type/ImplodedArray.php b/src/DBAL/Type/ImplodedArray.php
@@ -39,10 +39,6 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param mixed $value
-     *
      * @psalm-return list<T>
      */
     public function convertToPHPValue($value, AbstractPlatform $platform): array
@@ -58,19 +54,13 @@ public function convertToPHPValue($value, AbstractPlatform $platform): array
         return $this->convertDatabaseValues($values);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         $column['length'] = 65535;
 
         return parent::getSQLDeclaration($column, $platform);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function requiresSQLCommentHint(AbstractPlatform $platform): bool
     {
         return true;
diff --git a/src/DBAL/Type/RedirectUri.php b/src/DBAL/Type/RedirectUri.php
@@ -16,9 +16,6 @@ final class RedirectUri extends ImplodedArray
      */
     private const NAME = 'oauth2_redirect_uri';
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return self::NAME;
diff --git a/src/DBAL/Type/Scope.php b/src/DBAL/Type/Scope.php
@@ -16,9 +16,6 @@ final class Scope extends ImplodedArray
      */
     private const NAME = 'oauth2_scope';
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return self::NAME;
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -13,9 +13,6 @@
 
 final class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('league_oauth2_server');
diff --git a/src/DependencyInjection/LeagueOAuth2ServerExtension.php b/src/DependencyInjection/LeagueOAuth2ServerExtension.php
@@ -42,8 +42,6 @@
 final class LeagueOAuth2ServerExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface
 {
     /**
-     * {@inheritdoc}
-     *
      * @return void
      *
      * @throws \Exception
@@ -73,17 +71,12 @@ public function load(array $configs, ContainerBuilder $container)
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getAlias(): string
     {
         return 'league_oauth2_server';
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return void
      */
     public function prepend(ContainerBuilder $container)
@@ -101,8 +94,6 @@ public function prepend(ContainerBuilder $container)
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return void
      */
     public function process(ContainerBuilder $container)
diff --git a/src/Entity/Scope.php b/src/Entity/Scope.php
@@ -11,11 +11,6 @@ final class Scope implements ScopeEntityInterface
 {
     use EntityTrait;
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
diff --git a/src/LeagueOAuth2ServerBundle.php b/src/LeagueOAuth2ServerBundle.php
@@ -18,8 +18,6 @@
 final class LeagueOAuth2ServerBundle extends Bundle
 {
     /**
-     * {@inheritdoc}
-     *
      * @return void
      */
     public function build(ContainerBuilder $container)
@@ -30,9 +28,6 @@ public function build(ContainerBuilder $container)
         $this->configureSecurityExtension($container);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getContainerExtension(): ExtensionInterface
     {
         return new LeagueOAuth2ServerExtension();
diff --git a/src/Model/RefreshToken.php b/src/Model/RefreshToken.php
@@ -29,7 +29,7 @@ class RefreshToken implements RefreshTokenInterface
     /**
      * @psalm-mutation-free
      */
-    public function __construct(string $identifier, \DateTimeInterface $expiry, ?AccessTokenInterface $accessToken = null)
+    public function __construct(string $identifier, \DateTimeInterface $expiry, AccessTokenInterface $accessToken = null)
     {
         $this->identifier = $identifier;
         $this->expiry = $expiry;
diff --git a/src/Repository/AccessTokenRepository.php b/src/Repository/AccessTokenRepository.php
@@ -42,9 +42,6 @@ public function __construct(
         $this->scopeConverter = $scopeConverter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, $userIdentifier = null)
     {
         /** @var int|string|null $userIdentifier */
@@ -59,9 +56,6 @@ public function getNewToken(ClientEntityInterface $clientEntity, array $scopes,
         return $accessToken;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEntity): void
     {
         $accessToken = $this->accessTokenManager->find($accessTokenEntity->getIdentifier());
diff --git a/src/Repository/AuthCodeRepository.php b/src/Repository/AuthCodeRepository.php
@@ -41,17 +41,12 @@ public function __construct(
         $this->scopeConverter = $scopeConverter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getNewAuthCode(): AuthCode
     {
         return new AuthCode();
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return void
      */
     public function persistNewAuthCode(AuthCodeEntityInterface $authCodeEntity)
@@ -67,9 +62,6 @@ public function persistNewAuthCode(AuthCodeEntityInterface $authCodeEntity)
         $this->authorizationCodeManager->save($authorizationCode);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function revokeAuthCode($codeId): void
     {
         $authorizationCode = $this->authorizationCodeManager->find($codeId);
@@ -83,9 +75,6 @@ public function revokeAuthCode($codeId): void
         $this->authorizationCodeManager->save($authorizationCode);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAuthCodeRevoked($codeId): bool
     {
         $authorizationCode = $this->authorizationCodeManager->find($codeId);
diff --git a/src/Repository/ClientRepository.php b/src/Repository/ClientRepository.php
@@ -21,9 +21,6 @@ public function __construct(ClientManagerInterface $clientManager)
         $this->clientManager = $clientManager;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getClientEntity($clientIdentifier)
     {
         $client = $this->clientManager->find($clientIdentifier);
@@ -35,9 +32,6 @@ public function getClientEntity($clientIdentifier)
         return $this->buildClientEntity($client);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function validateClient($clientIdentifier, $clientSecret, $grantType): bool
     {
         $client = $this->clientManager->find($clientIdentifier);
diff --git a/src/Repository/NullAccessTokenRepository.php b/src/Repository/NullAccessTokenRepository.php
@@ -11,9 +11,6 @@
 
 final class NullAccessTokenRepository implements AccessTokenRepositoryInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, $userIdentifier = null): AccessTokenEntityInterface
     {
         /** @var int|string|null $userIdentifier */
@@ -28,25 +25,16 @@ public function getNewToken(ClientEntityInterface $clientEntity, array $scopes,
         return $accessToken;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEntity): void
     {
         // do nothing
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function revokeAccessToken($tokenId): void
     {
         // do nothing
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAccessTokenRevoked($tokenId): bool
     {
         return false;
diff --git a/src/Repository/RefreshTokenRepository.php b/src/Repository/RefreshTokenRepository.php
@@ -32,17 +32,11 @@ public function __construct(
         $this->accessTokenManager = $accessTokenManager;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getNewRefreshToken()
     {
         return new RefreshTokenEntity();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function persistNewRefreshToken(RefreshTokenEntityInterface $refreshTokenEntity): void
     {
         $refreshToken = $this->refreshTokenManager->find($refreshTokenEntity->getIdentifier());
diff --git a/src/Repository/ScopeRepository.php b/src/Repository/ScopeRepository.php
@@ -52,9 +52,6 @@ public function __construct(
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getScopeEntityByIdentifier($identifier)
     {
         $scope = $this->scopeManager->find($identifier);
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
@@ -42,9 +42,6 @@ public function __construct(
         $this->userConverter = $userConverter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUserEntityByUserCredentials(
         $username,
         $password,
diff --git a/src/Security/Authenticator/OAuth2Authenticator.php b/src/Security/Authenticator/OAuth2Authenticator.php
@@ -70,7 +70,7 @@ public function __construct(
 
     public function supports(Request $request): ?bool
     {
-        return 0 === strpos($request->headers->get('Authorization', ''), 'Bearer ');
+        return str_starts_with($request->headers->get('Authorization', ''), 'Bearer ');
     }
 
     public function start(Request $request, AuthenticationException $authException = null): Response
@@ -79,8 +79,6 @@ public function start(Request $request, AuthenticationException $authException =
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return Passport
      */
     public function doAuthenticate(Request $request) /* : Passport */
diff --git a/src/Security/Exception/InsufficientScopesException.php b/src/Security/Exception/InsufficientScopesException.php
@@ -9,7 +9,7 @@
  */
 class InsufficientScopesException extends OAuth2AuthenticationException
 {
-    public static function create(?\Throwable $previous = null): self
+    public static function create(\Throwable $previous = null): self
     {
         return new self('Insufficient scopes.', 403, $previous);
     }
diff --git a/src/Security/Exception/OAuth2AuthenticationException.php b/src/Security/Exception/OAuth2AuthenticationException.php
@@ -17,7 +17,7 @@ class OAuth2AuthenticationException extends AuthenticationException implements H
      */
     private $statusCode;
 
-    public function __construct(string $message, int $statusCode, ?\Throwable $previous = null)
+    public function __construct(string $message, int $statusCode, \Throwable $previous = null)
     {
         $this->statusCode = $statusCode;
 
diff --git a/src/Security/Exception/OAuth2AuthenticationFailedException.php b/src/Security/Exception/OAuth2AuthenticationFailedException.php
@@ -9,7 +9,7 @@
  */
 class OAuth2AuthenticationFailedException extends OAuth2AuthenticationException
 {
-    public static function create(string $message, ?\Throwable $previous = null): self
+    public static function create(string $message, \Throwable $previous = null): self
     {
         return new self($message, 401, $previous);
     }
diff --git a/tests/Acceptance/DoctrineCredentialsRevokerTest.php b/tests/Acceptance/DoctrineCredentialsRevokerTest.php
@@ -90,7 +90,7 @@ private function buildRefreshToken(string $identifier, string $modify, AccessTok
         );
     }
 
-    private function buildAccessToken(string $identifier, string $modify, Client $client, ?string $userIdentifier = null): AccessToken
+    private function buildAccessToken(string $identifier, string $modify, Client $client, string $userIdentifier = null): AccessToken
     {
         return new AccessToken(
             $identifier,
@@ -101,7 +101,7 @@ private function buildAccessToken(string $identifier, string $modify, Client $cl
         );
     }
 
-    private function buildAuthCode(string $identifier, string $modify, Client $client, ?string $userIdentifier = null): AuthorizationCode
+    private function buildAuthCode(string $identifier, string $modify, Client $client, string $userIdentifier = null): AuthorizationCode
     {
         return new AuthorizationCode(
             $identifier,
diff --git a/tests/Fixtures/User.php b/tests/Fixtures/User.php
diff --git a/tests/Integration/AbstractIntegrationTest.php b/tests/Integration/AbstractIntegrationTest.php
diff --git a/tests/TestKernel.php b/tests/TestKernel.php

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@ final class Grant extends ImplodedArray`
`16`	`16`	`*/`
`17`	`17`	`private const NAME = 'oauth2_grant';`
`18`	`18`
`19`		`- /**`
`20`		`- * {@inheritdoc}`
`21`		`- */`
`22`	`19`	`public function getName(): string`
`23`	`20`	`{`
`24`	`21`	`return self::NAME;`
Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,6 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`		`- * {@inheritdoc}`
`43`		`- *`
`44`		`- * @param mixed $value`
`45`		`- *`
`46`	`42`	`* @psalm-return list<T>`
`47`	`43`	`*/`
`48`	`44`	`public function convertToPHPValue($value, AbstractPlatform $platform): array`
`@@ -58,19 +54,13 @@ public function convertToPHPValue($value, AbstractPlatform $platform): array`
`58`	`54`	`return $this->convertDatabaseValues($values);`
`59`	`55`	`}`
`60`	`56`
`61`		`- /**`
`62`		`- * {@inheritdoc}`
`63`		`- */`
`64`	`57`	`public function getSQLDeclaration(array $column, AbstractPlatform $platform): string`
`65`	`58`	`{`
`66`	`59`	`$column['length'] = 65535;`
`67`	`60`
`68`	`61`	`return parent::getSQLDeclaration($column, $platform);`
`69`	`62`	`}`
`70`	`63`
`71`		`- /**`
`72`		`- * {@inheritdoc}`
`73`		`- */`
`74`	`64`	`public function requiresSQLCommentHint(AbstractPlatform $platform): bool`
`75`	`65`	`{`
`76`	`66`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@ final class RedirectUri extends ImplodedArray`
`16`	`16`	`*/`
`17`	`17`	`private const NAME = 'oauth2_redirect_uri';`
`18`	`18`
`19`		`- /**`
`20`		`- * {@inheritdoc}`
`21`		`- */`
`22`	`19`	`public function getName(): string`
`23`	`20`	`{`
`24`	`21`	`return self::NAME;`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@ final class Scope extends ImplodedArray`
`16`	`16`	`*/`
`17`	`17`	`private const NAME = 'oauth2_scope';`
`18`	`18`
`19`		`- /**`
`20`		`- * {@inheritdoc}`
`21`		`- */`
`22`	`19`	`public function getName(): string`
`23`	`20`	`{`
`24`	`21`	`return self::NAME;`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`
`14`	`14`	`final class Configuration implements ConfigurationInterface`
`15`	`15`	`{`
`16`		`- /**`
`17`		`- * {@inheritdoc}`
`18`		`- */`
`19`	`16`	`public function getConfigTreeBuilder(): TreeBuilder`
`20`	`17`	`{`
`21`	`18`	`$treeBuilder = new TreeBuilder('league_oauth2_server');`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@`
`42`	`42`	`final class LeagueOAuth2ServerExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface`
`43`	`43`	`{`
`44`	`44`	`/**`
`45`		`- * {@inheritdoc}`
`46`		`- *`
`47`	`45`	`* @return void`
`48`	`46`	`*`
`49`	`47`	`* @throws \Exception`
`@@ -73,17 +71,12 @@ public function load(array $configs, ContainerBuilder $container)`
`73`	`71`	`;`
`74`	`72`	`}`
`75`	`73`
`76`		`- /**`
`77`		`- * {@inheritdoc}`
`78`		`- */`
`79`	`74`	`public function getAlias(): string`
`80`	`75`	`{`
`81`	`76`	`return 'league_oauth2_server';`
`82`	`77`	`}`
`83`	`78`
`84`	`79`	`/**`
`85`		`- * {@inheritdoc}`
`86`		`- *`
`87`	`80`	`* @return void`
`88`	`81`	`*/`
`89`	`82`	`public function prepend(ContainerBuilder $container)`
`@@ -101,8 +94,6 @@ public function prepend(ContainerBuilder $container)`
`101`	`94`	`}`
`102`	`95`
`103`	`96`	`/**`
`104`		`- * {@inheritdoc}`
`105`		`- *`
`106`	`97`	`* @return void`
`107`	`98`	`*/`
`108`	`99`	`public function process(ContainerBuilder $container)`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,6 @@ final class Scope implements ScopeEntityInterface`
`11`	`11`	`{`
`12`	`12`	`use EntityTrait;`
`13`	`13`
`14`		`- /**`
`15`		`- * {@inheritdoc}`
`16`		`- *`
`17`		`- * @return mixed`
`18`		`- */`
`19`	`14`	`#[\ReturnTypeWillChange]`
`20`	`15`	`public function jsonSerialize()`
`21`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`final class LeagueOAuth2ServerBundle extends Bundle`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`		`- * {@inheritdoc}`
`22`		`- *`
`23`	`21`	`* @return void`
`24`	`22`	`*/`
`25`	`23`	`public function build(ContainerBuilder $container)`
`@@ -30,9 +28,6 @@ public function build(ContainerBuilder $container)`
`30`	`28`	`$this->configureSecurityExtension($container);`
`31`	`29`	`}`
`32`	`30`
`33`		`- /**`
`34`		`- * {@inheritdoc}`
`35`		`- */`
`36`	`31`	`public function getContainerExtension(): ExtensionInterface`
`37`	`32`	`{`
`38`	`33`	`return new LeagueOAuth2ServerExtension();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class RefreshToken implements RefreshTokenInterface`
`29`	`29`	`/**`
`30`	`30`	`* @psalm-mutation-free`
`31`	`31`	`*/`
`32`		`- public function __construct(string $identifier, \DateTimeInterface $expiry, ?AccessTokenInterface $accessToken = null)`
	`32`	`+ public function __construct(string $identifier, \DateTimeInterface $expiry, AccessTokenInterface $accessToken = null)`
`33`	`33`	`{`
`34`	`34`	`$this->identifier = $identifier;`
`35`	`35`	`$this->expiry = $expiry;`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@ public function __construct(`
`42`	`42`	`$this->scopeConverter = $scopeConverter;`
`43`	`43`	`}`
`44`	`44`
`45`		`- /**`
`46`		`- * {@inheritdoc}`
`47`		`- */`
`48`	`45`	`public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, $userIdentifier = null)`
`49`	`46`	`{`
`50`	`47`	`/** @var int\|string\|null $userIdentifier */`
`@@ -59,9 +56,6 @@ public function getNewToken(ClientEntityInterface $clientEntity, array $scopes,`
`59`	`56`	`return $accessToken;`
`60`	`57`	`}`
`61`	`58`
`62`		`- /**`
`63`		`- * {@inheritdoc}`
`64`		`- */`
`65`	`59`	`public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEntity): void`
`66`	`60`	`{`
`67`	`61`	`$accessToken = $this->accessTokenManager->find($accessTokenEntity->getIdentifier());`