Optimized pdo_pgsql connection test

Author: SakiTakamachi

ext/pdo_pgsql/tests/gh12423.phpt

@@ -1,8 +1,10 @@
 --TEST--
 GitHub #12424 (Fix GH-12423: [pdo_pgsql] Changed to prioritize DSN authentication information over arguments.)
+--EXTENSIONS--
+pdo
+pdo_pgsql
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
 require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
 require __DIR__ . '/config.inc';
 PDOTest::skip();
@@ -15,14 +17,16 @@ $dsnWithCredentials = $config['ENV']['PDOTEST_DSN'];
 $user = $config['ENV']['PDOTEST_USER'] ?? null;
 $password = $config['ENV']['PDOTEST_PASS'] ?? null;
 if (!$user) {
-    preg_match('/user=(.*?) /', $dsnWithCredentials, $match);
-    $user = $match[1] ?? '';
+    preg_match('/user=([^ ]*?) /', $dsnWithCredentials, $match);
+    $user = $match[1] ?? null;
 }
 if (!$password) {
-    preg_match('/password=(.*?) /', $dsnWithCredentials, $match);
-    $password = $match[1] ?? '';
+    preg_match('/password=([^ ]*?)/', $dsnWithCredentials, $match);
+    $password = $match[1] ?? null;
 }
-$dsn = str_replace(" user={$user} password={$password}", '', $dsnWithCredentials);
+$dsn = str_replace("user={$user}", '', $dsnWithCredentials);
+$dsn = str_replace("password={$password}", '', $dsn);
+$dsn = rtrim($dsn);
 
 echo "dsn without credentials / correct user / correct password\n";
 try {