Skip to content

Commit 1a1294a

Browse files
committed
fix max host connections option for XML configs
1 parent b225f6e commit 1a1294a

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@
486486
<xsd:element name="default-options" type="http_client_options" minOccurs="0" />
487487
</xsd:sequence>
488488
<xsd:attribute name="name" type="xsd:string" />
489+
<xsd:attribute name="max-host-connections" type="xsd:integer" />
489490
</xsd:complexType>
490491

491492
<xsd:complexType name="fingerprint">

Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
$container->loadFromExtension('framework', [
44
'http_client' => [
5+
'max_host_connections' => 4,
56
'default_options' => [
67
'headers' => ['foo' => 'bar'],
78
],
89
'clients' => [
910
'foo' => [
11+
'max_host_connections' => 5,
1012
'default_options' => [
1113
'headers' => ['bar' => 'baz'],
1214
],

Tests/DependencyInjection/Fixtures/xml/http_client_override_default_options.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:http-client>
9+
<framework:http-client max-host-connections="4">
1010
<framework:default-options>
1111
<framework:header name="foo">bar</framework:header>
1212
</framework:default-options>
13-
<framework:client name="foo">
13+
<framework:client name="foo" max-host-connections="5">
1414
<framework:default-options>
1515
<framework:header name="bar">baz</framework:header>
1616
</framework:default-options>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
framework:
22
http_client:
3+
max_host_connections: 4
34
default_options:
45
headers: {'foo': 'bar'}
56
clients:
67
foo:
8+
max_host_connections: 5
79
default_options:
810
headers: {'bar': 'baz'}

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,15 +1389,17 @@ public function testHttpClientOverrideDefaultOptions()
13891389
{
13901390
$container = $this->createContainerFromFile('http_client_override_default_options');
13911391

1392-
$this->assertSame(['foo' => ['bar']], $container->getDefinition('http_client')->getArguments()[0]['headers']);
1393-
$this->assertSame(['bar' => ['baz'], 'foo' => ['bar']], $container->getDefinition('foo')->getArguments()[0]['headers']);
1392+
$this->assertSame(['foo' => ['bar']], $container->getDefinition('http_client')->getArgument(0)['headers']);
1393+
$this->assertSame(4, $container->getDefinition('http_client')->getArgument(1));
1394+
$this->assertSame(['bar' => ['baz'], 'foo' => ['bar']], $container->getDefinition('foo')->getArgument(0)['headers']);
1395+
$this->assertSame(5, $container->getDefinition('foo')->getArgument(1));
13941396
}
13951397

13961398
public function testHttpClientFullDefaultOptions()
13971399
{
13981400
$container = $this->createContainerFromFile('http_client_full_default_options');
13991401

1400-
$defaultOptions = $container->getDefinition('http_client')->getArguments()[0];
1402+
$defaultOptions = $container->getDefinition('http_client')->getArgument(0);
14011403

14021404
$this->assertSame('foo:bar', $defaultOptions['auth_basic']);
14031405
$this->assertSame(['foo' => 'bar', 'bar' => 'baz'], $defaultOptions['query']);

0 commit comments

Comments
 (0)