Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4: Fix failing PDO PgSQL test
php · Oct 7, 2021 · 56c9ea1 · 56c9ea1
2 parents 7426b22 + c0cbf3a
commit 56c9ea1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -45,7 +45,7 @@ else
 # Expected to fail; unless told otherwise, PDO assumes string inputs
 # false -> "" as string, which pgsql doesn't like
 if (!$res->execute(array(false)))
-    print_r($res->errorInfo());
+    print_r(normalizeErrorInfo($res->errorInfo()));
 else
     print_r($res->fetchAll(PDO::FETCH_ASSOC));
 
@@ -81,13 +81,17 @@ else
 # Expected to fail; unless told otherwise, PDO assumes string inputs
 # false -> "" as string, which pgsql doesn't like
 if (!$res->execute(array(false))) {
-    $err = $res->errorInfo();
-    // Strip additional lines outputted by recent PgSQL versions
-    $err[2] = trim(current(explode("\n", $err[2])));
-    print_r($err);
+    print_r(normalizeErrorInfo($res->errorInfo()));
 } else {
     print_r($res->fetchAll(PDO::FETCH_ASSOC));
 }
+
+function normalizeErrorInfo(array $err): array {
+    // Strip additional lines outputted by recent PgSQL versions
+    $err[2] = trim(current(explode("\n", $err[2])));
+    return $err;
+}
+
 ?>
 --EXPECTF--
 Array