Simplify the logic

Nyholm · Nyholm · commit bdc03bc595df · 2021-03-18T16:22:39.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -486,26 +486,33 @@ private function buildDsnFromUrl(string $dsnOrUrl): string
             $driver = substr($driver, 4);
         }
 
+        $dsn = null;
         switch ($driver) {
             case 'mysql':
-            case 'pgsql':
-                $dsn = $driver.':';
-
-                $hasSocket = false;
-                if ('mysql' === $driver && isset($params['query']) && '' !== $params['query']) {
+                $dsn ='mysql:';
+                if (isset($params['query']) && '' !== $params['query']) {
                     $queryParams = [];
                     parse_str($params['query'], $queryParams);
+                    if (isset($queryParams['charset']) && '' !== $queryParams['charset']) {
+                        $dsn .= 'charset='.$queryParams['charset'].';';
+                    }
+
                     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 (isset($params['path'])) {
+                            $dbName = substr($params['path'], 1); // Remove the leading slash
+                            $dsn .= 'dbname='.$dbName.';';
+                         }
+
+                         return $dsn;
                     }
                 }
+            // If "unix_socket" is not in the query, we continue with the same process as pgsql
+            case 'pgsql':
+                $dsn = $dsn ?? 'pgsql:';
 
-                if (!$hasSocket && isset($params['host']) && '' !== $params['host']) {
+                if (isset($params['host']) && '' !== $params['host']) {
                     $dsn .= 'host='.$params['host'].';';
                 }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -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:unix_socket=socket.sock;charset=utf8mb4;dbname=test;'];
+        yield ['mysql://localhost/test?unix_socket=socket.sock&charset=utf8mb4', 'mysql:charset=utf8mb4;unix_socket=socket.sock;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;'];

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPa`
`332`	`332`	`public function provideUrlDsnPairs()`
`333`	`333`	`{`
`334`	`334`	`yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];`
`335`		`- yield ['mysql://localhost/test?unix_socket=socket.sock&charset=utf8mb4', 'mysql:unix_socket=socket.sock;charset=utf8mb4;dbname=test;'];`
	`335`	`+ yield ['mysql://localhost/test?unix_socket=socket.sock&charset=utf8mb4', 'mysql:charset=utf8mb4;unix_socket=socket.sock;dbname=test;'];`
`336`	`336`	`yield ['mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;'];`
`337`	`337`	`yield ['mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd'];`
`338`	`338`	`yield ['postgres://localhost/test', 'pgsql:host=localhost;dbname=test;'];`