Merge branch '5.4' into 6.0

xabbuh · xabbuh · commit 0a1761123445 · 2022-09-11T12:42:22.000+03:00
* 5.4:
  [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
@@ -183,11 +183,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
`@@ -183,11 +183,11 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am`
`183`	`183`	`self::validateOptions($amqpOptions);`
`184`	`184`
`185`	`185`	`if (isset($parsedUrl['user'])) {`
`186`		`- $amqpOptions['login'] = $parsedUrl['user'];`
	`186`	`+ $amqpOptions['login'] = urldecode($parsedUrl['user']);`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`if (isset($parsedUrl['pass'])) {`
`190`		`- $amqpOptions['password'] = $parsedUrl['pass'];`
	`190`	`+ $amqpOptions['password'] = urldecode($parsedUrl['pass']);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`if (!isset($amqpOptions['queues'])) {`