Skip to content

Commit b7a298b

Browse files
kamil-tekielakamil-tekiela
authored
Deprecate unused mysqli constants (#6850)
Deprecated: MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED MYSQLI_SERVER_QUERY_NO_INDEX_USED MYSQLI_SERVER_QUERY_WAS_SLOW MYSQLI_SERVER_PS_OUT_PARAMS MYSQLI_DATA_TRUNCATED MYSQLI_NO_DATA
1 parent 3a05cda commit b7a298b

File tree

3 files changed

+239
-226
lines changed

3 files changed

+239
-226
lines changed

‎ext/mysqli/mysqli.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -721,9 +721,9 @@ PHP_MINIT_FUNCTION(mysqli)
721721
REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_DIR", MYSQL_SET_CHARSET_DIR, CONST_CS | CONST_PERSISTENT);
722722

723723
/* bind support */
724-
REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT);
724+
REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
725725
#ifdef MYSQL_DATA_TRUNCATED
726-
REGISTER_LONG_CONSTANT("MYSQLI_DATA_TRUNCATED", MYSQL_DATA_TRUNCATED, CONST_CS | CONST_PERSISTENT);
726+
REGISTER_LONG_CONSTANT("MYSQLI_DATA_TRUNCATED", MYSQL_DATA_TRUNCATED, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
727727
#endif
728728

729729
/* reporting */
@@ -744,13 +744,13 @@ PHP_MINIT_FUNCTION(mysqli)
744744
#endif
745745
#endif
746746

747-
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED", SERVER_QUERY_NO_GOOD_INDEX_USED, CONST_CS | CONST_PERSISTENT);
748-
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_INDEX_USED", SERVER_QUERY_NO_INDEX_USED, CONST_CS | CONST_PERSISTENT);
747+
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED", SERVER_QUERY_NO_GOOD_INDEX_USED, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
748+
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_INDEX_USED", SERVER_QUERY_NO_INDEX_USED, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
749749
#ifdef SERVER_QUERY_WAS_SLOW
750-
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_WAS_SLOW", SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT);
750+
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_WAS_SLOW", SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
751751
#endif
752752
#ifdef SERVER_PS_OUT_PARAMS
753-
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PS_OUT_PARAMS", SERVER_PS_OUT_PARAMS, CONST_CS | CONST_PERSISTENT);
753+
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PS_OUT_PARAMS", SERVER_PS_OUT_PARAMS, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
754754
#endif
755755

756756
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_GRANT", REFRESH_GRANT, CONST_CS | CONST_PERSISTENT);

‎ext/mysqli/tests/deprecated_constants.phpt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
--TEST--
2+
Deprecated constants
3+
--SKIPIF--
4+
<?php
5+
require_once 'skipif.inc';
6+
?>
7+
--FILE--
8+
<?php
9+
10+
echo constant('MYSQLI_NO_DATA')."\n";
11+
echo constant('MYSQLI_DATA_TRUNCATED')."\n";
12+
echo constant('MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED')."\n";
13+
echo constant('MYSQLI_SERVER_QUERY_NO_INDEX_USED')."\n";
14+
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
15+
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
16+
17+
?>
18+
--EXPECTF--
19+
20+
Deprecated: Constant MYSQLI_NO_DATA is deprecated in %s
21+
%i
22+
23+
Deprecated: Constant MYSQLI_DATA_TRUNCATED is deprecated in %s
24+
%i
25+
26+
Deprecated: Constant MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED is deprecated in %s
27+
%i
28+
29+
Deprecated: Constant MYSQLI_SERVER_QUERY_NO_INDEX_USED is deprecated in %s
30+
%i
31+
32+
Deprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in %s
33+
%i
34+
35+
Deprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in %s
36+
%i

0 commit comments

Comments
 (0)