Merge branch 'master' of github.com:api-platform/core

Author: dunglas

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -505,7 +505,7 @@ private function registerHttpCache(ContainerBuilder $container, array $config, X
         $definitions = [];
         foreach ($config['http_cache']['invalidation']['varnish_urls'] as $key => $url) {
             $definition = new ChildDefinition('api_platform.http_cache.purger.varnish_client');
-            $definition->addArgument(['base_uri' => $url]);
+            $definition->addArgument(['base_uri' => $url] + $config['http_cache']['invalidation']['request_options']);
 
             $definitions[] = $definition;
         }

src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php

@@ -212,6 +212,14 @@ public function getConfigTreeBuilder()
                                     ->prototype('scalar')->end()
                                     ->info('URLs of the Varnish servers to purge using cache tags when a resource is updated.')
                                 ->end()
+                                ->variableNode('request_options')
+                                    ->defaultValue([])
+                                    ->validate()
+                                        ->ifTrue(function ($v) { return false === is_array($v); })
+                                        ->thenInvalid('The request_options parameter must be an array.')
+                                    ->end()
+                                    ->info('To pass options to the client charged with the request.')
+                                ->end()
                             ->end()
                         ->end()
                     ->end()

tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

@@ -73,6 +73,22 @@ class ApiPlatformExtensionTest extends TestCase
         'http_cache' => ['invalidation' => [
             'enabled' => true,
             'varnish_urls' => ['test'],
+            'request_options' => [
+                'allow_redirects' => [
+                    'max' => 5,
+                    'protocols' => ['http', 'https'],
+                    'stric' => false,
+                    'referer' => false,
+                    'track_redirects' => false,
+                ],
+                'http_errors' => true,
+                'decode_content' => false,
+                'verify' => false,
+                'cookies' => true,
+                'headers' => [
+                    'User-Agent' => 'none',
+                ],
+            ],
         ]],
     ]];
 
@@ -344,6 +360,17 @@ public function testNotRegisterHttpCacheWhenEnabledWithNoVarnishServer()
         $this->extension->load($config, $containerBuilder);
     }
 
+    public function testRegisterHttpCacheWhenEnabledWithNoRequestOption()
+    {
+        $containerBuilderProphecy = $this->getBaseContainerBuilderProphecy();
+        $containerBuilder = $containerBuilderProphecy->reveal();
+
+        $config = self::DEFAULT_CONFIG;
+        unset($config['api_platform']['http_cache']['invalidation']['request_options']);
+
+        $this->extension->load($config, $containerBuilder);
+    }
+
     private function getPartialContainerBuilderProphecy($test = false)
     {
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);

tests/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php

@@ -126,7 +126,11 @@ public function testDefaultConfig()
                 'paths' => [],
             ],
             'http_cache' => [
-                'invalidation' => ['enabled' => false, 'varnish_urls' => []],
+                'invalidation' => [
+                    'enabled' => false,
+                    'varnish_urls' => [],
+                    'request_options' => [],
+                ],
                 'etag' => true,
                 'max_age' => null,
                 'shared_max_age' => null,