From 141d8acf9654d7ce18cb6cad976cee768fe3e5fb Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Sun, 15 Oct 2023 21:08:26 +0100
Subject: [PATCH 1/2] Fix 12424 PDO_PGSQL unit test unexistent variables

---
 ext/pdo_pgsql/tests/gh12423.phpt | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ext/pdo_pgsql/tests/gh12423.phpt b/ext/pdo_pgsql/tests/gh12423.phpt
index 2f585cb58b4b6..69313ed1dd9e4 100644
--- a/ext/pdo_pgsql/tests/gh12423.phpt
+++ b/ext/pdo_pgsql/tests/gh12423.phpt
@@ -9,16 +9,8 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-require __DIR__ . '/config.inc';
-
-[
-    'ENV' => [
-        'PDOTEST_DSN' => $dsnWithCredentials,
-        'PDOTEST_USER' => $user,
-        'PDOTEST_PASS' => $password,
-    ],
-] = __DIR__ . '/common.phpt';
-
+$user = $password = "postgres";
+$dsnWithCredentials = "pgsql:host=localhost port=5432 dbname=test user={$user} password={$password}";
 $dsn = str_replace(" user={$user} password={$password}", '', $dsnWithCredentials);
 
 echo "dsn without credentials / correct user / correct password\n";

From 6b9396b869ea31f6f3bead9df9f7d5ef7780663a Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Mon, 16 Oct 2023 07:03:12 +0100
Subject: [PATCH 2/2] Update ext/pdo_pgsql/tests/gh12423.phpt

Co-authored-by: Saki Takamachi <34942839+SakiTakamachi@users.noreply.github.com>
---
 ext/pdo_pgsql/tests/gh12423.phpt | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ext/pdo_pgsql/tests/gh12423.phpt b/ext/pdo_pgsql/tests/gh12423.phpt
index 69313ed1dd9e4..11d299af51f51 100644
--- a/ext/pdo_pgsql/tests/gh12423.phpt
+++ b/ext/pdo_pgsql/tests/gh12423.phpt
@@ -9,8 +9,19 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-$user = $password = "postgres";
-$dsnWithCredentials = "pgsql:host=localhost port=5432 dbname=test user={$user} password={$password}";
+require __DIR__ . '/config.inc';
+
+$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] ?? '';
+}
+if (!$password) {
+    preg_match('/password=(.*?) /', $dsnWithCredentials, $match);
+    $password = $match[1] ?? '';
+}
 $dsn = str_replace(" user={$user} password={$password}", '', $dsnWithCredentials);
 
 echo "dsn without credentials / correct user / correct password\n";