Merge pull request #448 from Toflar/fix-regression

Fixed regression with "default" being treated as proxy

Author: dbu

src/DependencyInjection/Configuration.php

@@ -398,24 +398,23 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
 
                         ->booleanNode('noop')->end()
                     ->end()
-
                     ->validate()
                         ->always()
                         ->then(function ($config) {
                             foreach ($config as $proxyName => $proxyConfig) {
                                 $serversConfigured = isset($proxyConfig['http']) && isset($proxyConfig['http']['servers']) && \is_array($proxyConfig['http']['servers']);
 
-                                if (!\in_array($proxyName, ['noop', 'symfony'])) {
+                                if (!\in_array($proxyName, ['noop', 'default', 'symfony'])) {
                                     if (!$serversConfigured) {
-                                        throw new  \InvalidArgumentException(sprintf('The "http.servers" section must be defined for the proxy "%s"', $proxyName));
+                                        throw new \InvalidArgumentException(sprintf('The "http.servers" section must be defined for the proxy "%s"', $proxyName));
                                     }
 
                                     return $config;
                                 }
 
                                 if ('symfony' === $proxyName) {
                                     if (!$serversConfigured && false === $proxyConfig['use_kernel_dispatcher']) {
-                                        throw new  \InvalidArgumentException(sprintf('Either configure the "http.servers" section or enable "use_kernel_dispatcher" the proxy "%s"', $proxyName));
+                                        throw new \InvalidArgumentException(sprintf('Either configure the "http.servers" section or enable "use_kernel_dispatcher" the proxy "%s"', $proxyName));
                                     }
                                 }
                             }

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -306,7 +306,21 @@ public function testEmptyServerConfigurationIsNotAllowed()
         ];
 
         $configuration = new Configuration(false);
-        $configuration = (new Processor())->processConfiguration($configuration, ['fos_http_cache' => $params]);
+        (new Processor())->processConfiguration($configuration, ['fos_http_cache' => $params]);
+    }
+
+    public function testDefaultIsNotConsideredAsServerConfig()
+    {
+        $params = $this->getEmptyConfig();
+        $params['proxy_client'] = [
+            'default' => 'varnish',
+        ];
+
+        $configuration = new Configuration(false);
+        (new Processor())->processConfiguration($configuration, ['fos_http_cache' => $params]);
+
+        // Should not throw InvalidConfigurationException because no "http.servers" was configured
+        $this->addToAssertionCount(1);
     }
 
     public function testSupportsNoop()