Merge pull request #236 from FriendsOfSymfony/fix-custom-client-config

fix how to configure a custom proxy client for the cache manager
FriendsOfSymfony · Aug 20, 2015 · aa20b2a · aa20b2a
2 parents ae7aca7 + c17eced
commit aa20b2a
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 4 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -52,11 +52,13 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->validate()
-                ->ifTrue(function ($v) {return $v['cache_manager']['enabled'] && !isset($v['proxy_client']);})
+                ->ifTrue(function ($v) {
+                    return $v['cache_manager']['enabled']
+                        && !isset($v['proxy_client'])
+                        && !isset($v['cache_manager']['custom_proxy_client'])
+                    ;
+                })
                 ->then(function ($v) {
-                    if (!empty($v['cache_manager']['proxy_client'])) {
-                        return $v;
-                    }
                     if ('auto' === $v['cache_manager']['enabled']) {
                         $v['cache_manager']['enabled'] = false;
 

diff --git a/Tests/Resources/Fixtures/config/custom-client.php b/Tests/Resources/Fixtures/config/custom-client.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('fos_http_cache', array(
+    'cache_manager' => array(
+        'enabled' => true,
+        'custom_proxy_client' => 'acme.proxy_client',
+    ),
+));
diff --git a/Tests/Resources/Fixtures/config/custom-client.xml b/Tests/Resources/Fixtures/config/custom-client.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services">
+
+    <config xmlns="http://example.org/schema/dic/fos_http_cache">
+        <cache-manager enabled="true" custom-proxy-client="acme.proxy_client"/>
+    </config>
+</container>
diff --git a/Tests/Resources/Fixtures/config/custom-client.yml b/Tests/Resources/Fixtures/config/custom-client.yml
@@ -0,0 +1,4 @@
+fos_http_cache:
+    cache_manager:
+        enabled: true
+        custom_proxy_client: acme.proxy_client
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -184,6 +184,30 @@ public function testSupportsAllConfigFormats()
         }
     }
 
+    public function testCustomProxyClient()
+    {
+        $expectedConfiguration = $this->getEmptyConfig();
+        $expectedConfiguration['cache_manager'] = array(
+            'enabled' => true,
+            'custom_proxy_client' => 'acme.proxy_client',
+            'generate_url_type' => 'auto',
+        );
+        $expectedConfiguration['tags']['enabled'] = 'auto';
+        $expectedConfiguration['invalidation']['enabled'] = 'auto';
+
+        $formats = array_map(function ($path) {
+            return __DIR__.'/../../Resources/Fixtures/'.$path;
+        }, array(
+            'config/custom-client.yml',
+            'config/custom-client.xml',
+            'config/custom-client.php',
+        ));
+
+        foreach ($formats as $format) {
+            $this->assertProcessedConfigurationEquals($expectedConfiguration, array($format));
+        }
+    }
+
     public function testSupportsNginx()
     {
         $expectedConfiguration = $this->getEmptyConfig();