Merge pull request #194 from FriendsOfSymfony/fix-request-matcher-service

Always load request_matcher and rule_matcher services

Author: dbu

DependencyInjection/FOSHttpCacheExtension.php

@@ -43,6 +43,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('matcher.xml');
 
         if ($config['debug']['enabled'] || (!empty($config['cache_control']))) {
             $debugHeader = $config['debug']['enabled'] ? $config['debug']['header'] : false;

Resources/config/cache_control_listener.xml

@@ -6,8 +6,6 @@
 
     <parameters>
         <parameter key="fos_http_cache.event_listener.cache_control.class">FOS\HttpCacheBundle\EventListener\CacheControlSubscriber</parameter>
-        <parameter key="fos_http_cache.request_matcher.class">Symfony\Component\HttpFoundation\RequestMatcher</parameter>
-        <parameter key="fos_http_cache.rule_matcher.class">FOS\HttpCacheBundle\Http\RuleMatcher</parameter>
     </parameters>
 
     <services>
@@ -16,18 +14,5 @@
             <argument>%fos_http_cache.debug_header%</argument>
             <tag name="kernel.event_subscriber" />
         </service>
-
-        <service id="fos_http_cache.request_matcher"
-                 class="%fos_http_cache.request_matcher.class%"
-                 public="false"
-        />
-
-        <service id="fos_http_cache.rule_matcher"
-                 class="%fos_http_cache.rule_matcher.class%"
-                 public="false"
-        >
-            <argument/>
-            <argument/>
-        </service>
     </services>
 </container>

Resources/config/matcher.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="fos_http_cache.request_matcher.class">Symfony\Component\HttpFoundation\RequestMatcher</parameter>
+        <parameter key="fos_http_cache.rule_matcher.class">FOS\HttpCacheBundle\Http\RuleMatcher</parameter>
+    </parameters>
+
+    <services>
+        <service id="fos_http_cache.request_matcher"
+                 class="%fos_http_cache.request_matcher.class%"
+                 public="false"
+        />
+        
+        <service id="fos_http_cache.rule_matcher"
+                 class="%fos_http_cache.rule_matcher.class%"
+                 public="false"
+        >
+            <argument/>
+            <argument/>
+        </service>
+    </services>
+</container>

Tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php

@@ -43,7 +43,7 @@ public function testConfigNoContext()
         $config = $this->getBaseConfig();
         $this->extension->load(array($config), $container);
         $this->userContextListenerPass->process($container);
-        $this->assertCount(10, $container->getDefinitions());
+        $this->assertCount(12, $container->getDefinitions());
     }
 
     /**

Tests/Unit/DependencyInjection/FOSHttpCacheExtensionTest.php

@@ -13,6 +13,7 @@
 
 use FOS\HttpCacheBundle\DependencyInjection\FOSHttpCacheExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
@@ -149,6 +150,9 @@ public function testConfigLoadInvalidatorRules()
 
         $this->assertMatcherCreated($container, array('_route' => 'my_route'));
         $this->assertListenerHasRule($container, 'fos_http_cache.event_listener.invalidation');
+        
+        // Test for runtime errors
+        $container->compile();
     }
 
     public function testConfigLoadCacheControl()
@@ -282,9 +286,17 @@ public function testConfigLoadFlashMessageSubscriber()
 
     protected function createContainer()
     {
-        return new ContainerBuilder(new ParameterBag(array(
-            'kernel.debug'       => false,
-        )));
+        $container = new ContainerBuilder(
+            new ParameterBag(array('kernel.debug' => false,))
+        );
+        
+        // The cache_manager service depends on the router service
+        $container->setDefinition(
+            'router',
+            new Definition('\Symfony\Component\Routing\Router')
+        );
+        
+        return $container;
     }
 
     protected function getBaseConfig()