archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Deprecate MYSQLI_IS_MARIADB

Browse source 
Closes GH-8919
This commit is contained in:
Kamil Tekiela 2022-07-04 11:41:49 +01:00
parent 922371f3b1
commit 5a69cb6fa1
No known key found for this signature in database
GPG key ID: 0760BDAB1E89A1E3
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
UPGRADING
View file

@ -239,6 +239,7 @@ PHP 8.2 UPGRADE NOTES
mysqli with libmysql and all relevant functionality has been removed. mysqli with libmysql and all relevant functionality has been removed.
. The reconnect property of mysqli_driver has been removed. It was supported only by libmysql. . The reconnect property of mysqli_driver has been removed. It was supported only by libmysql.
. The INI directive mysqli.reconnect has been removed. . The INI directive mysqli.reconnect has been removed.
. The constant MYSQLI_IS_MARIADB has been deprecated.
- OCI8: - OCI8:
. The minimum Oracle Client library version required is now 11.2. . The minimum Oracle Client library version required is now 11.2.

5
ext/mysqli/mysqli.stub.php
View file

@ -610,7 +610,10 @@ const MYSQLI_TRANS_COR_RELEASE = UNKNOWN;
*/ */
const MYSQLI_TRANS_COR_NO_RELEASE = UNKNOWN; const MYSQLI_TRANS_COR_NO_RELEASE = UNKNOWN;
/** @var bool */ /**
* @var bool
* @deprecated
*/
const MYSQLI_IS_MARIADB = false; const MYSQLI_IS_MARIADB = false;
final class mysqli_driver final class mysqli_driver

4
ext/mysqli/mysqli_arginfo.h generated
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* 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_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) 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_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_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_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); 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);

3
ext/mysqli/tests/deprecated_constants.phpt
View file

@ -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_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"); print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
} }
echo constant('MYSQLI_IS_MARIADB')."\n";
?> ?>
--EXPECTF-- --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 Deprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in %s
%i %i
Deprecated: Constant MYSQLI_IS_MARIADB is deprecated in %s

5
ext/mysqli/tests/mysqli_constants.phpt
View file

@ -47,6 +47,7 @@ $expected_constants = array(
"MYSQLI_GROUP_FLAG" => true, "MYSQLI_GROUP_FLAG" => true,
"MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED"=> true, "MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED"=> true,
"MYSQLI_SERVER_QUERY_NO_INDEX_USED" => true, "MYSQLI_SERVER_QUERY_NO_INDEX_USED" => true,
"MYSQLI_OPT_LOAD_DATA_LOCAL_DIR" => true,
"MYSQLI_IS_MARIADB" => true, "MYSQLI_IS_MARIADB" => true,
"MYSQLI_TYPE_DECIMAL" => true, "MYSQLI_TYPE_DECIMAL" => true,
@ -181,10 +182,6 @@ if ($IS_MYSQLND) {
$expected_constants["MYSQLI_TYPE_JSON"] = true; $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(); $unexpected_constants = array();
foreach ($constants as $group => $consts) { foreach ($constants as $group => $consts) {