feature #13 Configure services/routes using PHP (mtarld)

This PR was merged into the 0.1-dev branch.

Discussion
----------

Configure services/routes using PHP

Commits
-------

00edc1e Configure services/routes using PHP

Author: chalasr

docs/index.md

@@ -116,7 +116,7 @@ For implementation into Symfony projects, please see [bundle documentation](docs
 
     ```yaml
     oauth2:
-        resource: '@LeagueOAuth2ServerBundle/Resources/config/routes.xml'
+        resource: '@LeagueOAuth2ServerBundle/Resources/config/routes.php'
     ```
 
 You can verify that everything is working by issuing a `POST` request to the `/token` endpoint.

psalm.xml

@@ -45,6 +45,21 @@
         <RawObjectIteration errorLevel="error"/>
         <InvalidStringClass errorLevel="error"/>
         <UnresolvableInclude errorLevel="error"/>
+        <ImplicitToStringCast errorLevel="error">
+            <errorLevel type="suppress">
+                <file name="src/Resources/config/services.php" />
+            </errorLevel>
+        </ImplicitToStringCast>
+        <MixedInferredReturnType errorLevel="error">
+            <errorLevel type="suppress">
+                <file name="src/Resources/config/services.php" />
+            </errorLevel>
+        </MixedInferredReturnType>
+        <MixedReturnStatement errorLevel="error">
+            <errorLevel type="suppress">
+                <file name="src/Resources/config/services.php" />
+            </errorLevel>
+        </MixedReturnStatement>
     </issueHandlers>
 
     <plugins>

src/DependencyInjection/LeagueOAuth2ServerExtension.php

@@ -35,7 +35,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -50,8 +50,8 @@ final class LeagueOAuth2ServerExtension extends Extension implements PrependExte
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('services.xml');
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('services.php');
 
         $config = $this->processConfiguration(new Configuration(), $configs);
 
@@ -129,14 +129,14 @@ private function configureAuthorizationServer(ContainerBuilder $container, array
     {
         $authorizationServer = $container
             ->getDefinition(AuthorizationServer::class)
-            ->replaceArgument('$privateKey', new Definition(CryptKey::class, [
+            ->replaceArgument(3, new Definition(CryptKey::class, [
                 $config['private_key'],
                 $config['private_key_passphrase'],
                 false,
             ]));
 
         if ('plain' === $config['encryption_key_type']) {
-            $authorizationServer->replaceArgument('$encryptionKey', $config['encryption_key']);
+            $authorizationServer->replaceArgument(4, $config['encryption_key']);
         } elseif ('defuse' === $config['encryption_key_type']) {
             if (!class_exists(Key::class)) {
                 throw new \RuntimeException('You must install the "defuse/php-encryption" package to use "encryption_key_type: defuse".');
@@ -147,7 +147,7 @@ private function configureAuthorizationServer(ContainerBuilder $container, array
                 ->addArgument($config['encryption_key']);
             $container->setDefinition('league.oauth2-server.defuse_key', $keyDefinition);
 
-            $authorizationServer->replaceArgument('$encryptionKey', new Reference('league.oauth2-server.defuse_key'));
+            $authorizationServer->replaceArgument(4, new Reference('league.oauth2-server.defuse_key'));
         }
 
         if ($config['enable_client_credentials_grant']) {
@@ -205,7 +205,7 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
         ;
 
         $authCodeGrantDefinition = $container->getDefinition(AuthCodeGrant::class);
-        $authCodeGrantDefinition->replaceArgument('$authCodeTTL', new Definition(\DateInterval::class, [$config['auth_code_ttl']]))
+        $authCodeGrantDefinition->replaceArgument(2, new Definition(\DateInterval::class, [$config['auth_code_ttl']]))
             ->addMethodCall('setRefreshTokenTTL', [
                 new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
             ])
@@ -217,7 +217,7 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
 
         $container
             ->getDefinition(ImplicitGrant::class)
-            ->replaceArgument('$accessTokenTTL', new Definition(\DateInterval::class, [$config['access_token_ttl']]))
+            ->replaceArgument(0, new Definition(\DateInterval::class, [$config['access_token_ttl']]))
         ;
     }
 
@@ -235,11 +235,11 @@ private function configurePersistence(LoaderInterface $loader, ContainerBuilder
 
         switch ($persistenceMethod) {
             case 'in_memory':
-                $loader->load('storage/in_memory.xml');
+                $loader->load('storage/in_memory.php');
                 $this->configureInMemoryPersistence($container);
                 break;
             case 'doctrine':
-                $loader->load('storage/doctrine.xml');
+                $loader->load('storage/doctrine.php');
                 $this->configureDoctrinePersistence($container, $persistenceConfiguration);
                 break;
         }
@@ -255,27 +255,27 @@ private function configureDoctrinePersistence(ContainerBuilder $container, array
 
         $container
             ->getDefinition(AccessTokenManager::class)
-            ->replaceArgument('$entityManager', $entityManager)
+            ->replaceArgument(0, $entityManager)
         ;
 
         $container
             ->getDefinition(ClientManager::class)
-            ->replaceArgument('$entityManager', $entityManager)
+            ->replaceArgument(0, $entityManager)
         ;
 
         $container
             ->getDefinition(RefreshTokenManager::class)
-            ->replaceArgument('$entityManager', $entityManager)
+            ->replaceArgument(0, $entityManager)
         ;
 
         $container
             ->getDefinition(AuthorizationCodeManager::class)
-            ->replaceArgument('$entityManager', $entityManager)
+            ->replaceArgument(0, $entityManager)
         ;
 
         $container
             ->getDefinition(DoctrineCredentialsRevoker::class)
-            ->replaceArgument('$entityManager', $entityManager)
+            ->replaceArgument(0, $entityManager)
         ;
 
         $container->setParameter('league.oauth2-server.persistence.doctrine.enabled', true);
@@ -291,7 +291,7 @@ private function configureResourceServer(ContainerBuilder $container, array $con
     {
         $container
             ->getDefinition(ResourceServer::class)
-            ->replaceArgument('$publicKey', new Definition(CryptKey::class, [
+            ->replaceArgument(1, new Definition(CryptKey::class, [
                 $config['public_key'],
                 null,
                 false,

src/DependencyInjection/Security/OAuth2Factory.php

@@ -23,13 +23,13 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $providerId = 'security.authentication.provider.oauth2.' . $id;
         $container
             ->setDefinition($providerId, new ChildDefinition(OAuth2Provider::class))
-            ->replaceArgument('$userProvider', new Reference($userProvider))
-            ->replaceArgument('$providerKey', $id);
+            ->replaceArgument(0, new Reference($userProvider))
+            ->replaceArgument(3, $id);
 
         $listenerId = 'security.authentication.listener.oauth2.' . $id;
         $container
             ->setDefinition($listenerId, new ChildDefinition(OAuth2Listener::class))
-            ->replaceArgument('$providerKey', $id);
+            ->replaceArgument(4, $id);
 
         return [$providerId, $listenerId, OAuth2EntryPoint::class];
     }

src/Resources/config/routes.php

@@ -0,0 +1,19 @@
+<?php
+
+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'])
+        ->methods(['GET'])
+
+        ->add('oauth2_token', '/token')
+        ->controller([TokenController::class, 'indexAction'])
+        ->methods(['POST'])
+    ;
+};