From a3e9e052751c608d22d070024c56deb97fc00255 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 4 Jul 2022 11:41:49 +0100
Subject: [PATCH] Deprecate MYSQLI_IS_MARIADB

---
 ext/mysqli/mysqli.stub.php                 | 5 ++++-
 ext/mysqli/mysqli_arginfo.h                | 4 ++--
 ext/mysqli/tests/deprecated_constants.phpt | 3 +++
 ext/mysqli/tests/mysqli_constants.phpt     | 5 +----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index 5c6128deccbd8..e1e5d0b0c5a2c 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -610,7 +610,10 @@
  */
 const MYSQLI_TRANS_COR_NO_RELEASE = UNKNOWN;
 
-/** @var bool */
+/**
+ * @var bool
+ * @deprecated
+ */
 const MYSQLI_IS_MARIADB = false;
 
 final class mysqli_driver
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index 30f03aaa8cb22..4b23cac940b27 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ff2b7cd8ab89ecd882e42d3de36429418876dba8 */
+ * Stub hash: 72c98f6b54fbf42adab5a57dc0922d4a1649eed1 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -1172,7 +1172,7 @@ static void register_mysqli_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_AND_NO_CHAIN", TRANS_COR_AND_NO_CHAIN, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_RELEASE", TRANS_COR_RELEASE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_NO_RELEASE", TRANS_COR_NO_RELEASE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_BOOL_CONSTANT("MYSQLI_IS_MARIADB", false, CONST_CS | CONST_PERSISTENT);
+	REGISTER_BOOL_CONSTANT("MYSQLI_IS_MARIADB", false, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
 
 
 	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "mysqli_change_user", sizeof("mysqli_change_user") - 1), 2, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
diff --git a/ext/mysqli/tests/deprecated_constants.phpt b/ext/mysqli/tests/deprecated_constants.phpt
index ead02188ca023..81c5f3982f0c2 100644
--- a/ext/mysqli/tests/deprecated_constants.phpt
+++ b/ext/mysqli/tests/deprecated_constants.phpt
@@ -16,6 +16,7 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
     print("\nDeprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in dummy\n-1\n");
     print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
 }
+echo constant('MYSQLI_IS_MARIADB')."\n";
 
 ?>
 --EXPECTF--
@@ -37,3 +38,5 @@ Deprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in %s
 
 Deprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in %s
 %i
+
+Deprecated: Constant MYSQLI_IS_MARIADB is deprecated in %s
diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 0380792e06284..444493fae5895 100644
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -47,6 +47,7 @@ $expected_constants = array(
     "MYSQLI_GROUP_FLAG" 				=> true,
     "MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED"=> true,
     "MYSQLI_SERVER_QUERY_NO_INDEX_USED"	=> true,
+    "MYSQLI_OPT_LOAD_DATA_LOCAL_DIR"    => true,
     "MYSQLI_IS_MARIADB"                 => true,
 
     "MYSQLI_TYPE_DECIMAL"				=> true,
@@ -181,10 +182,6 @@ if ($IS_MYSQLND) {
     $expected_constants["MYSQLI_TYPE_JSON"]	= true;
 }
 
-if (($version > 80021 && $constants['mysqli']['MYSQLI_IS_MARIADB']) || $IS_MYSQLND) {
-    $expected_constants['MYSQLI_OPT_LOAD_DATA_LOCAL_DIR'] = true;
-}
-
 $unexpected_constants = array();
 
 foreach ($constants as $group => $consts) {