Fix symfony service filename and cache tagging service filename

Author: pierremarichez

DependencyInjection/FOSHttpCacheExtension.php

@@ -91,6 +91,8 @@ public function load(array $configs, ContainerBuilder $container)
                 $config['tags'],
                 $this->getDefaultProxyClient($config['proxy_client'])
             );
+        } else {
+            $container->setParameter($this->getAlias().'.compiler_pass.tag_annotations', false);
         }
 
         if ($config['invalidation']['enabled']) {
@@ -309,7 +311,7 @@ private function loadCacheTagging(ContainerBuilder $container, XmlFileLoader $lo
 
         $container->setParameter($this->getAlias().'.compiler_pass.tag_annotations', true);
         $container->setParameter($this->getAlias().'.tag_handler.header', $config['header']);
-        $loader->load('tag_listener.xml');
+        $loader->load('cache_tagging.xml');
         if (!empty($config['rules'])) {
             $this->loadTagRules($container, $config['rules']);
         }

Resources/config/cache_manager.xml

@@ -9,7 +9,6 @@
         <parameter key="fos_http_cache.event_listener.log.class">FOS\HttpCache\EventListener\LogSubscriber</parameter>
         <parameter key="fos_http_cache.command.invalidate_path.class">FOS\HttpCacheBundle\Command\InvalidatePathCommand</parameter>
         <parameter key="fos_http_cache.command.invalidate_regex.class">FOS\HttpCacheBundle\Command\InvalidateRegexCommand</parameter>
-        <parameter key="fos_http_cache.command.invalidate_tag.class">FOS\HttpCacheBundle\Command\InvalidateTagCommand</parameter>
         <parameter key="fos_http_cache.command.refresh_path.class">FOS\HttpCacheBundle\Command\RefreshPathCommand</parameter>
     </parameters>
 
@@ -44,11 +43,6 @@
             <tag name="console.command"/>
         </service>
 
-        <service id="fos_http_cache.command.invalidate_tag" class="%fos_http_cache.command.invalidate_tag.class%">
-            <argument type="service" id="fos_http_cache.handler.tag_handler" />
-            <tag name="console.command"/>
-        </service>
-
         <service id="fos_http_cache.command.refresh_path" class="%fos_http_cache.command.refresh_path.class%">
             <argument type="service" id="fos_http_cache.cache_manager" />
             <tag name="console.command"/>

Resources/config/tag_listener.xml renamed to Resources/config/cache_tagging.xml

@@ -6,6 +6,7 @@
 
     <parameters>
         <parameter key="fos_http_cache.event_listener.tag.class">FOS\HttpCacheBundle\EventListener\TagSubscriber</parameter>
+        <parameter key="fos_http_cache.command.invalidate_tag.class">FOS\HttpCacheBundle\Command\InvalidateTagCommand</parameter>
     </parameters>
 
     <services>
@@ -19,10 +20,14 @@
             <tag name="twig.extension"/>
         </service>
 
-        <service id="fos_http_cache.event_listener.tag"
-                 class="%fos_http_cache.event_listener.tag.class%">
+        <service id="fos_http_cache.event_listener.tag" class="%fos_http_cache.event_listener.tag.class%">
             <argument type="service" id="fos_http_cache.handler.tag_handler" />
             <tag name="kernel.event_subscriber" />
         </service>
+
+        <service id="fos_http_cache.command.invalidate_tag" class="%fos_http_cache.command.invalidate_tag.class%">
+            <argument type="service" id="fos_http_cache.handler.tag_handler" />
+            <tag name="console.command"/>
+        </service>
     </services>
 </container>