feature #18 Add "bundle friendly" aliases (mtarld)

This PR was merged into the 0.1-dev branch.

Discussion
----------

Add "bundle friendly" aliases

- Added bundle friendly aliases for services
- Changed alias namespace from `league.oauth2-server` to `league.oauth2_server`
- Changed psr7/17 definition ids: from FQCN to ids (which prevent unexpected behaviors if these ids are defined in the userland)

Commits
-------

3456337 Improve aliases

Author: chalasr

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.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.scope_resolve, method: onScopeResolve }
 ```

docs/implementing-custom-grant-type.md

@@ -48,7 +48,7 @@
     ```
 
 1. In order to enable the new grant type in the authorization server you must register the service in the container.
-The service must be autoconfigured or you have to manually tag it with the `league.oauth2-server.authorization_server.grant` tag:
+The service must be autoconfigured or you have to manually tag it with the `league.oauth2_server.authorization_server.grant` tag:
 
     ```yaml
     services:

psalm.xml

@@ -59,6 +59,12 @@
                 <file name="src/Resources/config/services.php" />
             </errorLevel>
         </MixedReturnStatement>
+        <InvalidArgument errorLevel="error">
+            <errorLevel type="suppress">
+                <file name="src/Resources/config/routes.php" />
+                <referencedFunction name="Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator::controller" />
+            </errorLevel>
+        </InvalidArgument>
     </issueHandlers>
 
     <plugins>

src/DependencyInjection/LeagueOAuth2ServerExtension.php

@@ -60,18 +60,18 @@ public function load(array $configs, ContainerBuilder $container)
         $this->configureResourceServer($container, $config['resource_server']);
         $this->configureScopes($container, $config['scopes']);
 
-        $container->getDefinition(OAuth2TokenFactory::class)
+        $container->findDefinition(OAuth2TokenFactory::class)
             ->setArgument(0, $config['role_prefix']);
 
-        $container->getDefinition(ConvertExceptionToResponseListener::class)
+        $container->findDefinition(ConvertExceptionToResponseListener::class)
             ->addTag('kernel.event_listener', [
                 'event' => KernelEvents::EXCEPTION,
                 'method' => 'onKernelException',
                 'priority' => $config['exception_event_listener_priority'],
             ]);
 
         $container->registerForAutoconfiguration(GrantTypeInterface::class)
-            ->addTag('league.oauth2-server.authorization_server.grant');
+            ->addTag('league.oauth2_server.authorization_server.grant');
     }
 
     /**
@@ -128,7 +128,7 @@ private function assertRequiredBundlesAreEnabled(ContainerBuilder $container): v
     private function configureAuthorizationServer(ContainerBuilder $container, array $config): void
     {
         $authorizationServer = $container
-            ->getDefinition(AuthorizationServer::class)
+            ->findDefinition(AuthorizationServer::class)
             ->replaceArgument(3, new Definition(CryptKey::class, [
                 $config['private_key'],
                 $config['private_key_passphrase'],
@@ -145,9 +145,9 @@ private function configureAuthorizationServer(ContainerBuilder $container, array
             $keyDefinition = (new Definition(Key::class))
                 ->setFactory([Key::class, 'loadFromAsciiSafeString'])
                 ->addArgument($config['encryption_key']);
-            $container->setDefinition('league.oauth2-server.defuse_key', $keyDefinition);
+            $container->setDefinition('league.oauth2_server.defuse_key', $keyDefinition);
 
-            $authorizationServer->replaceArgument(4, new Reference('league.oauth2-server.defuse_key'));
+            $authorizationServer->replaceArgument(4, new Reference('league.oauth2_server.defuse_key'));
         }
 
         if ($config['enable_client_credentials_grant']) {
@@ -191,20 +191,20 @@ private function configureAuthorizationServer(ContainerBuilder $container, array
     private function configureGrants(ContainerBuilder $container, array $config): void
     {
         $container
-            ->getDefinition(PasswordGrant::class)
+            ->findDefinition(PasswordGrant::class)
             ->addMethodCall('setRefreshTokenTTL', [
                 new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
             ])
         ;
 
         $container
-            ->getDefinition(RefreshTokenGrant::class)
+            ->findDefinition(RefreshTokenGrant::class)
             ->addMethodCall('setRefreshTokenTTL', [
                 new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
             ])
         ;
 
-        $authCodeGrantDefinition = $container->getDefinition(AuthCodeGrant::class);
+        $authCodeGrantDefinition = $container->findDefinition(AuthCodeGrant::class);
         $authCodeGrantDefinition->replaceArgument(2, new Definition(\DateInterval::class, [$config['auth_code_ttl']]))
             ->addMethodCall('setRefreshTokenTTL', [
                 new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
@@ -216,7 +216,7 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
         }
 
         $container
-            ->getDefinition(ImplicitGrant::class)
+            ->findDefinition(ImplicitGrant::class)
             ->replaceArgument(0, new Definition(\DateInterval::class, [$config['access_token_ttl']]))
         ;
     }
@@ -254,43 +254,43 @@ private function configureDoctrinePersistence(ContainerBuilder $container, array
         );
 
         $container
-            ->getDefinition(AccessTokenManager::class)
+            ->findDefinition(AccessTokenManager::class)
             ->replaceArgument(0, $entityManager)
         ;
 
         $container
-            ->getDefinition(ClientManager::class)
+            ->findDefinition(ClientManager::class)
             ->replaceArgument(0, $entityManager)
         ;
 
         $container
-            ->getDefinition(RefreshTokenManager::class)
+            ->findDefinition(RefreshTokenManager::class)
             ->replaceArgument(0, $entityManager)
         ;
 
         $container
-            ->getDefinition(AuthorizationCodeManager::class)
+            ->findDefinition(AuthorizationCodeManager::class)
             ->replaceArgument(0, $entityManager)
         ;
 
         $container
-            ->getDefinition(DoctrineCredentialsRevoker::class)
+            ->findDefinition(DoctrineCredentialsRevoker::class)
             ->replaceArgument(0, $entityManager)
         ;
 
-        $container->setParameter('league.oauth2-server.persistence.doctrine.enabled', true);
-        $container->setParameter('league.oauth2-server.persistence.doctrine.manager', $entityManagerName);
+        $container->setParameter('league.oauth2_server.persistence.doctrine.enabled', true);
+        $container->setParameter('league.oauth2_server.persistence.doctrine.manager', $entityManagerName);
     }
 
     private function configureInMemoryPersistence(ContainerBuilder $container): void
     {
-        $container->setParameter('league.oauth2-server.persistence.in_memory.enabled', true);
+        $container->setParameter('league.oauth2_server.persistence.in_memory.enabled', true);
     }
 
     private function configureResourceServer(ContainerBuilder $container, array $config): void
     {
         $container
-            ->getDefinition(ResourceServer::class)
+            ->findDefinition(ResourceServer::class)
             ->replaceArgument(1, new Definition(CryptKey::class, [
                 $config['public_key'],
                 null,
@@ -302,7 +302,7 @@ private function configureResourceServer(ContainerBuilder $container, array $con
     private function configureScopes(ContainerBuilder $container, array $scopes): void
     {
         $scopeManager = $container
-            ->getDefinition(
+            ->findDefinition(
                 (string) $container->getAlias(ScopeManagerInterface::class)
             )
         ;

src/LeagueOAuth2ServerBundle.php

@@ -52,9 +52,9 @@ private function configureDoctrineExtension(ContainerBuilder $container): void
                     $modelDirectory => 'League\Bundle\OAuth2ServerBundle\Model',
                 ],
                 [
-                    'league.oauth2-server.persistence.doctrine.manager',
+                    'league.oauth2_server.persistence.doctrine.manager',
                 ],
-                'league.oauth2-server.persistence.doctrine.enabled',
+                'league.oauth2_server.persistence.doctrine.enabled',
                 [
                     'LeagueOAuth2ServerBundle' => 'League\Bundle\OAuth2ServerBundle\Model',
                 ]

src/OAuth2Events.php

@@ -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.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.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.authorization_request_resolve';
 }

src/Resources/config/routes.php

@@ -2,17 +2,15 @@
 
 declare(strict_types=1);
 
-use League\Bundle\OAuth2ServerBundle\Controller\AuthorizationController;
-use League\Bundle\OAuth2ServerBundle\Controller\TokenController;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 return function (RoutingConfigurator $routes) {
     $routes
         ->add('oauth2_authorize', '/authorize')
-        ->controller([AuthorizationController::class, 'indexAction'])
+        ->controller(['league.oauth2_server.controller.authorization', 'indexAction'])
 
         ->add('oauth2_token', '/token')
-        ->controller([TokenController::class, 'indexAction'])
+        ->controller(['league.oauth2_server.controller.token', 'indexAction'])
         ->methods(['POST'])
     ;
 };