Merge branch '6.0' into 6.1

xabbuh · xabbuh · commit 7fafcd3a8e48 · 2022-09-11T12:45:03.000+03:00
* 6.0:
  [HttpFoundation] Always return strings from accept headers
  decode URL-encoded characters in DSN's usernames/passwords
  [Security/Http] cs fixes
diff --git a/Transport/Connection.php b/Transport/Connection.php
@@ -184,11 +184,11 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am
         self::validateOptions($amqpOptions);
 
         if (isset($parsedUrl['user'])) {
-            $amqpOptions['login'] = $parsedUrl['user'];
+            $amqpOptions['login'] = urldecode($parsedUrl['user']);
         }
 
         if (isset($parsedUrl['pass'])) {
-            $amqpOptions['password'] = $parsedUrl['pass'];
+            $amqpOptions['password'] = urldecode($parsedUrl['pass']);
         }
 
         if (!isset($amqpOptions['queues'])) {

Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,11 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am`
`184`	`184`	`self::validateOptions($amqpOptions);`
`185`	`185`
`186`	`186`	`if (isset($parsedUrl['user'])) {`
`187`		`- $amqpOptions['login'] = $parsedUrl['user'];`
	`187`	`+ $amqpOptions['login'] = urldecode($parsedUrl['user']);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if (isset($parsedUrl['pass'])) {`
`191`		`- $amqpOptions['password'] = $parsedUrl['pass'];`
	`191`	`+ $amqpOptions['password'] = urldecode($parsedUrl['pass']);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`if (!isset($amqpOptions['queues'])) {`