Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit aca5a3adc222 · 2021-12-28T16:54:28.000+01:00
* 6.0:
  fix merge
  fix merge
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -401,7 +401,10 @@ public function testAlias()
         $this->assertEqualsCanonicalizing([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
     }
 
-    public function testBindWithTarget()
+    /**
+     * @requires PHP 8.1
+     */
+    public function testEnumArgumentIsIgnored()
     {
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service')->addArgument([]);
@@ -417,10 +420,7 @@ public function testBindWithTarget()
         $this->assertEmpty(array_keys($locator), 'enum typed argument is ignored');
     }
 
-    /**
-     * @requires PHP 8.1
-     */
-    public function testEnumArgumentIsIgnored()
+    public function testBindWithTarget()
     {
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service')->addArgument([]);
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -552,7 +552,11 @@ public function cleanup(): void
     private function rawCommand(string $command, ...$arguments): mixed
     {
         try {
-            $result = $this->connection->rawCommand($command, $this->queue, ...$arguments);
+            if ($this->connection instanceof \RedisCluster || $this->connection instanceof RedisClusterProxy) {
+                $result = $this->connection->rawCommand($this->queue, $command, $this->queue, ...$arguments);
+            } else {
+                $result = $this->connection->rawCommand($command, $this->queue, ...$arguments);
+            }
         } catch (\RedisException $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,10 @@ public function testAlias()`
`401`	`401`	`$this->assertEqualsCanonicalizing([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));`
`402`	`402`	`}`
`403`	`403`
`404`		`- public function testBindWithTarget()`
	`404`	`+ /**`
	`405`	`+ * @requires PHP 8.1`
	`406`	`+ */`
	`407`	`+ public function testEnumArgumentIsIgnored()`
`405`	`408`	`{`
`406`	`409`	`$container = new ContainerBuilder();`
`407`	`410`	`$resolver = $container->register('argument_resolver.service')->addArgument([]);`
`@@ -417,10 +420,7 @@ public function testBindWithTarget()`
`417`	`420`	`$this->assertEmpty(array_keys($locator), 'enum typed argument is ignored');`
`418`	`421`	`}`
`419`	`422`
`420`		`- /**`
`421`		`- * @requires PHP 8.1`
`422`		`- */`
`423`		`- public function testEnumArgumentIsIgnored()`
	`423`	`+ public function testBindWithTarget()`
`424`	`424`	`{`
`425`	`425`	`$container = new ContainerBuilder();`
`426`	`426`	`$resolver = $container->register('argument_resolver.service')->addArgument([]);`
Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,11 @@ public function cleanup(): void`
`552`	`552`	`private function rawCommand(string $command, ...$arguments): mixed`
`553`	`553`	`{`
`554`	`554`	`try {`
`555`		`- $result = $this->connection->rawCommand($command, $this->queue, ...$arguments);`
	`555`	`+ if ($this->connection instanceof \RedisCluster \|\| $this->connection instanceof RedisClusterProxy) {`
	`556`	`+ $result = $this->connection->rawCommand($this->queue, $command, $this->queue, ...$arguments);`
	`557`	`+ } else {`
	`558`	`+ $result = $this->connection->rawCommand($command, $this->queue, ...$arguments);`
	`559`	`+ }`
`556`	`560`	`} catch (\RedisException $e) {`
`557`	`561`	`throw new TransportException($e->getMessage(), 0, $e);`
`558`	`562`	`}`