@@ -162,24 +162,24 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar
162
162
*/
163
163
public static function fromDsn (#[\SensitiveParameter] string $ dsn , array $ options = [], AmqpFactory $ amqpFactory = null ): self
164
164
{
165
- if (false === $ parsedUrl = parse_url ($ dsn )) {
165
+ if (false === $ params = parse_url ($ dsn )) {
166
166
// this is a valid URI that parse_url cannot handle when you want to pass all parameters as options
167
167
if (!\in_array ($ dsn , ['amqp:// ' , 'amqps:// ' ])) {
168
168
throw new InvalidArgumentException ('The given AMQP DSN is invalid. ' );
169
169
}
170
170
171
- $ parsedUrl = [];
171
+ $ params = [];
172
172
}
173
173
174
174
$ useAmqps = str_starts_with ($ dsn , 'amqps:// ' );
175
- $ pathParts = isset ($ parsedUrl ['path ' ]) ? explode ('/ ' , trim ($ parsedUrl ['path ' ], '/ ' )) : [];
175
+ $ pathParts = isset ($ params ['path ' ]) ? explode ('/ ' , trim ($ params ['path ' ], '/ ' )) : [];
176
176
$ exchangeName = $ pathParts [1 ] ?? 'messages ' ;
177
- parse_str ($ parsedUrl ['query ' ] ?? '' , $ parsedQuery );
177
+ parse_str ($ params ['query ' ] ?? '' , $ parsedQuery );
178
178
$ port = $ useAmqps ? 5671 : 5672 ;
179
179
180
180
$ amqpOptions = array_replace_recursive ([
181
- 'host ' => $ parsedUrl ['host ' ] ?? 'localhost ' ,
182
- 'port ' => $ parsedUrl ['port ' ] ?? $ port ,
181
+ 'host ' => $ params ['host ' ] ?? 'localhost ' ,
182
+ 'port ' => $ params ['port ' ] ?? $ port ,
183
183
'vhost ' => isset ($ pathParts [0 ]) ? urldecode ($ pathParts [0 ]) : '/ ' ,
184
184
'exchange ' => [
185
185
'name ' => $ exchangeName ,
@@ -188,12 +188,12 @@ public static function fromDsn(#[\SensitiveParameter] string $dsn, array $option
188
188
189
189
self ::validateOptions ($ amqpOptions );
190
190
191
- if (isset ($ parsedUrl ['user ' ])) {
192
- $ amqpOptions ['login ' ] = urldecode ( $ parsedUrl ['user ' ]);
191
+ if (isset ($ params ['user ' ])) {
192
+ $ amqpOptions ['login ' ] = rawurldecode ( $ params ['user ' ]);
193
193
}
194
194
195
- if (isset ($ parsedUrl ['pass ' ])) {
196
- $ amqpOptions ['password ' ] = urldecode ( $ parsedUrl ['pass ' ]);
195
+ if (isset ($ params ['pass ' ])) {
196
+ $ amqpOptions ['password ' ] = rawurldecode ( $ params ['pass ' ]);
197
197
}
198
198
199
199
if (!isset ($ amqpOptions ['queues ' ])) {
0 commit comments