Skip to content

Commit 75599e9

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: [Messenger] Removed named parameters and replaced with `?` placeholders for sqlsrv compatibility [HttpClient] use "idle" instead of "inactivity" when telling about the timeout option Create mailBody with only attachments part present [Messenger] Fix incompatibility with FrameworkBundle <4.3.1
2 parents 2d01754 + 37e7b5d commit 75599e9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/Configuration.php

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

Resources/config/console.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</service>
8383

8484
<service id="console.command.messenger_consume_messages" class="Symfony\Component\Messenger\Command\ConsumeMessagesCommand">
85-
<argument type="service" id="messenger.routable_message_bus" />
85+
<argument /> <!-- Routable message bus -->
8686
<argument type="service" id="messenger.receiver_locator" />
8787
<argument type="service" id="logger" on-invalid="null" />
8888
<argument type="collection" /> <!-- Receiver names -->

0 commit comments

Comments
 (0)