Handle lack of service security.token_storage on compiler pass only

Author: Luis Pabon

DependencyInjection/Compiler/TokenStorageCompilerPass.php

@@ -27,11 +27,8 @@ public function process(ContainerBuilder $container)
     {
         $definition = $container->getDefinition('fos_oauth_server.security.authentication.listener');
 
-        if ($container->hasDefinition('security.token_storage')) {
-            $tokenStorageReference = new Reference('security.token_storage');
-        } else {
-            $tokenStorageReference = new Reference('security.context');
+        if ($container->hasDefinition('security.token_storage') === false) {
+            $definition->replaceArgument(0, new Reference('security.context'));
         }
-        $definition->replaceArgument(0, $tokenStorageReference);
     }
 }

Resources/config/security.xml

@@ -18,7 +18,7 @@
         </service>
 
         <service id="fos_oauth_server.security.authentication.listener" class="%fos_oauth_server.security.authentication.listener.class%" public="false">
-            <argument /> <!-- security.token_storage or security.context for Symfony < 2.6 -->
+            <argument type="service" id="security.token_storage"/>
             <argument type="service" id="security.authentication.manager" />
             <argument type="service" id="fos_oauth_server.server" />
         </service>