symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+15-12Lines changed: 15 additions & 12 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+15-12Lines changed: 15 additions & 12 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -491,7 +491,21 @@ private function buildDsnFromUrl(string $dsnOrUrl): string
             case 'pgsql':
                 $dsn = $driver.':';
 
-                if (isset($params['host']) && '' !== $params['host']) {
+                $hasSocket = false;
+                if ('mysql' === $driver && isset($params['query']) && '' !== $params['query']) {
+                    $queryParams = [];
+                    parse_str($params['query'], $queryParams);
+                    if (isset($queryParams['unix_socket']) && '' !== $queryParams['unix_socket']) {
+                        $dsn .= 'unix_socket='.$queryParams['unix_socket'].';';
+                        $hasSocket = true;
+                    }
+
+                    if (isset($queryParams['charset']) && '' !== $queryParams['charset']) {
+                        $dsn .= 'charset='.$queryParams['charset'].';';
+                    }
+                }
+
+                if (!$hasSocket && isset($params['host']) && '' !== $params['host']) {
                     $dsn .= 'host='.$params['host'].';';
                 }
 
@@ -504,17 +518,6 @@ private function buildDsnFromUrl(string $dsnOrUrl): string
                     $dsn .= 'dbname='.$dbName.';';
                 }
 
-                if ('mysql' === $driver && isset($params['query']) && '' !== $params['query']) {
-                    $queryParams = [];
-                    parse_str($params['query'], $queryParams);
-                    if (isset($queryParams['unix_socket']) && '' !== $queryParams['unix_socket']) {
-                        $dsn .= 'unix_socket='.$queryParams['unix_socket'].';';
-                    }
-
-                    if (isset($queryParams['charset']) && '' !== $queryParams['charset']) {
-                        $dsn .= 'charset='.$queryParams['charset'].';';
-                    }
-                }
 
                 return $dsn;
 
 
@@ -332,7 +332,7 @@ public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPa
     public function provideUrlDsnPairs()
     {
         yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];
-        yield ['mysql://localhost/test?unix_socket=socket.sock&charset=utf8mb4', 'mysql:host=localhost;dbname=test;unix_socket=socket.sock;charset=utf8mb4;'];
+        yield ['mysql://localhost/test?unix_socket=socket.sock&charset=utf8mb4', 'mysql:unix_socket=socket.sock;charset=utf8mb4;dbname=test;'];
         yield ['mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;'];
         yield ['mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd'];
         yield ['postgres://localhost/test', 'pgsql:host=localhost;dbname=test;'];