Merge pull request #159 from FriendsOfSymfony/tag-annotations

dbu · dbu · commit bc04ac968a36 · 2014-11-21T19:12:41.000+01:00
do not enforce sensio extra bundle with default configuration
diff --git a/DependencyInjection/Compiler/TagSubscriberPass.php b/DependencyInjection/Compiler/TagSubscriberPass.php
@@ -24,7 +24,7 @@ class TagSubscriberPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if ($container->has('fos_http_cache.event_listener.tag')
+        if (true === $container->getParameter('fos_http_cache.compiler_pass.tag_annotations')
             && !$container->has('sensio_framework_extra.controller.listener')
         ) {
             throw new \RuntimeException(
diff --git a/DependencyInjection/FOSHttpCacheExtension.php b/DependencyInjection/FOSHttpCacheExtension.php
@@ -65,6 +65,7 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('cache_manager.xml');
         }
 
+        $container->setParameter($this->getAlias() . '.compiler_pass.tag_annotations', $config['tags']['enabled']);
         if ($config['tags']['enabled']) {
             // true or auto
             $loader->load('tag_listener.xml');

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class TagSubscriberPass implements CompilerPassInterface`
`24`	`24`	`*/`
`25`	`25`	`public function process(ContainerBuilder $container)`
`26`	`26`	`{`
`27`		`- if ($container->has('fos_http_cache.event_listener.tag')`
	`27`	`+ if (true === $container->getParameter('fos_http_cache.compiler_pass.tag_annotations')`
`28`	`28`	`&& !$container->has('sensio_framework_extra.controller.listener')`
`29`	`29`	`) {`
`30`	`30`	`throw new \RuntimeException(`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public function load(array $configs, ContainerBuilder $container)`
`65`	`65`	`$loader->load('cache_manager.xml');`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ $container->setParameter($this->getAlias() . '.compiler_pass.tag_annotations', $config['tags']['enabled']);`
`68`	`69`	`if ($config['tags']['enabled']) {`
`69`	`70`	`// true or auto`
`70`	`71`	`$loader->load('tag_listener.xml');`