Merge branch '4.4' into 5.0

* 4.4:
  [Mailer] fix typos
  [Messenger] fix typo
  [DI] Unknown env prefix not regornized as such
  [DI] Fix support for multiple tags for locators and iterators
  [PhpUnitBridge] Fix some errors when using serialized deprecations
  Fix HTTP client config handling

Author: nicolas-grekas

DependencyInjection/Configuration.php

@@ -1265,7 +1265,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                             if (!\is_array($config)) {
                                                 return [];
                                             }
-                                            if (!isset($config['host'])) {
+                                            if (!isset($config['host'], $config['value']) || \count($config) > 2) {
                                                 return $config;
                                             }
 
@@ -1374,7 +1374,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                                 if (!\is_array($config)) {
                                                     return [];
                                                 }
-                                                if (!isset($config['key'])) {
+                                                if (!isset($config['key'], $config['value']) || \count($config) > 2) {
                                                     return $config;
                                                 }
 
@@ -1404,7 +1404,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                                 if (!\is_array($config)) {
                                                     return [];
                                                 }
-                                                if (!isset($config['host'])) {
+                                                if (!isset($config['host'], $config['value']) || \count($config) > 2) {
                                                     return $config;
                                                 }
 

Tests/DependencyInjection/Fixtures/php/http_client_xml_key.php

@@ -0,0 +1,22 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'http_client' => [
+        'default_options' => [
+            'resolve' => [
+                'host' => '127.0.0.1',
+            ],
+        ],
+        'scoped_clients' => [
+            'foo' => [
+                'base_uri' => 'http://example.com',
+                'query' => [
+                    'key' => 'foo',
+                ],
+                'resolve' => [
+                    'host' => '127.0.0.1',
+                ],
+            ],
+        ],
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/http_client_xml_key.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:http-client>
+            <framework:default-options>
+                <framework:resolve host="host">127.0.0.1</framework:resolve>
+            </framework:default-options>
+            <framework:scoped-client name="foo" base-uri="http://example.com">
+                <framework:query key="key">foo</framework:query>
+                <framework:resolve host="host">127.0.0.1</framework:resolve>
+            </framework:scoped-client>
+        </framework:http-client>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/http_client_xml_key.yml

@@ -0,0 +1,12 @@
+framework:
+    http_client:
+        default_options:
+            resolve:
+                host: 127.0.0.1
+        scoped_clients:
+            foo:
+                base_uri: http://example.com
+                query:
+                    key: foo
+                resolve:
+                    host: 127.0.0.1

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1358,6 +1358,21 @@ public function testHttpClientOverrideDefaultOptions()
         $this->assertSame($expected, $container->getDefinition('foo')->getArgument(2));
     }
 
+    public function testHttpClientWithQueryParameterKey()
+    {
+        $container = $this->createContainerFromFile('http_client_xml_key');
+
+        $expected = [
+            'key' => 'foo',
+        ];
+        $this->assertSame($expected, $container->getDefinition('foo')->getArgument(2)['query']);
+
+        $expected = [
+            'host' => '127.0.0.1',
+        ];
+        $this->assertSame($expected, $container->getDefinition('foo')->getArgument(2)['resolve']);
+    }
+
     public function testHttpClientFullDefaultOptions()
     {
         $container = $this->createContainerFromFile('http_client_full_default_options');