Skip to content

Commit 2ac4c4d

Browse files
committed
Merge branch '5.1' into 5.x
* 5.1: Don't skip Doctrine tests on php 8. Stop using set-env in GitHub actions. Allow setting AMQP option "login" Bump igbinary to v3.1.6 Add myself to CODEOWNERS for Form, OptionsResolver and TwigBundle Reference the correct interface in the RegistryInterface deprecation in upgrade notes Add myself to CODEOWNERS for Security and Console Add wouterj as codeowner for Security related packages
2 parents d2c3b13 + 22731a3 commit 2ac4c4d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Transport/Connection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class Connection
3737
'port',
3838
'vhost',
3939
'user',
40+
'login',
4041
'password',
4142
'queues',
4243
'exchange',
@@ -124,7 +125,7 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar
124125
* * host: Hostname of the AMQP service
125126
* * port: Port of the AMQP service
126127
* * vhost: Virtual Host to use with the AMQP service
127-
* * user: Username to use to connect the AMQP service
128+
* * user|login: Username to use to connect the AMQP service
128129
* * password: Password to use to connect to the AMQP service
129130
* * read_timeout: Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
130131
* * write_timeout: Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.

0 commit comments

Comments
 (0)