@@ -13,14 +13,14 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\AuthorizationEndpoint; |
| 15 | 15 | |
| 16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 17 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 18 | 16 | use OAuth2Framework\Component\AuthorizationEndpoint\ConsentScreen\ExtensionManager; |
| 19 | 17 | use OAuth2Framework\Component\AuthorizationEndpoint\Exception\OAuth2AuthorizationException; |
| 20 | 18 | use OAuth2Framework\Component\AuthorizationEndpoint\UserAccountDiscovery\UserAccountDiscoveryManager; |
| 21 | 19 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
| 22 | 20 | use Psr\Http\Message\ResponseInterface; |
| 23 | 21 | use Psr\Http\Message\ServerRequestInterface; |
| 22 | +use Psr\Http\Server\MiddlewareInterface; |
|
| 23 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 24 | 24 | |
| 25 | 25 | abstract class AuthorizationEndpoint implements MiddlewareInterface |
| 26 | 26 | { |
@@ -28,6 +28,7 @@ |
||
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * @param Authorization $authorization |
| 31 | + * @return void |
|
| 31 | 32 | */ |
| 32 | 33 | public function check(Authorization $authorization); |
| 33 | 34 | } |
@@ -15,7 +15,6 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | use Http\Message\MessageFactory\DiactorosMessageFactory; |
| 17 | 17 | use Http\Message\ResponseFactory; |
| 18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 19 | 18 | use OAuth2Framework\Component\BearerTokenType\BearerToken; |
| 20 | 19 | use OAuth2Framework\Component\ClientConfigurationEndpoint\ClientConfigurationEndpoint; |
| 21 | 20 | use OAuth2Framework\Component\ClientRegistrationEndpoint\Rule\RuleManager; |
@@ -28,6 +27,7 @@ discard block |
||
| 28 | 27 | use PHPUnit\Framework\TestCase; |
| 29 | 28 | use Prophecy\Argument; |
| 30 | 29 | use Psr\Http\Message\ServerRequestInterface; |
| 30 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 31 | 31 | use SimpleBus\Message\Bus\MessageBus; |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -22,7 +22,6 @@ |
||
| 22 | 22 | * @param ClientId $clientId |
| 23 | 23 | * @param DataBag $commandParameters |
| 24 | 24 | * @param DataBag $validatedParameters |
| 25 | - * @param UserAccountId|null $userAccountId |
|
| 26 | 25 | * @param callable $next |
| 27 | 26 | * |
| 28 | 27 | * @return DataBag |
@@ -15,8 +15,8 @@ |
||
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 17 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
| 18 | -use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
|
| 19 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenIntrospectionTypeHint; |
| 19 | +use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
|
| 20 | 20 | use OAuth2Framework\Component\Core\Client\ClientId; |
| 21 | 21 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
| 22 | 22 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | 101 | * @param ResourceId $resourceName |
| 102 | - * @param resource $resource |
|
| 102 | + * @param Resource $resource |
|
| 103 | 103 | * |
| 104 | 104 | * @return array |
| 105 | 105 | */ |
@@ -15,12 +15,12 @@ |
||
| 15 | 15 | |
| 16 | 16 | use Interop\Http\Factory\ResponseFactoryInterface; |
| 17 | 17 | use Interop\Http\Factory\UriFactoryInterface; |
| 18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 19 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 20 | 18 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
| 21 | 19 | use Psr\Http\Message\ResponseInterface; |
| 22 | 20 | use Psr\Http\Message\ServerRequestInterface; |
| 23 | 21 | use Psr\Http\Message\UriInterface; |
| 22 | +use Psr\Http\Server\MiddlewareInterface; |
|
| 23 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 24 | 24 | |
| 25 | 25 | final class IssuerDiscoveryEndpoint implements MiddlewareInterface |
| 26 | 26 | { |
@@ -13,14 +13,14 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\Middleware; |
| 15 | 15 | |
| 16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 17 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 18 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
| 19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
| 20 | 18 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
| 21 | 19 | use OAuth2Framework\Component\TokenType\TokenTypeManager; |
| 22 | 20 | use Psr\Http\Message\ResponseInterface; |
| 23 | 21 | use Psr\Http\Message\ServerRequestInterface; |
| 22 | +use Psr\Http\Server\MiddlewareInterface; |
|
| 23 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 24 | 24 | |
| 25 | 25 | final class AccessTokenMiddleware implements MiddlewareInterface |
| 26 | 26 | { |
@@ -13,12 +13,12 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\Middleware; |
| 15 | 15 | |
| 16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 17 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 18 | 16 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
| 19 | 17 | use OAuth2Framework\Component\Core\Response\OAuth2ResponseFactoryManager; |
| 20 | 18 | use Psr\Http\Message\ResponseInterface; |
| 21 | 19 | use Psr\Http\Message\ServerRequestInterface; |
| 20 | +use Psr\Http\Server\MiddlewareInterface; |
|
| 21 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 22 | 22 | |
| 23 | 23 | final class OAuth2ResponseMiddleware implements MiddlewareInterface |
| 24 | 24 | { |
@@ -13,8 +13,6 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\Middleware; |
| 15 | 15 | |
| 16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 17 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 18 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenHandlerManager; |
| 20 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
@@ -23,6 +21,8 @@ discard block |
||
| 23 | 21 | use OAuth2Framework\Component\TokenType\TokenTypeManager; |
| 24 | 22 | use Psr\Http\Message\ResponseInterface; |
| 25 | 23 | use Psr\Http\Message\ServerRequestInterface; |
| 24 | +use Psr\Http\Server\MiddlewareInterface; |
|
| 25 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 26 | 26 | |
| 27 | 27 | final class OAuth2SecurityMiddleware implements MiddlewareInterface |
| 28 | 28 | { |