Skip to content

Commit 3d79a2a

Browse files
Merge branch '4.3' into 4.4
* 4.3: Minor fixes [HttpClient] Minor fixes Use namespaced Phpunit classes [Messenger] Fixed ConsumeMessagesCommand configuration [Form] remove leftover int child phpdoc Support DateTimeInterface in IntlDateFormatter::format [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke fixed phpdocs Use PHPunit assertion [Intl] Order alpha2 to alpha3 mapping + phpdoc fixes
2 parents af71443 + 288cc2b commit 3d79a2a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
15011501
->info('A comma separated list of hosts that do not require a proxy to be reached.')
15021502
->end()
15031503
->floatNode('timeout')
1504-
->info('Defaults to "default_socket_timeout" ini parameter.')
1504+
->info('The idle timeout, defaults to the "default_socket_timeout" ini parameter.')
15051505
->end()
15061506
->scalarNode('bindto')
15071507
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')

0 commit comments

Comments
 (0)