bug #39967 [Messenger] fix redis messenger options with dsn (Kleinast)

nicolas-grekas · nicolas-grekas · commit aa5ca01ed0bb · 2021-01-26T09:57:27.000+01:00
This PR was submitted for the 5.1 branch but it was merged into the 4.4 branch instead. Discussion ---------- [Messenger] fix redis messenger options with dsn | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39834 | License | MIT This will fix the fact that you can use framework.messenger.transports.*.options to complete/default your redis configuration Commits ------- a0e7bf4 fix redis messenger options with dsn
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
@@ -85,6 +85,19 @@ public function testFromDsnWithQueryOptions()
         );
     }
 
+    public function testFromDsnWithMixDsnQueryOptions()
+    {
+        $this->assertEquals(
+            Connection::fromDsn('redis://localhost/queue/group1?serializer=2', ['consumer' => 'specific-consumer']),
+            Connection::fromDsn('redis://localhost/queue/group1/specific-consumer?serializer=2')
+        );
+
+        $this->assertEquals(
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['consumer' => 'specific-consumer']),
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1')
+        );
+    }
+
     public function testKeepGettingPendingMessages()
     {
         $redis = $this->getMockBuilder(\Redis::class)->disableOriginalConstructor()->getMock();
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -101,7 +101,8 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
         ];
 
         if (isset($parsedUrl['query'])) {
-            parse_str($parsedUrl['query'], $redisOptions);
+            parse_str($parsedUrl['query'], $dsnOptions);
+            $redisOptions = array_merge($redisOptions, $dsnOptions);
         }
 
         $autoSetup = null;

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re`
`101`	`101`	`];`
`102`	`102`
`103`	`103`	`if (isset($parsedUrl['query'])) {`
`104`		`- parse_str($parsedUrl['query'], $redisOptions);`
	`104`	`+ parse_str($parsedUrl['query'], $dsnOptions);`
	`105`	`+ $redisOptions = array_merge($redisOptions, $dsnOptions);`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`$autoSetup = null;`