From 7a82d82d65168fee6d4bdc2594591d61d693e0a1 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 17 Aug 2024 18:24:29 +0200
Subject: [PATCH 1/3] Avoid multiple connects in SKIPIF sections

Besides checking for the ability to connect to the MySQL server, some
tests require additional checks (e.g. to be able to check for the
server's version) as skip condition.  There is no need, though, to
connect twice; instead we introduce `mysqli_connect_or_skip()` in
test_helpers.inc, which `die()`s with an appropriate error message, if
the connection can't be established, or returns the connection link
otherwise.
---
 ext/mysqli/tests/045.phpt                              |  6 ++----
 ext/mysqli/tests/gh9590.phpt                           |  7 ++-----
 ext/mysqli/tests/mysqli_begin_transaction.phpt         |  8 ++------
 ext/mysqli/tests/mysqli_change_user_old.phpt           |  8 ++------
 ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt           |  5 ++---
 ext/mysqli/tests/mysqli_query_unicode.phpt             |  6 ++----
 ext/mysqli/tests/mysqli_real_escape_string_big5.phpt   | 10 ++--------
 .../tests/mysqli_real_escape_string_eucjpms.phpt       | 10 ++--------
 ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt  | 10 ++--------
 ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt | 10 ++--------
 ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt    | 10 ++--------
 ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt   |  9 ++-------
 ext/mysqli/tests/test_setup/test_helpers.inc           |  4 ++++
 13 files changed, 28 insertions(+), 75 deletions(-)

diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index ec70cb9877fbf..8284812a7991f 100644
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -4,10 +4,8 @@ mysqli_stmt_bind_result (SHOW)
 mysqli
 --SKIPIF--
 <?php
-    require_once 'skipifconnectfailure.inc';
-
-    $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-
+    require_once __DIR__ . '/test_setup/test_helpers.inc';
+    $link = mysqli_connect_or_skip();
     $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
     mysqli_stmt_execute($stmt);
 
diff --git a/ext/mysqli/tests/gh9590.phpt b/ext/mysqli/tests/gh9590.phpt
index df373f7d3b319..7f795e774229d 100644
--- a/ext/mysqli/tests/gh9590.phpt
+++ b/ext/mysqli/tests/gh9590.phpt
@@ -5,11 +5,8 @@ mysqli
 posix
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-    die("skip cannot connect");
-
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (mysqli_get_server_version($link) < 50012)
     die("skip Test needs SQL function SLEEP() available as of MySQL 5.0.12");
 
diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index 5dbd9dbc49548..87663ec211d0a 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -4,12 +4,8 @@ mysqli_begin_transaction()
 mysqli
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-
-require_once 'connect.inc';
-if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
-
+require_once __DIR__ . '/test_setup/test_helpers.inc';;
+$link = mysqli_connect_or_skip();
 if (!have_innodb($link))
     die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt
index fd418220ae80d..980bc533c4c06 100644
--- a/ext/mysqli/tests/mysqli_change_user_old.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_old.phpt
@@ -4,12 +4,8 @@ mysqli_change_user(), MySQL < 5.6
 mysqli
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-        $host, $user, $db, $port, $socket));
-
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (mysqli_get_server_version($link) >= 50600 && mysqli_get_server_version($link) < 10_00_00)
     die("SKIP For MySQL < 5.6.0");
 ?>
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
index 9f3197b903c4b..ff1cbb7a5bc90 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
@@ -4,9 +4,8 @@ mysqli_fetch_assoc() - BIT
 mysqli
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-
-require_once 'table.inc';
+require_once __DIR__ . '/test_setup/test_helpers.inc';;
+$link = mysqli_connect_or_skip();
 if (mysqli_get_server_version($link) < 50003)
     // b'001' syntax not supported before 5.0.3
     die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index 0e4a1095cf8dc..1d2286115aa9d 100644
--- a/ext/mysqli/tests/mysqli_query_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_query_unicode.phpt
@@ -4,12 +4,10 @@ mysqli_query() - unicode (cyrillic)
 mysqli
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-require_once 'table.inc';
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'utf8'"))
     die("skip UTF8 chatset seems not available");
-mysqli_free_result($res);
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
index eb6ee00835cda..d5e17d26899bb 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
@@ -4,16 +4,10 @@ mysqli_real_escape_string() - big5
 mysqli
 --SKIPIF--
 <?php
-
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-        mysqli_connect_errno(), mysqli_connect_error()));
-}
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!mysqli_set_charset($link, 'big5'))
     die(sprintf("skip Cannot set charset 'big5'"));
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
index 7d0ad9f476602..a075d3e8fde2d 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
@@ -4,16 +4,10 @@ mysqli_real_escape_string() - eucjpms
 mysqli
 --SKIPIF--
 <?php
-
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-        mysqli_connect_errno(), mysqli_connect_error()));
-}
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!mysqli_set_charset($link, 'eucjpms'))
     die(sprintf("skip Cannot set charset 'eucjpms'"));
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
index 7ce40e7863a42..b18d26a2224b8 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
@@ -4,16 +4,10 @@ mysqli_real_escape_string() - euckr
 mysqli
 --SKIPIF--
 <?php
-
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-        mysqli_connect_errno(), mysqli_connect_error()));
-}
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!mysqli_set_charset($link, 'euckr'))
     die(sprintf("skip Cannot set charset 'euckr'"));
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
index 3fc6225cdc2f1..96ce54dfcd65f 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
@@ -4,16 +4,10 @@ mysqli_real_escape_string() - gb2312
 mysqli
 --SKIPIF--
 <?php
-
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-        mysqli_connect_errno(), mysqli_connect_error()));
-}
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!mysqli_set_charset($link, 'gb2312'))
     die(sprintf("skip Cannot set charset 'gb2312'"));
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
index 1a8d78276d97c..aad4e6140a498 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
@@ -4,16 +4,10 @@ mysqli_real_escape_string() - gbk
 mysqli
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-        mysqli_connect_errno(), mysqli_connect_error()));
-}
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!mysqli_set_charset($link, 'gbk'))
     die(sprintf("skip Cannot set charset 'gbk'"));
-
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
index 4c829d08d7af3..4b4e2f8f934b8 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
@@ -4,15 +4,10 @@ mysqli_real_escape_string() - sjis
 mysqli
 --SKIPIF--
 <?php
-require_once 'skipifconnectfailure.inc';
-
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-        mysqli_connect_errno(), mysqli_connect_error()));
-}
+require_once __DIR__ . '/test_setup/test_helpers.inc';
+$link = mysqli_connect_or_skip();
 if (!mysqli_set_charset($link, 'sjis'))
     die(sprintf("skip Cannot set charset 'sjis'"));
-mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/test_setup/test_helpers.inc b/ext/mysqli/tests/test_setup/test_helpers.inc
index 5e6833a3253b9..fdafc36d19dcb 100644
--- a/ext/mysqli/tests/test_setup/test_helpers.inc
+++ b/ext/mysqli/tests/test_setup/test_helpers.inc
@@ -108,11 +108,15 @@ function default_mysqli_connect(): \mysqli{
     );
 }
 function mysqli_check_skip_test(): void {
+    mysqli_connect_or_skip();
+}
+function mysqli_connect_or_skip() {
     try {
         default_mysqli_connect();
     } catch (\mysqli_sql_exception) {
         die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
     }
+    return $link;
 }
 function have_innodb(mysqli $link): bool {
     $res = $link->query("SELECT SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'InnoDB'");

From 0e334fe1ea12861cddb60161765913517da5e869 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 18 Aug 2024 11:30:39 +0200
Subject: [PATCH 2/3] return or die

Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>
---
 ext/mysqli/tests/test_setup/test_helpers.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/mysqli/tests/test_setup/test_helpers.inc b/ext/mysqli/tests/test_setup/test_helpers.inc
index fdafc36d19dcb..c9ab401e75683 100644
--- a/ext/mysqli/tests/test_setup/test_helpers.inc
+++ b/ext/mysqli/tests/test_setup/test_helpers.inc
@@ -112,11 +112,10 @@ function mysqli_check_skip_test(): void {
 }
 function mysqli_connect_or_skip() {
     try {
-        default_mysqli_connect();
+        return default_mysqli_connect();
     } catch (\mysqli_sql_exception) {
         die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
     }
-    return $link;
 }
 function have_innodb(mysqli $link): bool {
     $res = $link->query("SELECT SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'InnoDB'");

From c8003b4a1331d4c7186dd7143042eff20ff23b2a Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 18 Aug 2024 11:32:25 +0200
Subject: [PATCH 3/3] Remove broken, but unnecessary UTF-8 support check

---
 ext/mysqli/tests/mysqli_query_unicode.phpt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index 1d2286115aa9d..6f01aff57084f 100644
--- a/ext/mysqli/tests/mysqli_query_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_query_unicode.phpt
@@ -4,10 +4,7 @@ mysqli_query() - unicode (cyrillic)
 mysqli
 --SKIPIF--
 <?php
-require_once __DIR__ . '/test_setup/test_helpers.inc';
-$link = mysqli_connect_or_skip();
-if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'utf8'"))
-    die("skip UTF8 chatset seems not available");
+require_once 'skipifconnectfailure.inc';
 ?>
 --FILE--
 <?php