Rename events and remove psr7 doc

Author: mtarld

docs/controlling-token-scopes.md

@@ -1,6 +1,6 @@
 # Controlling token scopes
 
-It's possible to alter issued access token's scopes by subscribing to the `league.oauth2_server.scope_resolve` event.
+It's possible to alter issued access token's scopes by subscribing to the `league.oauth2_server.event.scope_resolve` event.
 
 ## Example
 
@@ -30,5 +30,5 @@ final class ScopeResolveListener
 ```yaml
 App\EventListener\ScopeResolveListener:
     tags:
-        - { name: kernel.event_listener, event: league.oauth2_server.scope_resolve, method: onScopeResolve }
+        - { name: kernel.event_listener, event: league.oauth2_server.event.scope_resolve, method: onScopeResolve }
 ```

docs/index.md

@@ -17,16 +17,14 @@ For implementation into Symfony projects, please see [bundle documentation](docs
 
 ## Installation
 
-1. Require the bundle and a PSR 7/17 implementation with Composer:
+1. Require the bundle with Composer:
 
     ```sh
-    composer require league/oauth2-server-bundle nyholm/psr7
+    composer require league/oauth2-server-bundle
     ```
 
     If your project is managed using [Symfony Flex](https://github.com/symfony/flex), the rest of the steps are not required. Just follow the post-installation instructions instead! :tada:
 
-    > **NOTE:** This bundle requires a PSR 7/17 implementation to operate. We recommend that you use [nyholm/psr7](https://github.com/Nyholm/psr7). Check out this [document](docs/psr-implementation-switching.md) if you wish to use a different implementation.
-
 1. Create the bundle configuration file under `config/packages/league_oauth2_server.yaml`. Here is a reference configuration file:
 
     ```yaml

docs/psr-implementation-switching.md

@@ -12,15 +12,15 @@ final class OAuth2Events
      *
      * You should set a valid user here if applicable.
      */
-    public const USER_RESOLVE = 'league.oauth2_server.user_resolve';
+    public const USER_RESOLVE = 'league.oauth2_server.event.user_resolve';
 
     /**
      * The SCOPE_RESOLVE event occurs right before the user obtains their
      * valid access token.
      *
      * You could alter the access token's scope here.
      */
-    public const SCOPE_RESOLVE = 'league.oauth2_server.scope_resolve';
+    public const SCOPE_RESOLVE = 'league.oauth2_server.event.scope_resolve';
 
     /**
      * The AUTHORIZATION_REQUEST_RESOLVE event occurs right before the system
@@ -29,5 +29,5 @@ final class OAuth2Events
      * You could approve or deny the authorization request, or set the uri where
      * must be redirected to resolve the authorization request.
      */
-    public const AUTHORIZATION_REQUEST_RESOLVE = 'league.oauth2_server.authorization_request_resolve';
+    public const AUTHORIZATION_REQUEST_RESOLVE = 'league.oauth2_server.event.authorization_request_resolve';
 }

src/OAuth2Events.php

@@ -30,6 +30,7 @@
 use League\Bundle\OAuth2ServerBundle\Manager\InMemory\ScopeManager;
 use League\Bundle\OAuth2ServerBundle\Manager\RefreshTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
+use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use League\Bundle\OAuth2ServerBundle\Security\Authentication\Provider\OAuth2Provider;
 use League\Bundle\OAuth2ServerBundle\Security\Authentication\Token\OAuth2TokenFactory;
 use League\Bundle\OAuth2ServerBundle\Security\EntryPoint\OAuth2EntryPoint;
@@ -227,7 +228,7 @@ function service(string $id): ReferenceConfigurator
                 service(Security::class),
             ])
             ->tag('kernel.event_listener', [
-                'event' => 'league.oauth2_server.authorization_request_resolve',
+                'event' => OAuth2Events::AUTHORIZATION_REQUEST_RESOLVE,
                 'method' => 'onAuthorizationRequest',
                 'priority' => 1024,
             ])

src/Resources/config/services.php

@@ -10,6 +10,7 @@
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\RefreshTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
+use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use League\Bundle\OAuth2ServerBundle\Tests\Fixtures\FixtureFactory;
 use League\Bundle\OAuth2ServerBundle\Tests\TestHelper;
 
@@ -54,7 +55,7 @@ public function testSuccessfulPasswordRequest(): void
         $this->client
             ->getContainer()
             ->get('event_dispatcher')
-            ->addListener('league.oauth2_server.user_resolve', static function (UserResolveEvent $event): void {
+            ->addListener(OAuth2Events::USER_RESOLVE, static function (UserResolveEvent $event): void {
                 $event->setUser(FixtureFactory::createUser());
             });
 

tests/Acceptance/TokenEndpointTest.php

@@ -7,6 +7,7 @@
 use League\Bundle\OAuth2ServerBundle\Event\UserResolveEvent;
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
+use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use League\Bundle\OAuth2ServerBundle\Tests\Fixtures\FixtureFactory;
 use League\Bundle\OAuth2ServerBundle\Tests\TestHelper;
 
@@ -265,7 +266,7 @@ public function testValidClientCredentialsGrantWithRequestedScope(): void
 
     public function testValidPasswordGrant(): void
     {
-        $this->eventDispatcher->addListener('league.oauth2_server.user_resolve', static function (UserResolveEvent $event): void {
+        $this->eventDispatcher->addListener(OAuth2Events::USER_RESOLVE, static function (UserResolveEvent $event): void {
             $event->setUser(FixtureFactory::createUser());
         });
 
@@ -294,7 +295,7 @@ public function testValidPasswordGrant(): void
 
     public function testInvalidCredentialsPasswordGrant(): void
     {
-        $this->eventDispatcher->addListener('league.oauth2_server.user_resolve', static function (UserResolveEvent $event): void {
+        $this->eventDispatcher->addListener(OAuth2Events::USER_RESOLVE, static function (UserResolveEvent $event): void {
             $event->setUser(null);
         });