From ec0678ee6fdf54b07e65949e63000baabe65b2bc Mon Sep 17 00:00:00 2001
From: Demon <hyh19962008@gmail.com>
Date: Tue, 1 Jul 2025 10:42:55 +0800
Subject: [PATCH 1/2] fixes on mysqli, openssl, readline tests

---
 ext/mysqli/tests/bug77956.phpt                          | 4 ++--
 ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt  | 4 ++--
 ext/openssl/tests/bug70438.phpt                         | 3 ++-
 ext/openssl/tests/bug74402.phpt                         | 3 ++-
 ext/readline/tests/readline_read_history_error_001.phpt | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ext/mysqli/tests/bug77956.phpt b/ext/mysqli/tests/bug77956.phpt
index 28cf694a606a8..1467b1592f05a 100644
--- a/ext/mysqli/tests/bug77956.phpt
+++ b/ext/mysqli/tests/bug77956.phpt
@@ -56,6 +56,6 @@ if (!$link->query('DROP TABLE IF EXISTS test')) {
 $link->close();
 unlink('bug77956.data');
 ?>
---EXPECT--
-[006] [2000] LOAD DATA LOCAL INFILE is forbidden, check related settings like mysqli.allow_local_infile|mysqli.local_infile_directory or PDO::MYSQL_ATTR_LOCAL_INFILE|PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY
+--EXPECTF--
+[006] [%d] LOAD DATA LOCAL INFILE is forbidden, check related settings like mysqli.allow_local_infile|mysqli.local_infile_directory or PDO::MYSQL_ATTR_LOCAL_INFILE|PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY
 done
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index 8ab3443dde142..3157eca7963dd 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -9,13 +9,13 @@ mysqli
     if (!$link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket))
         die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-    if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UTF8'"))
+    if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE '%UTF8%'"))
         die("skip Cannot run SHOW CHARACTER SET to check charsets");
 
     if (!$tmp = mysqli_fetch_assoc($res))
         die("skip Looks like UTF8 is not available on the server");
 
-    if (strtolower($tmp['Charset']) !== 'utf8')
+    if (strtolower($tmp['Charset']) !== 'utf8' && strtolower($tmp['Charset']) !== 'utf8mb3')
         die("skip Not sure if UTF8 is available, canceling the test");
 
     mysqli_free_result($res);
diff --git a/ext/openssl/tests/bug70438.phpt b/ext/openssl/tests/bug70438.phpt
index cda8e2282d345..e16dcf6bb9ec8 100644
--- a/ext/openssl/tests/bug70438.phpt
+++ b/ext/openssl/tests/bug70438.phpt
@@ -4,7 +4,8 @@ Request #70438: Add IV parameter for openssl_seal and openssl_open
 openssl
 --SKIPIF--
 <?php
-if (!in_array('AES-128-CBC', openssl_get_cipher_methods(true))) {
+if (!in_array('AES-128-CBC', openssl_get_cipher_methods(true)) &&
+    !in_array('aes-128-cbc', openssl_get_cipher_methods(true))) {
     print "skip";
 }
 ?>
diff --git a/ext/openssl/tests/bug74402.phpt b/ext/openssl/tests/bug74402.phpt
index 67c248aef5684..69cca757deeef 100644
--- a/ext/openssl/tests/bug74402.phpt
+++ b/ext/openssl/tests/bug74402.phpt
@@ -4,7 +4,8 @@ Bug #74402 (segfault on random_bytes, bin3hex, openssl_seal)
 openssl
 --SKIPIF--
 <?php
-if (!in_array('AES256', openssl_get_cipher_methods(true))) print "skip";
+if (!in_array('AES256', openssl_get_cipher_methods(true)) && 
+    !in_array('aes256', openssl_get_cipher_methods(true))) print "skip";
 ?>
 --FILE--
 <?php
diff --git a/ext/readline/tests/readline_read_history_error_001.phpt b/ext/readline/tests/readline_read_history_error_001.phpt
index bdd05d27f8807..437d7a868cfbf 100644
--- a/ext/readline/tests/readline_read_history_error_001.phpt
+++ b/ext/readline/tests/readline_read_history_error_001.phpt
@@ -5,7 +5,7 @@ Pedro Manoel Evangelista <pedro.evangelista at gmail dot com>
 --EXTENSIONS--
 readline
 --SKIPIF--
-<?php if (!READLINE_LIB != "libedit") die('skip READLINE_LIB != "libedit"'); ?>
+<?php if (READLINE_LIB != "libedit") die('skip READLINE_LIB != "libedit"'); ?>
 --FILE--
 <?php
 var_dump(readline_read_history('nofile'));

From 26f2cfd38aa580c8a47bfb17818683e0749c673f Mon Sep 17 00:00:00 2001
From: Demon <hyh19962008@gmail.com>
Date: Wed, 2 Jul 2025 10:20:07 +0800
Subject: [PATCH 2/2] update
 ext\mysqli\tests\mysqli_fetch_assoc_no_alias_utf8.phpt

---
 ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index 3157eca7963dd..3ef901f44605e 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -9,7 +9,7 @@ mysqli
     if (!$link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket))
         die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-    if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE '%UTF8%'"))
+    if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UTF8%'"))
         die("skip Cannot run SHOW CHARACTER SET to check charsets");
 
     if (!$tmp = mysqli_fetch_assoc($res))