Skip to content

Commit 7b3d7e9

Browse files
GirgiasGirgias
committed
Split into multiple PRs
1 parent 42ffe5c commit 7b3d7e9

14 files changed

+105
-169
lines changed

‎ext/mysqli/mysqli_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@ PHP_FUNCTION(mysqli_next_result) {
16061606
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
16071607

16081608
if (!mysql_more_results(mysql->mysql)) {
1609-
php_error_docref(NULL, E_NOTICE, "There is no next result set. "
1609+
php_error_docref(NULL, E_STRICT, "There is no next result set. "
16101610
"Please, call mysqli_more_results()/mysqli::more_results() to check "
16111611
"whether to call this function/method");
16121612
}
@@ -1644,7 +1644,7 @@ PHP_FUNCTION(mysqli_stmt_next_result) {
16441644
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
16451645

16461646
if (!mysqlnd_stmt_more_results(stmt->stmt)) {
1647-
php_error_docref(NULL, E_NOTICE, "There is no next result set. "
1647+
php_error_docref(NULL, E_STRICT, "There is no next result set. "
16481648
"Please, call mysqli_stmt_more_results()/mysqli_stmt::more_results() to check "
16491649
"whether to call this function/method");
16501650
}

‎ext/mysqli/tests/bug31668.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Bug #31668 (multi_query works exactly every other time (multi_query was global,
55
require_once('skipif.inc');
66
require_once('skipifconnectfailure.inc');
77
?>
8+
--INI--
9+
error_reporting = E_ALL & ~E_STRICT
810
--FILE--
911
<?php
1012
require_once("connect.inc");
@@ -45,8 +47,6 @@ array(1) {
4547
[2]=>
4648
%s(1) "2"
4749
}
48-
49-
Notice: mysqli::next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %sbug31668.php on line %d
5050
%s(0) ""
5151
int(%d)
5252
array(1) {
@@ -57,7 +57,5 @@ array(1) {
5757
[2]=>
5858
%s(1) "2"
5959
}
60-
61-
Notice: mysqli::next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %sbug31668.php on line %d
6260
%s(0) ""
6361
int(%d)

‎ext/mysqli/tests/mysqli_more_results.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ bool(false)
7474
1
7575
2
7676

77-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
77+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
7878
[010]
7979
1
8080
2
8181

82-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
82+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8383

8484
Warning: mysqli_more_results(): Couldn't fetch mysqli in %s on line %d
8585
bool(false)

‎ext/mysqli/tests/mysqli_multi_query.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ require_once('skipifconnectfailure.inc');
120120
require_once("clean_table.inc");
121121
?>
122122
--EXPECTF--
123-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
123+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
124124
[006] 3
125125
[008] 0
126126
[009] [2014] Commands out of sync; you can't run this command now
127127

128-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
128+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
129129
[010] 7
130130

131131
Warning: mysqli_multi_query(): Couldn't fetch mysqli in %s on line %d

‎ext/mysqli/tests/mysqli_next_result.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ require_once('skipifconnectfailure.inc');
7373
require_once("clean_table.inc");
7474
?>
7575
--EXPECTF--
76-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
76+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
7777

78-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
78+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
7979

80-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
80+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8181

82-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
82+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8383

84-
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
84+
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8585

8686
Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d
8787
bool(false)

‎ext/standard/html.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ PHPAPI zend_string *php_escape_html_entities_ex(unsigned char *old, size_t oldle
11871187

11881188
if (all) { /* replace with all named entities */
11891189
if (CHARSET_PARTIAL_SUPPORT(charset)) {
1190-
php_error_docref(NULL, E_NOTICE, "Only basic entities "
1190+
php_error_docref(NULL, E_STRICT, "Only basic entities "
11911191
"substitution is supported for multi-byte encodings other than UTF-8; "
11921192
"functionality is equivalent to htmlspecialchars");
11931193
}

‎ext/standard/tests/strings/htmlentities04.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ internal_encoding=pass
1717
var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
1818
?>
1919
--EXPECTF--
20-
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
20+
Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
2121
string(6) "¡¢¡£¡¤"

‎ext/standard/tests/strings/htmlentities08.phpt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
htmlentities() test 8 (mbstring / EUC-JP)
33
--INI--
44
output_handler=
5+
error_reporting=~E_STRICT
56
internal_encoding=EUC-JP
67
--SKIPIF--
78
<?php
@@ -12,12 +13,15 @@ internal_encoding=EUC-JP
1213
print mb_internal_encoding()."\n";
1314
var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
1415
?>
15-
--EXPECTF--
16+
--EXPECT--
1617
EUC-JP
18+
<<<<<<< HEAD
1719

1820
<<<<<<< HEAD
1921
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
2022
=======
2123
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
2224
>>>>>>> Remove usage/mentions of E_STRICT in tests.
25+
=======
26+
>>>>>>> Split into multiple PRs
2327
string(6) "¡¢¡£¡¤"

‎ext/standard/tests/strings/htmlentities09.phpt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
htmlentities() test 9 (mbstring / Shift_JIS)
33
--INI--
44
output_handler=
5+
error_reporting=~E_STRICT
56
internal_encoding=Shift_JIS
67
--SKIPIF--
78
<?php
@@ -13,13 +14,16 @@ internal_encoding=Shift_JIS
1314
var_dump(bin2hex(htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, '')));
1415
?>
1516
===DONE===
16-
--EXPECTF--
17+
--EXPECT--
1718
SJIS
19+
<<<<<<< HEAD
1820

1921
<<<<<<< HEAD
2022
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
2123
=======
2224
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
2325
>>>>>>> Remove usage/mentions of E_STRICT in tests.
26+
=======
27+
>>>>>>> Split into multiple PRs
2428
string(12) "814181428143"
2529
===DONE===

‎ext/standard/tests/strings/htmlentities13.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ filter.default=unsafe_raw
1313
--EXPECTF--
1414
EUC-JP
1515

16-
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
16+
Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
1717
string(6) "¡¢¡£¡¤"

‎ext/standard/tests/strings/htmlentities14.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ filter.default=unsafe_raw
1313
--EXPECTF--
1414
Shift_JIS
1515

16-
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
16+
Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
1717
string(6) "ABC"

0 commit comments

Comments
 (0)