Merge pull request #261 from Tobion/patch-1

dbu · dbu · commit b75a42ad4612 · 2015-12-09T18:35:20.000+01:00
Fix dependency on a non-existent service "security.context"
diff --git a/DependencyInjection/Compiler/SecurityContextPass.php b/DependencyInjection/Compiler/SecurityContextPass.php
@@ -22,7 +22,7 @@
 class SecurityContextPass implements CompilerPassInterface
 {
     const ROLE_PROVIDER_SERVICE = 'fos_http_cache.user_context.role_provider';
-    
+
     /**
      * {@inheritdoc}
      */
@@ -31,8 +31,8 @@ public function process(ContainerBuilder $container)
         if (!$container->has(self::ROLE_PROVIDER_SERVICE)) {
             return;
         }
-        
-        if (!$container->has('security.token_storage')) {
+
+        if (!$container->has('security.token_storage') && $container->has('security.context')) {
             $definition = $container->getDefinition(self::ROLE_PROVIDER_SERVICE);
             $definition->replaceArgument(0, new Reference('security.context'));
         }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`class SecurityContextPass implements CompilerPassInterface`
`23`	`23`	`{`
`24`	`24`	`const ROLE_PROVIDER_SERVICE = 'fos_http_cache.user_context.role_provider';`
`25`		`-`
	`25`	`+`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`@@ -31,8 +31,8 @@ public function process(ContainerBuilder $container)`
`31`	`31`	`if (!$container->has(self::ROLE_PROVIDER_SERVICE)) {`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`		`-`
`35`		`- if (!$container->has('security.token_storage')) {`
	`34`	`+`
	`35`	`+ if (!$container->has('security.token_storage') && $container->has('security.context')) {`
`36`	`36`	`$definition = $container->getDefinition(self::ROLE_PROVIDER_SERVICE);`
`37`	`37`	`$definition->replaceArgument(0, new Reference('security.context'));`
`38`	`38`	`}`