Merge remote-tracking branch 'origin/2.x' into 2-to-3

Author: dbu

CHANGELOG.md

@@ -9,6 +9,7 @@ Changelog
 
 * If a custom proxy client is configured on the cache manager, the `ProxyClient` class is an alias to that client, to support autowiring.
 * Attribute configuration now also works on single action controllers with the `__invoke` method.
+* New configuration option `proxy_client.*.http.request_factory` to support custom HTTP request factories for proxy clients.
 
 3.1.2
 -----
@@ -53,6 +54,11 @@ Changelog
 2.x
 ===
 
+2.18.0
+------
+
+* New configuration option `proxy_client.*.http.request_factory` to support custom HTTP request factories for proxy clients.
+
 2.17.1
 ------
 

Resources/doc/features/invalidation.rst

@@ -66,7 +66,8 @@ To refresh paths and routes, you can use ``refreshPath($path, $headers)`` and
 
     If you want to add a header (such as ``Authorization``) to *all*
     invalidation requests, you can use a
-    :ref:`custom HTTP client <custom HTTP client>` instead.
+    :ref:`custom HTTP client <custom HTTP client>` or
+    :ref:`custom HTTP request factory <custom HTTP request factory>` instead.
 
 .. _invalidation configuration:
 

Resources/doc/reference/configuration/proxy-client.rst

@@ -400,6 +400,15 @@ example to send a basic authentication header with each request, you can
 configure a service for the ``HttpClient`` and specify that in the
 ``http_client`` option of any of the cache proxy clients.
 
+.. _custom HTTP request factory:
+
+Custom HTTP Request Factory
+---------------------------
+
+The proxy client uses an implementation of ``Http\Message\RequestFactory`` to create HTTP requests.
+If you need to customize the request creation, you can configure your custom service and
+specify that in the ``request_factory`` option of any of the cache proxy clients.
+
 Caching Proxy Configuration
 ---------------------------
 

src/DependencyInjection/Configuration.php

@@ -624,6 +624,10 @@ private function getHttpDispatcherNode(): ArrayNodeDefinition
                     ->defaultNull()
                     ->info('Httplug async client service name to use for sending the requests.')
                 ->end()
+                ->scalarNode('request_factory')
+                    ->defaultNull()
+                    ->info('Service name of factory for PSR-7 messages.')
+                ->end()
             ->end()
         ;
 

src/DependencyInjection/FOSHttpCacheExtension.php

@@ -427,6 +427,12 @@ private function loadVarnish(ContainerBuilder $container, XmlFileLoader $loader,
         $container->setParameter('fos_http_cache.proxy_client.varnish.options', $options);
 
         $loader->load('varnish.xml');
+
+        $requestFactory = isset($config['http']['request_factory'])
+            ? new Reference($config['http']['request_factory'])
+            : null;
+        $container->getDefinition('fos_http_cache.proxy_client.varnish')
+            ->replaceArgument(2, $requestFactory);
     }
 
     private function loadNginx(ContainerBuilder $container, XmlFileLoader $loader, array $config): void
@@ -436,6 +442,12 @@ private function loadNginx(ContainerBuilder $container, XmlFileLoader $loader, a
             'purge_location' => $config['purge_location'],
         ]);
         $loader->load('nginx.xml');
+
+        $requestFactory = isset($config['http']['request_factory'])
+            ? new Reference($config['http']['request_factory'])
+            : null;
+        $container->getDefinition('fos_http_cache.proxy_client.nginx')
+            ->replaceArgument(2, $requestFactory);
     }
 
     private function loadSymfony(ContainerBuilder $container, XmlFileLoader $loader, array $config): void
@@ -462,6 +474,12 @@ private function loadSymfony(ContainerBuilder $container, XmlFileLoader $loader,
         $container->setParameter('fos_http_cache.proxy_client.symfony.options', $options);
 
         $loader->load('symfony.xml');
+
+        $requestFactory = isset($config['http']['request_factory'])
+            ? new Reference($config['http']['request_factory'])
+            : null;
+        $container->getDefinition('fos_http_cache.proxy_client.symfony')
+            ->replaceArgument(2, $requestFactory);
     }
 
     private function loadCloudflare(ContainerBuilder $container, XmlFileLoader $loader, array $config): void
@@ -475,6 +493,12 @@ private function loadCloudflare(ContainerBuilder $container, XmlFileLoader $load
         $container->setParameter('fos_http_cache.proxy_client.cloudflare.options', $options);
 
         $loader->load('cloudflare.xml');
+
+        $requestFactory = isset($config['http']['request_factory'])
+            ? new Reference($config['http']['request_factory'])
+            : null;
+        $container->getDefinition('fos_http_cache.proxy_client.cloudflare')
+            ->replaceArgument(2, $requestFactory);
     }
 
     private function loadCloudfront(ContainerBuilder $container, XmlFileLoader $loader, array $config): void
@@ -511,6 +535,12 @@ private function loadFastly(ContainerBuilder $container, XmlFileLoader $loader,
         $container->setParameter('fos_http_cache.proxy_client.fastly.options', $options);
 
         $loader->load('fastly.xml');
+
+        $requestFactory = isset($config['http']['request_factory'])
+            ? new Reference($config['http']['request_factory'])
+            : null;
+        $container->getDefinition('fos_http_cache.proxy_client.fastly')
+            ->replaceArgument(2, $requestFactory);
     }
 
     /**

src/Resources/config/cloudflare.xml

@@ -11,6 +11,7 @@
                  lazy="true">
             <argument type="service" id="fos_http_cache.proxy_client.cloudflare.http_dispatcher"/>
             <argument>%fos_http_cache.proxy_client.cloudflare.options%</argument>
+            <argument /> <!-- request factory -->
         </service>
     </services>
 

src/Resources/config/fastly.xml

@@ -11,6 +11,7 @@
                  lazy="true">
             <argument type="service" id="fos_http_cache.proxy_client.fastly.http_dispatcher"/>
             <argument>%fos_http_cache.proxy_client.fastly.options%</argument>
+            <argument /> <!-- request factory -->
         </service>
     </services>
 

src/Resources/config/nginx.xml

@@ -10,6 +10,7 @@
                  public="true">
             <argument type="service" id="fos_http_cache.proxy_client.nginx.http_dispatcher"/>
             <argument>%fos_http_cache.proxy_client.nginx.options%</argument>
+            <argument /> <!-- request factory -->
         </service>
     </services>
 

src/Resources/config/symfony.xml

@@ -10,6 +10,7 @@
                  public="true">
             <argument type="service" id="fos_http_cache.proxy_client.symfony.http_dispatcher"/>
             <argument>%fos_http_cache.proxy_client.symfony.options%</argument>
+            <argument /> <!-- request factory -->
         </service>
     </services>
 

src/Resources/config/varnish.xml

@@ -10,6 +10,7 @@
                  public="true">
             <argument type="service" id="fos_http_cache.proxy_client.varnish.http_dispatcher"/>
             <argument>%fos_http_cache.proxy_client.varnish.options%</argument>
+            <argument /> <!-- request factory -->
         </service>
     </services>