Merge pull request #205 from fritsjanb/master

Allow custom storage service to have its own constructor signature

Author: stof

DependencyInjection/FOSOAuthServerExtension.php

@@ -44,6 +44,10 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setAlias('fos_oauth_server.refresh_token_manager', $config['service']['refresh_token_manager']);
         $container->setAlias('fos_oauth_server.auth_code_manager', $config['service']['auth_code_manager']);
 
+        if (null !== $config['service']['user_provider']) {
+            $container->setAlias('fos_oauth_server.user_provider', new Alias($config['service']['user_provider'], false));
+        }
+
         $container->setParameter('fos_oauth_server.server.options', $config['service']['options']);
 
         $this->remapParametersNamespaces($config, $container, array(
@@ -74,11 +78,6 @@ public function load(array $configs, ContainerBuilder $container)
         if (!empty($config['authorize'])) {
             $this->loadAuthorize($config['authorize'], $container, $loader);
         }
-
-        if (null !== $userProvider = $config['service']['user_provider']) {
-            $container->getDefinition($config['service']['storage'])
-                ->replaceArgument(4, new Reference($userProvider));
-        }
     }
 
     /**

Resources/config/oauth.xml

@@ -14,7 +14,7 @@
             <argument type="service" id="fos_oauth_server.access_token_manager" />
             <argument type="service" id="fos_oauth_server.refresh_token_manager" />
             <argument type="service" id="fos_oauth_server.auth_code_manager" />
-            <argument>null</argument>
+            <argument type="service" id="fos_oauth_server.user_provider" on-invalid="null" />
             <argument type="service" id="security.encoder_factory" />
         </service>