From c6faa228fe28b50e9589e5e1f0b291aab670b3ed Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Sat, 9 Apr 2016 15:25:45 +0100 Subject: [PATCH] Updated references to interfaces --- examples/src/Entities/AccessTokenEntity.php | 2 +- examples/src/Entities/AuthCodeEntity.php | 2 +- examples/src/Entities/ClientEntity.php | 2 +- examples/src/Entities/RefreshTokenEntity.php | 2 +- examples/src/Entities/ScopeEntity.php | 2 +- examples/src/Entities/UserEntity.php | 2 +- .../Repositories/AccessTokenRepository.php | 4 +-- .../src/Repositories/AuthCodeRepository.php | 2 +- .../Repositories/RefreshTokenRepository.php | 2 +- examples/src/Repositories/ScopeRepository.php | 2 +- examples/src/Repositories/UserRepository.php | 2 +- src/Entities/Traits/RefreshTokenTrait.php | 2 +- src/Entities/Traits/TokenEntityTrait.php | 8 +++--- src/Grant/AbstractGrant.php | 28 +++++++++---------- src/Grant/AuthCodeGrant.php | 4 +-- src/Grant/ImplicitGrant.php | 4 +-- src/Grant/PasswordGrant.php | 8 +++--- .../AbstractAccessTokenRepository.php | 12 ++++---- .../AbstractAuthCodeRepository.php | 6 ++-- .../AbstractRefreshTokenRepository.php | 4 +-- .../AccessTokenRepositoryInterface.php | 10 +++---- .../AuthCodeRepositoryInterface.php | 6 ++-- .../ClientRepositoryInterface.php | 2 +- .../RefreshTokenRepositoryInterface.php | 4 +-- src/Repositories/ScopeRepositoryInterface.php | 10 +++---- src/Repositories/UserRepositoryInterface.php | 6 ++-- src/ResponseTypes/AbstractResponseType.php | 8 +++--- src/ResponseTypes/BearerTokenResponse.php | 2 +- src/ResponseTypes/ResponseTypeInterface.php | 8 +++--- tests/Grant/AbstractGrantTest.php | 6 ++-- tests/Grant/AuthCodeGrantTest.php | 4 +-- tests/Grant/ClientCredentialsGrantTest.php | 2 +- tests/Grant/PasswordGrantTest.php | 4 +-- tests/Grant/RefreshTokenGrantTest.php | 4 +-- tests/Stubs/ClientEntity.php | 2 +- tests/Stubs/ScopeEntity.php | 2 +- tests/Stubs/StubResponseType.php | 8 +++--- tests/Stubs/UserEntity.php | 2 +- 38 files changed, 95 insertions(+), 95 deletions(-) diff --git a/examples/src/Entities/AccessTokenEntity.php b/examples/src/Entities/AccessTokenEntity.php index e1dd1a02..802bafe0 100644 --- a/examples/src/Entities/AccessTokenEntity.php +++ b/examples/src/Entities/AccessTokenEntity.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Entities; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; use League\OAuth2\Server\Entities\Traits\AccessTokenTrait; use League\OAuth2\Server\Entities\Traits\EntityTrait; use League\OAuth2\Server\Entities\Traits\TokenEntityTrait; diff --git a/examples/src/Entities/AuthCodeEntity.php b/examples/src/Entities/AuthCodeEntity.php index a54217ef..65590532 100644 --- a/examples/src/Entities/AuthCodeEntity.php +++ b/examples/src/Entities/AuthCodeEntity.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Entities; -use League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface; +use League\OAuth2\Server\Entities\AuthCodeEntityInterface; use League\OAuth2\Server\Entities\Traits\AuthCodeTrait; use League\OAuth2\Server\Entities\Traits\EntityTrait; use League\OAuth2\Server\Entities\Traits\TokenEntityTrait; diff --git a/examples/src/Entities/ClientEntity.php b/examples/src/Entities/ClientEntity.php index 822a3f64..cb3c51d0 100644 --- a/examples/src/Entities/ClientEntity.php +++ b/examples/src/Entities/ClientEntity.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Entities; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; use League\OAuth2\Server\Entities\Traits\EntityTrait; class ClientEntity implements ClientEntityInterface diff --git a/examples/src/Entities/RefreshTokenEntity.php b/examples/src/Entities/RefreshTokenEntity.php index 13ea68eb..ab4561eb 100644 --- a/examples/src/Entities/RefreshTokenEntity.php +++ b/examples/src/Entities/RefreshTokenEntity.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Entities; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Entities\Traits\EntityTrait; use League\OAuth2\Server\Entities\Traits\RefreshTokenTrait; diff --git a/examples/src/Entities/ScopeEntity.php b/examples/src/Entities/ScopeEntity.php index 23d12a44..ba6da73b 100644 --- a/examples/src/Entities/ScopeEntity.php +++ b/examples/src/Entities/ScopeEntity.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Entities; -use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface; +use League\OAuth2\Server\Entities\ScopeEntityInterface; use League\OAuth2\Server\Entities\Traits\EntityTrait; class ScopeEntity implements ScopeEntityInterface diff --git a/examples/src/Entities/UserEntity.php b/examples/src/Entities/UserEntity.php index 9efe6611..d56bdaab 100644 --- a/examples/src/Entities/UserEntity.php +++ b/examples/src/Entities/UserEntity.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Entities; -use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface; +use League\OAuth2\Server\Entities\UserEntityInterface; class UserEntity implements UserEntityInterface { diff --git a/examples/src/Repositories/AccessTokenRepository.php b/examples/src/Repositories/AccessTokenRepository.php index b61f03a2..768f2453 100644 --- a/examples/src/Repositories/AccessTokenRepository.php +++ b/examples/src/Repositories/AccessTokenRepository.php @@ -2,8 +2,8 @@ namespace OAuth2ServerExamples\Repositories; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface; use OAuth2ServerExamples\Entities\AccessTokenEntity; diff --git a/examples/src/Repositories/AuthCodeRepository.php b/examples/src/Repositories/AuthCodeRepository.php index 7145329f..0bf5419b 100644 --- a/examples/src/Repositories/AuthCodeRepository.php +++ b/examples/src/Repositories/AuthCodeRepository.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Repositories; -use League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface; +use League\OAuth2\Server\Entities\AuthCodeEntityInterface; use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface; use OAuth2ServerExamples\Entities\AuthCodeEntity; diff --git a/examples/src/Repositories/RefreshTokenRepository.php b/examples/src/Repositories/RefreshTokenRepository.php index e481dfcc..3e868fd5 100644 --- a/examples/src/Repositories/RefreshTokenRepository.php +++ b/examples/src/Repositories/RefreshTokenRepository.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Repositories; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface; use OAuth2ServerExamples\Entities\RefreshTokenEntity; diff --git a/examples/src/Repositories/ScopeRepository.php b/examples/src/Repositories/ScopeRepository.php index 26aa15cb..228c629b 100644 --- a/examples/src/Repositories/ScopeRepository.php +++ b/examples/src/Repositories/ScopeRepository.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Repositories; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; use League\OAuth2\Server\Repositories\ScopeRepositoryInterface; use OAuth2ServerExamples\Entities\ScopeEntity; diff --git a/examples/src/Repositories/UserRepository.php b/examples/src/Repositories/UserRepository.php index 1ee09fc1..9726be25 100644 --- a/examples/src/Repositories/UserRepository.php +++ b/examples/src/Repositories/UserRepository.php @@ -2,7 +2,7 @@ namespace OAuth2ServerExamples\Repositories; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; use League\OAuth2\Server\Repositories\UserRepositoryInterface; use OAuth2ServerExamples\Entities\ScopeEntity; use OAuth2ServerExamples\Entities\UserEntity; diff --git a/src/Entities/Traits/RefreshTokenTrait.php b/src/Entities/Traits/RefreshTokenTrait.php index f9b60960..96d429fe 100644 --- a/src/Entities/Traits/RefreshTokenTrait.php +++ b/src/Entities/Traits/RefreshTokenTrait.php @@ -3,7 +3,7 @@ namespace League\OAuth2\Server\Entities\Traits; use DateTime; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; trait RefreshTokenTrait { diff --git a/src/Entities/Traits/TokenEntityTrait.php b/src/Entities/Traits/TokenEntityTrait.php index e7b9d29f..3c91542f 100644 --- a/src/Entities/Traits/TokenEntityTrait.php +++ b/src/Entities/Traits/TokenEntityTrait.php @@ -3,8 +3,8 @@ namespace League\OAuth2\Server\Entities\Traits; use DateTime; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; +use League\OAuth2\Server\Entities\ScopeEntityInterface; trait TokenEntityTrait { @@ -31,7 +31,7 @@ trait TokenEntityTrait /** * Associate a scope with the token. * - * @param \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface $scope + * @param \League\OAuth2\Server\Entities\ScopeEntityInterface $scope */ public function addScope(ScopeEntityInterface $scope) { @@ -101,7 +101,7 @@ trait TokenEntityTrait /** * Set the client that the token was issued to. * - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $client + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $client */ public function setClient(ClientEntityInterface $client) { diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php index ca459945..0a1cf824 100644 --- a/src/Grant/AbstractGrant.php +++ b/src/Grant/AbstractGrant.php @@ -12,9 +12,9 @@ namespace League\OAuth2\Server\Grant; use League\Event\EmitterAwareTrait; use League\OAuth2\Server\CryptTrait; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; +use League\OAuth2\Server\Entities\ScopeEntityInterface; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface; use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface; @@ -137,7 +137,7 @@ abstract class AbstractGrant implements GrantTypeInterface * * @throws \League\OAuth2\Server\Exception\OAuthServerException * - * @return \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface + * @return \League\OAuth2\Server\Entities\ClientEntityInterface */ protected function validateClient(ServerRequestInterface $request) { @@ -191,12 +191,12 @@ abstract class AbstractGrant implements GrantTypeInterface * Validate scopes in the request. * * @param string $scopes - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $client + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $client * @param string $redirectUri * * @throws \League\OAuth2\Server\Exception\OAuthServerException * - * @return \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface[] + * @return \League\OAuth2\Server\Entities\ScopeEntityInterface[] */ public function validateScopes( $scopes, @@ -286,11 +286,11 @@ abstract class AbstractGrant implements GrantTypeInterface * Issue an access token. * * @param \DateInterval $accessTokenTTL - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $client + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $client * @param string $userIdentifier - * @param \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface[] $scopes + * @param \League\OAuth2\Server\Entities\ScopeEntityInterface[] $scopes * - * @return \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface + * @return \League\OAuth2\Server\Entities\AccessTokenEntityInterface */ protected function issueAccessToken( \DateInterval $accessTokenTTL, @@ -317,12 +317,12 @@ abstract class AbstractGrant implements GrantTypeInterface * Issue an auth code. * * @param \DateInterval $authCodeTTL - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $client + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $client * @param string $userIdentifier * @param string $redirectUri - * @param \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface[] $scopes + * @param \League\OAuth2\Server\Entities\ScopeEntityInterface[] $scopes * - * @return \League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface + * @return \League\OAuth2\Server\Entities\AuthCodeEntityInterface */ protected function issueAuthCode( \DateInterval $authCodeTTL, @@ -348,9 +348,9 @@ abstract class AbstractGrant implements GrantTypeInterface } /** - * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessToken + * @param \League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessToken * - * @return \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface + * @return \League\OAuth2\Server\Entities\RefreshTokenEntityInterface */ protected function issueRefreshToken(AccessTokenEntityInterface $accessToken) { diff --git a/src/Grant/AuthCodeGrant.php b/src/Grant/AuthCodeGrant.php index 93e7eb51..210dc9a1 100644 --- a/src/Grant/AuthCodeGrant.php +++ b/src/Grant/AuthCodeGrant.php @@ -3,8 +3,8 @@ namespace League\OAuth2\Server\Grant; use DateInterval; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; +use League\OAuth2\Server\Entities\UserEntityInterface; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface; use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface; diff --git a/src/Grant/ImplicitGrant.php b/src/Grant/ImplicitGrant.php index 6f7b1301..fefc7189 100644 --- a/src/Grant/ImplicitGrant.php +++ b/src/Grant/ImplicitGrant.php @@ -2,8 +2,8 @@ namespace League\OAuth2\Server\Grant; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; +use League\OAuth2\Server\Entities\UserEntityInterface; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Repositories\UserRepositoryInterface; use League\OAuth2\Server\RequestEvent; diff --git a/src/Grant/PasswordGrant.php b/src/Grant/PasswordGrant.php index be3d4707..2e3dddd0 100644 --- a/src/Grant/PasswordGrant.php +++ b/src/Grant/PasswordGrant.php @@ -10,8 +10,8 @@ */ namespace League\OAuth2\Server\Grant; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; +use League\OAuth2\Server\Entities\UserEntityInterface; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface; use League\OAuth2\Server\Repositories\UserRepositoryInterface; @@ -67,11 +67,11 @@ class PasswordGrant extends AbstractGrant /** * @param \Psr\Http\Message\ServerRequestInterface $request - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $client + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $client * * @throws \League\OAuth2\Server\Exception\OAuthServerException * - * @return \League\OAuth2\Server\Entities\Interfaces\UserEntityInterface + * @return \League\OAuth2\Server\Entities\UserEntityInterface */ protected function validateUser(ServerRequestInterface $request, ClientEntityInterface $client) { diff --git a/src/Repositories/AbstractAccessTokenRepository.php b/src/Repositories/AbstractAccessTokenRepository.php index 321abc65..8c5c5948 100644 --- a/src/Repositories/AbstractAccessTokenRepository.php +++ b/src/Repositories/AbstractAccessTokenRepository.php @@ -2,19 +2,19 @@ namespace League\OAuth2\Server\Repositories; use League\OAuth2\Server\Entities\AccessTokenEntity; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; abstract class AbstractAccessTokenRepository implements AccessTokenRepositoryInterface { /** * Create a new access token * - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $clientEntity - * @param \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface[] $scopes + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $clientEntity + * @param \League\OAuth2\Server\Entities\ScopeEntityInterface[] $scopes * @param mixed $userIdentifier * - * @return \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface + * @return \League\OAuth2\Server\Entities\AccessTokenEntityInterface */ public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, $userIdentifier = null) { @@ -24,7 +24,7 @@ abstract class AbstractAccessTokenRepository implements AccessTokenRepositoryInt /** * Persists a new access token to permanent storage. * - * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessTokenEntity + * @param \League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessTokenEntity */ abstract public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEntity); diff --git a/src/Repositories/AbstractAuthCodeRepository.php b/src/Repositories/AbstractAuthCodeRepository.php index b6d3ed6f..6bd43e49 100644 --- a/src/Repositories/AbstractAuthCodeRepository.php +++ b/src/Repositories/AbstractAuthCodeRepository.php @@ -11,7 +11,7 @@ namespace League\OAuth2\Server\Repositories; use League\OAuth2\Server\Entities\AuthCodeEntity; -use League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface; +use League\OAuth2\Server\Entities\AuthCodeEntityInterface; /** * Auth code storage abstract class. @@ -21,7 +21,7 @@ abstract class AbstractAuthCodeRepository implements AuthCodeRepositoryInterface /** * Creates a new AuthCode * - * @return \League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface + * @return \League\OAuth2\Server\Entities\AuthCodeEntityInterface */ public function getNewAuthCode() { @@ -31,7 +31,7 @@ abstract class AbstractAuthCodeRepository implements AuthCodeRepositoryInterface /** * Persists a new auth code to permanent storage. * - * @param \League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface $authCodeEntity + * @param \League\OAuth2\Server\Entities\AuthCodeEntityInterface $authCodeEntity */ abstract public function persistNewAuthCode(AuthCodeEntityInterface $authCodeEntity); diff --git a/src/Repositories/AbstractRefreshTokenRepository.php b/src/Repositories/AbstractRefreshTokenRepository.php index ff786f94..04748b2d 100644 --- a/src/Repositories/AbstractRefreshTokenRepository.php +++ b/src/Repositories/AbstractRefreshTokenRepository.php @@ -10,7 +10,7 @@ */ namespace League\OAuth2\Server\Repositories; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntity; /** @@ -31,7 +31,7 @@ abstract class AbstractRefreshTokenRepository implements RefreshTokenRepositoryI /** * Create a new refresh token_name. * - * @param \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface $refreshTokenEntity + * @param \League\OAuth2\Server\Entities\RefreshTokenEntityInterface $refreshTokenEntity */ abstract public function persistNewRefreshToken(RefreshTokenEntityInterface $refreshTokenEntity); diff --git a/src/Repositories/AccessTokenRepositoryInterface.php b/src/Repositories/AccessTokenRepositoryInterface.php index a6d725a2..426d71f8 100644 --- a/src/Repositories/AccessTokenRepositoryInterface.php +++ b/src/Repositories/AccessTokenRepositoryInterface.php @@ -10,8 +10,8 @@ */ namespace League\OAuth2\Server\Repositories; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; /** * Access token interface. @@ -21,8 +21,8 @@ interface AccessTokenRepositoryInterface extends RepositoryInterface /** * Create a new access token * - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $clientEntity - * @param \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface[] $scopes + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $clientEntity + * @param \League\OAuth2\Server\Entities\ScopeEntityInterface[] $scopes * @param mixed $userIdentifier * * @return AccessTokenEntityInterface @@ -32,7 +32,7 @@ interface AccessTokenRepositoryInterface extends RepositoryInterface /** * Persists a new access token to permanent storage. * - * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessTokenEntity + * @param \League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessTokenEntity */ public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEntity); diff --git a/src/Repositories/AuthCodeRepositoryInterface.php b/src/Repositories/AuthCodeRepositoryInterface.php index d1da7d44..052fb849 100644 --- a/src/Repositories/AuthCodeRepositoryInterface.php +++ b/src/Repositories/AuthCodeRepositoryInterface.php @@ -10,7 +10,7 @@ */ namespace League\OAuth2\Server\Repositories; -use League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface; +use League\OAuth2\Server\Entities\AuthCodeEntityInterface; /** * Auth code storage interface. @@ -20,14 +20,14 @@ interface AuthCodeRepositoryInterface extends RepositoryInterface /** * Creates a new AuthCode * - * @return \League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface + * @return \League\OAuth2\Server\Entities\AuthCodeEntityInterface */ public function getNewAuthCode(); /** * Persists a new auth code to permanent storage. * - * @param \League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface $authCodeEntity + * @param \League\OAuth2\Server\Entities\AuthCodeEntityInterface $authCodeEntity */ public function persistNewAuthCode(AuthCodeEntityInterface $authCodeEntity); diff --git a/src/Repositories/ClientRepositoryInterface.php b/src/Repositories/ClientRepositoryInterface.php index a742b366..ce6c2b0e 100644 --- a/src/Repositories/ClientRepositoryInterface.php +++ b/src/Repositories/ClientRepositoryInterface.php @@ -22,7 +22,7 @@ interface ClientRepositoryInterface extends RepositoryInterface * @param string $grantType The grant type used * @param null|string $clientSecret The client's secret (if sent) * - * @return \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface + * @return \League\OAuth2\Server\Entities\ClientEntityInterface */ public function getClientEntity($clientIdentifier, $grantType, $clientSecret = null); } diff --git a/src/Repositories/RefreshTokenRepositoryInterface.php b/src/Repositories/RefreshTokenRepositoryInterface.php index e857e2ff..d7e496c4 100644 --- a/src/Repositories/RefreshTokenRepositoryInterface.php +++ b/src/Repositories/RefreshTokenRepositoryInterface.php @@ -10,7 +10,7 @@ */ namespace League\OAuth2\Server\Repositories; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; /** * Refresh token interface. @@ -27,7 +27,7 @@ interface RefreshTokenRepositoryInterface extends RepositoryInterface /** * Create a new refresh token_name. * - * @param \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface $refreshTokenEntity + * @param \League\OAuth2\Server\Entities\RefreshTokenEntityInterface $refreshTokenEntity */ public function persistNewRefreshToken(RefreshTokenEntityInterface $refreshTokenEntity); diff --git a/src/Repositories/ScopeRepositoryInterface.php b/src/Repositories/ScopeRepositoryInterface.php index ccafbbdd..524f1702 100644 --- a/src/Repositories/ScopeRepositoryInterface.php +++ b/src/Repositories/ScopeRepositoryInterface.php @@ -10,8 +10,8 @@ */ namespace League\OAuth2\Server\Repositories; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; +use League\OAuth2\Server\Entities\ScopeEntityInterface; /** * Scope interface. @@ -23,7 +23,7 @@ interface ScopeRepositoryInterface extends RepositoryInterface * * @param string $identifier The scope identifier * - * @return \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface + * @return \League\OAuth2\Server\Entities\ScopeEntityInterface */ public function getScopeEntityByIdentifier($identifier); @@ -33,10 +33,10 @@ interface ScopeRepositoryInterface extends RepositoryInterface * * @param ScopeEntityInterface[] $scopes * @param string $grantType - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $clientEntity + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $clientEntity * @param null|string $userIdentifier * - * @return \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface[] + * @return \League\OAuth2\Server\Entities\ScopeEntityInterface[] */ public function finalizeScopes( array $scopes, diff --git a/src/Repositories/UserRepositoryInterface.php b/src/Repositories/UserRepositoryInterface.php index b21503a7..f00436e8 100644 --- a/src/Repositories/UserRepositoryInterface.php +++ b/src/Repositories/UserRepositoryInterface.php @@ -2,7 +2,7 @@ namespace League\OAuth2\Server\Repositories; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; interface UserRepositoryInterface extends RepositoryInterface { @@ -12,9 +12,9 @@ interface UserRepositoryInterface extends RepositoryInterface * @param string $username * @param string $password * @param string $grantType The grant type used - * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $clientEntity + * @param \League\OAuth2\Server\Entities\ClientEntityInterface $clientEntity * - * @return \League\OAuth2\Server\Entities\Interfaces\UserEntityInterface + * @return \League\OAuth2\Server\Entities\UserEntityInterface */ public function getUserEntityByUserCredentials( $username, diff --git a/src/ResponseTypes/AbstractResponseType.php b/src/ResponseTypes/AbstractResponseType.php index c42e1d87..02ce842b 100644 --- a/src/ResponseTypes/AbstractResponseType.php +++ b/src/ResponseTypes/AbstractResponseType.php @@ -11,20 +11,20 @@ namespace League\OAuth2\Server\ResponseTypes; use League\OAuth2\Server\CryptTrait; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; abstract class AbstractResponseType implements ResponseTypeInterface { use CryptTrait; /** - * @var \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface + * @var \League\OAuth2\Server\Entities\AccessTokenEntityInterface */ protected $accessToken; /** - * @var \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface + * @var \League\OAuth2\Server\Entities\RefreshTokenEntityInterface */ protected $refreshToken; diff --git a/src/ResponseTypes/BearerTokenResponse.php b/src/ResponseTypes/BearerTokenResponse.php index 7a77c699..63598265 100644 --- a/src/ResponseTypes/BearerTokenResponse.php +++ b/src/ResponseTypes/BearerTokenResponse.php @@ -10,7 +10,7 @@ */ namespace League\OAuth2\Server\ResponseTypes; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use Psr\Http\Message\ResponseInterface; class BearerTokenResponse extends AbstractResponseType diff --git a/src/ResponseTypes/ResponseTypeInterface.php b/src/ResponseTypes/ResponseTypeInterface.php index 100e8cda..a26466a7 100644 --- a/src/ResponseTypes/ResponseTypeInterface.php +++ b/src/ResponseTypes/ResponseTypeInterface.php @@ -10,19 +10,19 @@ */ namespace League\OAuth2\Server\ResponseTypes; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use Psr\Http\Message\ResponseInterface; interface ResponseTypeInterface { /** - * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessToken + * @param \League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessToken */ public function setAccessToken(AccessTokenEntityInterface $accessToken); /** - * @param \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface $refreshToken + * @param \League\OAuth2\Server\Entities\RefreshTokenEntityInterface $refreshToken */ public function setRefreshToken(RefreshTokenEntityInterface $refreshToken); diff --git a/tests/Grant/AbstractGrantTest.php b/tests/Grant/AbstractGrantTest.php index 7dda918d..0fb3fab4 100644 --- a/tests/Grant/AbstractGrantTest.php +++ b/tests/Grant/AbstractGrantTest.php @@ -6,9 +6,9 @@ use League\Event\Emitter; use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\Entities\AccessTokenEntity; use League\OAuth2\Server\Entities\AuthCodeEntity; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\AuthCodeEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntity; use League\OAuth2\Server\Grant\AbstractGrant; use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface; diff --git a/tests/Grant/AuthCodeGrantTest.php b/tests/Grant/AuthCodeGrantTest.php index 78acce56..7782f030 100644 --- a/tests/Grant/AuthCodeGrantTest.php +++ b/tests/Grant/AuthCodeGrantTest.php @@ -5,8 +5,8 @@ namespace LeagueTests\Grant; use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\Entities\AccessTokenEntity; use League\OAuth2\Server\Entities\AuthCodeEntity; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntity; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Grant\AuthCodeGrant; diff --git a/tests/Grant/ClientCredentialsGrantTest.php b/tests/Grant/ClientCredentialsGrantTest.php index a6b66dcd..7ce66307 100644 --- a/tests/Grant/ClientCredentialsGrantTest.php +++ b/tests/Grant/ClientCredentialsGrantTest.php @@ -3,7 +3,7 @@ namespace LeagueTests\Grant; use League\OAuth2\Server\Entities\AccessTokenEntity; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; use League\OAuth2\Server\Grant\ClientCredentialsGrant; use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface; use League\OAuth2\Server\Repositories\ClientRepositoryInterface; diff --git a/tests/Grant/PasswordGrantTest.php b/tests/Grant/PasswordGrantTest.php index eb72c905..0368569e 100644 --- a/tests/Grant/PasswordGrantTest.php +++ b/tests/Grant/PasswordGrantTest.php @@ -3,8 +3,8 @@ namespace LeagueTests\Grant; use League\OAuth2\Server\Entities\AccessTokenEntity; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntity; use League\OAuth2\Server\Grant\PasswordGrant; use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface; diff --git a/tests/Grant/RefreshTokenGrantTest.php b/tests/Grant/RefreshTokenGrantTest.php index 2159d0fc..6832f8c7 100644 --- a/tests/Grant/RefreshTokenGrantTest.php +++ b/tests/Grant/RefreshTokenGrantTest.php @@ -4,8 +4,8 @@ namespace LeagueTests\Grant; use League\OAuth2\Server\CryptKey; use League\OAuth2\Server\Entities\AccessTokenEntity; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Entities\RefreshTokenEntity; use League\OAuth2\Server\Grant\RefreshTokenGrant; use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface; diff --git a/tests/Stubs/ClientEntity.php b/tests/Stubs/ClientEntity.php index 4956b62b..af75200f 100644 --- a/tests/Stubs/ClientEntity.php +++ b/tests/Stubs/ClientEntity.php @@ -2,7 +2,7 @@ namespace LeagueTests\Stubs; -use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface; +use League\OAuth2\Server\Entities\ClientEntityInterface; use League\OAuth2\Server\Entities\Traits\EntityTrait; class ClientEntity implements ClientEntityInterface diff --git a/tests/Stubs/ScopeEntity.php b/tests/Stubs/ScopeEntity.php index ad448769..4e4a6bec 100644 --- a/tests/Stubs/ScopeEntity.php +++ b/tests/Stubs/ScopeEntity.php @@ -2,7 +2,7 @@ namespace LeagueTests\Stubs; -use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface; +use League\OAuth2\Server\Entities\ScopeEntityInterface; use League\OAuth2\Server\Entities\Traits\EntityTrait; class ScopeEntity implements ScopeEntityInterface diff --git a/tests/Stubs/StubResponseType.php b/tests/Stubs/StubResponseType.php index 04e09d62..ac8679d2 100644 --- a/tests/Stubs/StubResponseType.php +++ b/tests/Stubs/StubResponseType.php @@ -2,8 +2,8 @@ namespace LeagueTests\Stubs; -use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface; -use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface; +use League\OAuth2\Server\Entities\AccessTokenEntityInterface; +use League\OAuth2\Server\Entities\RefreshTokenEntityInterface; use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\ResponseTypes\AbstractResponseType; use Psr\Http\Message\ResponseInterface; @@ -27,7 +27,7 @@ class StubResponseType extends AbstractResponseType } /** - * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessToken + * @param \League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessToken */ public function setAccessToken(AccessTokenEntityInterface $accessToken) { @@ -35,7 +35,7 @@ class StubResponseType extends AbstractResponseType } /** - * @param \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface $refreshToken + * @param \League\OAuth2\Server\Entities\RefreshTokenEntityInterface $refreshToken */ public function setRefreshToken(RefreshTokenEntityInterface $refreshToken) { diff --git a/tests/Stubs/UserEntity.php b/tests/Stubs/UserEntity.php index 5d102c77..1936861d 100644 --- a/tests/Stubs/UserEntity.php +++ b/tests/Stubs/UserEntity.php @@ -2,7 +2,7 @@ namespace LeagueTests\Stubs; -use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface; +use League\OAuth2\Server\Entities\UserEntityInterface; class UserEntity implements UserEntityInterface {