Merge branch '7.2' into 7.3

alexandre-daubois · alexandre-daubois · commit c0c0a8f625a8 · 2025-02-26T11:03:16.000+01:00
* 7.2:
  [Cache] Fix `PredisAdapter` tests
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
@@ -36,6 +36,8 @@ public function testCreateConnection()
         $this->assertInstanceOf(StreamConnection::class, $connection);
 
         $redisHost = explode(':', $redisHost);
+        $connectionParameters = $connection->getParameters()->toArray();
+
         $params = [
             'scheme' => 'tcp',
             'host' => $redisHost[0],
@@ -46,7 +48,12 @@ public function testCreateConnection()
             'tcp_nodelay' => true,
             'database' => '1',
         ];
-        $this->assertSame($params, $connection->getParameters()->toArray());
+
+        if (isset($connectionParameters['conn_uid'])) {
+            $params['conn_uid'] = $connectionParameters['conn_uid']; // if present, the value cannot be predicted
+        }
+
+        $this->assertSame($params, $connectionParameters);
     }
 
     public function testCreateSslConnection()
@@ -60,6 +67,8 @@ public function testCreateSslConnection()
         $this->assertInstanceOf(StreamConnection::class, $connection);
 
         $redisHost = explode(':', $redisHost);
+        $connectionParameters = $connection->getParameters()->toArray();
+
         $params = [
             'scheme' => 'tls',
             'host' => $redisHost[0],
@@ -71,7 +80,12 @@ public function testCreateSslConnection()
             'tcp_nodelay' => true,
             'database' => '1',
         ];
-        $this->assertSame($params, $connection->getParameters()->toArray());
+
+        if (isset($connectionParameters['conn_uid'])) {
+            $params['conn_uid'] = $connectionParameters['conn_uid']; // if present, the value cannot be predicted
+        }
+
+        $this->assertSame($params, $connectionParameters);
     }
 
     public function testAclUserPasswordAuth()
