Merge branch '7.1' into 7.2

* 7.1: [HttpFoundation] Fix test [HttpFoundation] Revert risk change [Notifier] Fix GoIpTransport [HttpClient] Fix catching some invalid Location headers
symfony · Nov 13, 2024 · c2a907c · c2a907c
2 parents f99cca8 + a614293
commit c2a907c
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/Tests/Transport/ConnectionTest.php b/Tests/Transport/ConnectionTest.php
@@ -106,7 +106,7 @@ public function testFromDsnWithMixDsnQueryOptions()
 
         $this->assertEquals(
             Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['consumer' => 'specific-consumer'], $this->createRedisMock()),
-            Connection::fromDsn('redis://localhost/queue/group1/consumer1', [], $this->createRedisMock()))
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1', [], $this->createRedisMock())
         );
     }
 
@@ -439,8 +439,7 @@ public function testFromDsnOnUnixSocketWithUserAndPassword()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'user' => 'user',
-                'pass' => 'password',
+                'auth' => ['user', 'password'],
             ], $redis),
             Connection::fromDsn('redis://user:password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -460,7 +459,7 @@ public function testFromDsnOnUnixSocketWithPassword()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'pass' => 'password',
+                'auth' => 'password',
             ], $redis),
             Connection::fromDsn('redis://password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -480,7 +479,7 @@ public function testFromDsnOnUnixSocketWithUser()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'user' => 'user',
+                'auth' => 'user',
             ], $redis),
             Connection::fromDsn('redis://user:@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -494,7 +493,7 @@ private function createRedisMock(): \Redis
             ->willReturn(true);
         $redis->expects($this->any())
             ->method('isConnected')
-            ->willReturnOnConsecutiveCalls(false, true);
+            ->willReturnOnConsecutiveCalls(false, true, true);
 
         return $redis;
     }