define all commands as services

dbu · dbu · commit c77a9cca8db5 · 2014-07-16T20:13:48.000+02:00
diff --git a/DependencyInjection/FOSHttpCacheExtension.php b/DependencyInjection/FOSHttpCacheExtension.php
@@ -59,7 +59,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($config['cache_manager']['enabled']) {
-            $this->loadCacheManager($container, $loader, $config['cache_manager']);
+            $loader->load('cache_manager.xml');
         }
 
 
@@ -248,17 +248,6 @@ private function loadNginx(ContainerBuilder $container, XmlFileLoader $loader, a
         $container->setParameter($this->getAlias() . '.proxy_client.nginx.purge_location', $config['purge_location']);
     }
 
-    private function loadCacheManager(ContainerBuilder $container, XmlFileLoader $loader, array $config)
-    {
-        $loader->load('cache_manager.xml');
-        if (version_compare(Kernel::VERSION, '2.4.0', '>=')) {
-            $container
-                ->getDefinition('fos_http_cache.command.invalidate_path')
-                ->addTag('console.command')
-            ;
-        }
-    }
-
     private function loadTagRules(ContainerBuilder $container, array $config)
     {
         $tagDefinition = $container->getDefinition($this->getAlias() . '.event_listener.tag');
diff --git a/Resources/config/cache_manager.xml b/Resources/config/cache_manager.xml
@@ -8,6 +8,9 @@
         <parameter key="fos_http_cache.cache_manager.class">FOS\HttpCacheBundle\CacheManager</parameter>
         <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>
 
     <services>
@@ -26,8 +29,26 @@
             <argument type="service" id="logger" />
         </service>
 
+        <!-- for symfony < 2.4 the command will be instantiated by the framework and the command services are ignored -->
+
         <service id="fos_http_cache.command.invalidate_path" class="%fos_http_cache.command.invalidate_path.class%">
             <argument type="service" id="fos_http_cache.cache_manager" />
+            <tag name="console.command"/>
+        </service>
+
+        <service id="fos_http_cache.command.invalidate_regex" class="%fos_http_cache.command.invalidate_regex.class%">
+            <argument type="service" id="fos_http_cache.cache_manager" />
+            <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.cache_manager" />
+            <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"/>
         </service>
     </services>
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function load(array $configs, ContainerBuilder $container)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if ($config['cache_manager']['enabled']) {`
`62`		`- $this->loadCacheManager($container, $loader, $config['cache_manager']);`
	`62`	`+ $loader->load('cache_manager.xml');`
`63`	`63`	`}`
`64`	`64`
`65`	`65`
`@@ -248,17 +248,6 @@ private function loadNginx(ContainerBuilder $container, XmlFileLoader $loader, a`
`248`	`248`	`$container->setParameter($this->getAlias() . '.proxy_client.nginx.purge_location', $config['purge_location']);`
`249`	`249`	`}`
`250`	`250`
`251`		`- private function loadCacheManager(ContainerBuilder $container, XmlFileLoader $loader, array $config)`
`252`		`- {`
`253`		`- $loader->load('cache_manager.xml');`
`254`		`- if (version_compare(Kernel::VERSION, '2.4.0', '>=')) {`
`255`		`- $container`
`256`		`- ->getDefinition('fos_http_cache.command.invalidate_path')`
`257`		`- ->addTag('console.command')`
`258`		`- ;`
`259`		`- }`
`260`		`- }`
`261`		`-`
`262`	`251`	`private function loadTagRules(ContainerBuilder $container, array $config)`
`263`	`252`	`{`
`264`	`253`	`$tagDefinition = $container->getDefinition($this->getAlias() . '.event_listener.tag');`