Only load test clients when needed

* Fixes service validation on Symfony 2.8
* Prevents users from accidentally using the service

Author: ddeboer

DependencyInjection/FOSHttpCacheExtension.php

@@ -335,13 +335,11 @@ private function loadTest(ContainerBuilder $container, XmlFileLoader $loader, ar
             $loader->load('test_client.xml');
 
             if ($config['client']['varnish']['enabled']) {
-                $container->getDefinition($this->getAlias().'.test.client.varnish')
-                    ->setAbstract(false);
+                $loader->load('varnish_test_client.xml');
             }
 
             if ($config['client']['nginx']['enabled']) {
-                $container->getDefinition($this->getAlias().'.test.client.nginx')
-                    ->setAbstract(false);
+                $loader->load('nginx_test_client.xml');
             }
 
             $container->setAlias(

Resources/config/nginx.xml

@@ -16,12 +16,6 @@
             <argument>%fos_http_cache.proxy_client.nginx.purge_location%</argument>
             <argument type="service" id="fos_http_cache.proxy_client.nginx.guzzle_client" on-invalid="ignore"/>
         </service>
-
-        <service id="fos_http_cache.test.client.nginx"
-                 parent="fos_http_cache.test.client.abstract"
-                 abstract="true">
-            <argument index="0">%fos_http_cache.proxy_client.nginx.base_url%</argument>
-        </service>
     </services>
 
 </container>

Resources/config/nginx_test_client.xml

@@ -0,0 +1,14 @@
+<?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">
+
+    <services>
+        <service id="fos_http_cache.test.client.nginx"
+                 parent="fos_http_cache.test.client.abstract">
+            <argument index="0">%fos_http_cache.proxy_client.nginx.base_url%</argument>
+        </service>
+    </services>
+
+</container>

Resources/config/varnish.xml

@@ -16,12 +16,6 @@
             <argument type="service" id="fos_http_cache.proxy_client.varnish.guzzle_client" on-invalid="ignore"/>
         </service>
 
-        <service id="fos_http_cache.test.client.varnish"
-                 parent="fos_http_cache.test.client.abstract"
-                 abstract="true">
-            <argument index="0">%fos_http_cache.proxy_client.varnish.base_url%</argument>
-        </service>
-
     </services>
 
 </container>

Resources/config/varnish_test_client.xml

@@ -0,0 +1,14 @@
+<?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">
+
+    <services>
+        <service id="fos_http_cache.test.client.varnish"
+                 parent="fos_http_cache.test.client.abstract">
+            <argument index="0">%fos_http_cache.proxy_client.varnish.base_url%</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(14, $container->getDefinitions());
+        $this->assertCount(13, $container->getDefinitions());
     }
 
     /**