Skip to content

Commit 89e35ad

Browse files
committed
Use "must not" instead of "cannot" wording
1 parent 314410f commit 89e35ad

File tree

118 files changed

+171
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+171
-171
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Property hook list cannot be empty
2+
Property hook list must not be empty
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class Test {
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Property hook list cannot be empty in %s on line %d
12+
Fatal error: Property hook list must not be empty in %s on line %d

Zend/zend_API.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ ZEND_API ZEND_COLD void zend_argument_cannot_be_empty_error(uint32_t arg_num) /*
449449
const char *arg_name = get_active_function_arg_name(arg_num);
450450
ZEND_ASSERT(arg_name && "arg_num must refer to an actual argument");
451451

452-
zend_throw_error(zend_ce_value_error, "%s(): Argument #%d ($%s) cannot be empty",
452+
zend_throw_error(zend_ce_value_error, "%s(): Argument #%d ($%s) must not be empty",
453453
ZSTR_VAL(func_name), arg_num,
454454
arg_name
455455
);

Zend/zend_compile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8383,7 +8383,7 @@ static void zend_compile_property_hooks(
83838383
zend_class_entry *ce = CG(active_class_entry);
83848384

83858385
if (hooks->children == 0) {
8386-
zend_error_noreturn(E_COMPILE_ERROR, "Property hook list cannot be empty");
8386+
zend_error_noreturn(E_COMPILE_ERROR, "Property hook list must not be empty");
83878387
}
83888388

83898389
for (uint32_t i = 0; i < hooks->children; i++) {

ext/bz2/tests/001.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ var_dump(bzopen($fp, "r"));
4242

4343
?>
4444
--EXPECTF--
45-
bzopen(): Argument #1 ($file) cannot be empty
46-
bzopen(): Argument #1 ($file) cannot be empty
45+
bzopen(): Argument #1 ($file) must not be empty
46+
bzopen(): Argument #1 ($file) must not be empty
4747
bzopen(): Argument #2 ($mode) must be either "r" or "w"
4848
bzopen(): Argument #2 ($mode) must be either "r" or "w"
4949
bzopen(): Argument #2 ($mode) must be either "r" or "w"

ext/dba/tests/value_errors_open.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ object(Dba\Connection)#%d (%d) {
121121

122122
Warning: dba_open(): Handler "bogus" is not available in %s on line %d
123123
bool(false)
124-
dba_open(): Argument #1 ($path) cannot be empty
125-
dba_open(): Argument #2 ($mode) cannot be empty
126-
dba_open(): Argument #3 ($handler) cannot be empty
124+
dba_open(): Argument #1 ($path) must not be empty
125+
dba_open(): Argument #2 ($mode) must not be empty
126+
dba_open(): Argument #3 ($handler) must not be empty
127127
dba_open(): Argument #2 ($mode) first character must be one of "r", "w", "c", or "n"
128128
dba_open(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
129129
dba_open(): Argument #2 ($mode) third character must be "t"
@@ -133,9 +133,9 @@ dba_open(): Argument #5 ($map_size) must be greater than or equal to 0
133133

134134
Warning: dba_popen(): Handler "bogus" is not available in %s on line %d
135135
bool(false)
136-
dba_popen(): Argument #1 ($path) cannot be empty
137-
dba_popen(): Argument #2 ($mode) cannot be empty
138-
dba_popen(): Argument #3 ($handler) cannot be empty
136+
dba_popen(): Argument #1 ($path) must not be empty
137+
dba_popen(): Argument #2 ($mode) must not be empty
138+
dba_popen(): Argument #3 ($handler) must not be empty
139139
dba_popen(): Argument #2 ($mode) first character must be one of "r", "w", "c", or "n"
140140
dba_popen(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
141141
dba_popen(): Argument #2 ($mode) third character must be "t"

ext/dom/tests/DOMDocument_loadHTML_error2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ try {
1414
}
1515
?>
1616
--EXPECT--
17-
DOMDocument::loadHTML(): Argument #1 ($source) cannot be empty
17+
DOMDocument::loadHTML(): Argument #1 ($source) must not be empty

ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ try {
2323
}
2424
?>
2525
--EXPECT--
26-
DOMDocument::loadHTMLFile(): Argument #1 ($filename) cannot be empty
26+
DOMDocument::loadHTMLFile(): Argument #1 ($filename) must not be empty
2727
DOMDocument::loadHTMLFile(): Argument #1 ($filename) must not contain any null bytes

ext/dom/tests/DOMDocument_loadXML_error6.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313
}
1414
?>
1515
--EXPECT--
16-
DOMDocument::loadXML(): Argument #1 ($source) cannot be empty
16+
DOMDocument::loadXML(): Argument #1 ($source) must not be empty

ext/dom/tests/DOMDocument_load_error6.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ try {
2222
var_dump($dom->load(str_repeat(" ", PHP_MAXPATHLEN + 1)));
2323
?>
2424
--EXPECT--
25-
DOMDocument::load(): Argument #1 ($filename) cannot be empty
25+
DOMDocument::load(): Argument #1 ($filename) must not be empty
2626
DOMDocument::load(): Argument #1 ($filename) must not contain any null bytes
2727
bool(false)

ext/dom/tests/DOMDocument_saveHTMLFile_invalid_filename.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ try {
2424
}
2525
?>
2626
--EXPECT--
27-
DOMDocument::saveHTMLFile(): Argument #1 ($filename) cannot be empty
27+
DOMDocument::saveHTMLFile(): Argument #1 ($filename) must not be empty

ext/dom/tests/DOMDocument_schemaValidateSource_error3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ try {
2020

2121
?>
2222
--EXPECT--
23-
DOMDocument::schemaValidateSource(): Argument #1 ($source) cannot be empty
23+
DOMDocument::schemaValidateSource(): Argument #1 ($source) must not be empty

ext/dom/tests/DOMDocument_schemaValidate_error3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ try {
2020

2121
?>
2222
--EXPECT--
23-
DOMDocument::schemaValidate(): Argument #1 ($filename) cannot be empty
23+
DOMDocument::schemaValidate(): Argument #1 ($filename) must not be empty

ext/dom/tests/modern/html/interactions/HTMLDocument_saveHTMLFile_empty_path.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $dom->saveHtmlFile("");
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Uncaught ValueError: Dom\HTMLDocument::saveHtmlFile(): Argument #1 ($filename) cannot be empty in %s:%d
14+
Fatal error: Uncaught ValueError: Dom\HTMLDocument::saveHtmlFile(): Argument #1 ($filename) must not be empty in %s:%d
1515
Stack trace:
1616
#0 %s(%d): Dom\HTMLDocument->saveHtmlFile('')
1717
#1 {main}

ext/dom/tests/modern/html/parser/HTMLDocument_fromFile_empty_path.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $dom = Dom\HTMLDocument::createFromFile("");
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Uncaught ValueError: Path cannot be empty in %s:%d
12+
Fatal error: Uncaught ValueError: Path must not be empty in %s:%d
1313
Stack trace:
1414
#0 %s(%d): Dom\HTMLDocument::createFromFile('')
1515
#1 {main}

ext/enchant/tests/broker_request_dict_error_on_empty_tag.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ try {
1818

1919
?>
2020
--EXPECT--
21-
enchant_broker_request_dict(): Argument #2 ($tag) cannot be empty
21+
enchant_broker_request_dict(): Argument #2 ($tag) must not be empty

ext/exif/tests/filename_empty.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ try {
3131

3232
?>
3333
--EXPECT--
34-
exif_read_data(): Argument #1 ($file) cannot be empty
35-
exif_thumbnail(): Argument #1 ($file) cannot be empty
34+
exif_read_data(): Argument #1 ($file) must not be empty
35+
exif_thumbnail(): Argument #1 ($file) must not be empty
3636
exif_read_data(): Argument #1 ($file) must not contain any null bytes
3737
exif_thumbnail(): Argument #1 ($file) must not contain any null bytes

ext/fileinfo/tests/finfo_file_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var_dump(finfo_file($fp, '&'));
2222
?>
2323
--EXPECTF--
2424
finfo_file(): Argument #1 ($finfo) must not contain any null bytes
25-
finfo_file(): Argument #1 ($finfo) cannot be empty
25+
finfo_file(): Argument #1 ($finfo) must not be empty
2626
string(9) "directory"
2727

2828
Warning: finfo_file(&): Failed to open stream: No such file or directory in %s on line %d

ext/fileinfo/tests/mime_content_type_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ mime_content_type(): Argument #1 ($filename) must be of type resource|string, st
4747
mime_content_type(): Argument #1 ($filename) must be of type resource|string, array given
4848

4949
Warning: mime_content_type(foo/inexistent): Failed to open stream: No such file or directory in %s on line %d
50-
mime_content_type(): Argument #1 ($filename) cannot be empty
50+
mime_content_type(): Argument #1 ($filename) must not be empty
5151
mime_content_type(): Argument #1 ($filename) must not contain any null bytes

ext/filter/logical_filters.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
382382

383383
if (thousand_set) {
384384
if (thousand_len < 1) {
385-
zend_value_error("%s(): \"thousand\" option cannot be empty", get_active_function_name());
385+
zend_value_error("%s(): \"thousand\" option must not be empty", get_active_function_name());
386386
RETURN_VALIDATION_FAILED
387387
} else {
388388
tsd_sep = thousand;

ext/filter/tests/bug51368.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ try {
2121
--EXPECT--
2222
float(1000)
2323
float(1234.567)
24-
filter_var(): "thousand" option cannot be empty
24+
filter_var(): "thousand" option must not be empty

ext/gd/tests/bug72709.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ imagedestroy($im);
1818
?>
1919
====DONE====
2020
--EXPECT--
21-
imagesetstyle(): Argument #2 ($style) cannot be empty
21+
imagesetstyle(): Argument #2 ($style) must not be empty
2222
====DONE====

ext/gettext/tests/dcngettext.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ string(1) "1"
3333
string(4) "test"
3434
string(4) "test"
3535
string(4) "test"
36-
dcngettext(): Argument #1 ($domain) cannot be empty
37-
dcngettext(): Argument #1 ($domain) cannot be empty
36+
dcngettext(): Argument #1 ($domain) must not be empty
37+
dcngettext(): Argument #1 ($domain) must not be empty
3838
Done

ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ gettext
2020
echo "Done\n";
2121
?>
2222
--EXPECT--
23-
bind_textdomain_codeset(): Argument #1 ($domain) cannot be empty
24-
bind_textdomain_codeset(): Argument #1 ($domain) cannot be empty
23+
bind_textdomain_codeset(): Argument #1 ($domain) must not be empty
24+
bind_textdomain_codeset(): Argument #1 ($domain) must not be empty
2525
string(5) "UTF-8"
2626
Done
2727
--CREDITS--

ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ try {
1515

1616
?>
1717
--EXPECT--
18-
bindtextdomain(): Argument #1 ($domain) cannot be empty
18+
bindtextdomain(): Argument #1 ($domain) must not be empty
1919
--CREDITS--
2020
Till Klampaeckel, till@php.net
2121
PHP Testfest Berlin 2009-05-09

ext/gettext/tests/gettext_textdomain-retval.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test
3636
test
3737
foo
3838
textdomain(): Argument #1 ($domain) cannot be zero
39-
textdomain(): Argument #1 ($domain) cannot be empty
39+
textdomain(): Argument #1 ($domain) must not be empty
4040
--CREDITS--
4141
Christian Weiske, cweiske@php.net
4242
PHP Testfest Berlin 2009-05-09

ext/hash/hash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ PHP_FUNCTION(hash_init)
635635
}
636636
if (!key || (ZSTR_LEN(key) == 0)) {
637637
/* Note: a zero length key is no key at all */
638-
zend_argument_value_error(3, "cannot be empty when HMAC is requested");
638+
zend_argument_value_error(3, "must not be empty when HMAC is requested");
639639
RETURN_THROWS();
640640
}
641641
}

ext/hash/tests/hash_hkdf_error.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ trycatch_dump(
6161
[ValueError] hash_hkdf(): Argument #1 ($algo) must be a valid cryptographic hashing algorithm
6262

6363
-- Testing hash_hkdf() function with invalid parameters --
64-
[ValueError] hash_hkdf(): Argument #2 ($key) cannot be empty
64+
[ValueError] hash_hkdf(): Argument #2 ($key) must not be empty
6565
[ValueError] hash_hkdf(): Argument #3 ($length) must be greater than or equal to 0
6666
[ValueError] hash_hkdf(): Argument #3 ($length) must be less than or equal to 5100

ext/hash/tests/hash_init_error.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ hash_init(): Argument #1 ($algo) must be a valid hashing algorithm
4747
hash_init(): Argument #1 ($algo) must be a cryptographic hashing algorithm if HMAC is requested
4848

4949
-- Testing hash_init() function with HASH_HMAC and no key --
50-
hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested
50+
hash_init(): Argument #3 ($key) must not be empty when HMAC is requested
5151

5252
Deprecated: hash_init(): Passing null to parameter #3 ($key) of type string is deprecated in %s on line %d
53-
hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested
53+
hash_init(): Argument #3 ($key) must not be empty when HMAC is requested

ext/intl/resourcebundle/resourcebundle_class.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static zval *resource_bundle_array_fetch(
188188
if (offset_arg_num) {
189189
zend_argument_cannot_be_empty_error(offset_arg_num);
190190
} else {
191-
zend_value_error("Offset cannot be empty");
191+
zend_value_error("Offset must not be empty");
192192
}
193193
return NULL;
194194
}

ext/intl/tests/idn_uts46_errors.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var_dump($foo["errors"]==IDNA_ERROR_CONTEXTJ);
4848
bad variant:
4949
ValueError: idn_to_ascii(): Argument #2 ($flags) must be INTL_IDNA_VARIANT_UTS46
5050
empty domain:
51-
ValueError: idn_to_ascii(): Argument #1 ($domain) cannot be empty
51+
ValueError: idn_to_ascii(): Argument #1 ($domain) must not be empty
5252
with error, but no details arg:
5353
bool(false)
5454
with error, with details arg:

ext/intl/tests/resourcebundle_dimension_errors.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ Error: Cannot use object of type ResourceBundle as array
5757
string(7) "default"
5858
TypeError: Cannot access offset of type float on ResourceBundle
5959
TypeError: Cannot access offset of type stdClass on ResourceBundle
60-
ValueError: Offset cannot be empty
60+
ValueError: Offset must not be empty
6161
ValueError: Index must be between -2147483648 and 2147483647

ext/ldap/ldap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2696,7 +2696,7 @@ PHP_FUNCTION(ldap_modify_batch)
26962696
zend_hash_internal_pointer_reset(Z_ARRVAL_P(modinfo));
26972697
num_modvals = zend_hash_num_elements(Z_ARRVAL_P(modinfo));
26982698
if (num_modvals == 0) {
2699-
zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" cannot be empty", get_active_function_name());
2699+
zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must not be empty", get_active_function_name());
27002700
RETURN_THROWS();
27012701
}
27022702

ext/ldap/tests/ldap_search_error.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ bool(false)
5959

6060
Warning: ldap_search(): Array initialization wrong in %s on line %d
6161
bool(false)
62-
ldap_search(): Argument #1 ($ldap) cannot be empty
62+
ldap_search(): Argument #1 ($ldap) must not be empty
6363
ldap_search(): Argument #2 ($base) must have the same number of elements as the links array
6464
ldap_search(): Argument #3 ($filter) must have the same number of elements as the links array
6565
ldap_search(): Argument #2 ($base) must be of type string when argument #1 ($ldap) is an LDAP instance

ext/mbstring/tests/bug43994.phpt

+8-8
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,28 @@ foreach($inputs as $input) {
4343
--EXPECT--
4444
-- Iteration 1 --
4545
Without $regs arg:
46-
mb_ereg(): Argument #1 ($pattern) cannot be empty
46+
mb_ereg(): Argument #1 ($pattern) must not be empty
4747
With $regs arg:
48-
mb_ereg(): Argument #1 ($pattern) cannot be empty
48+
mb_ereg(): Argument #1 ($pattern) must not be empty
4949
NULL
5050

5151
-- Iteration 2 --
5252
Without $regs arg:
53-
mb_ereg(): Argument #1 ($pattern) cannot be empty
53+
mb_ereg(): Argument #1 ($pattern) must not be empty
5454
With $regs arg:
55-
mb_ereg(): Argument #1 ($pattern) cannot be empty
55+
mb_ereg(): Argument #1 ($pattern) must not be empty
5656
NULL
5757

5858
-- Iteration 3 --
5959
Without $regs arg:
60-
mb_ereg(): Argument #1 ($pattern) cannot be empty
60+
mb_ereg(): Argument #1 ($pattern) must not be empty
6161
With $regs arg:
62-
mb_ereg(): Argument #1 ($pattern) cannot be empty
62+
mb_ereg(): Argument #1 ($pattern) must not be empty
6363
NULL
6464

6565
-- Iteration 4 --
6666
Without $regs arg:
67-
mb_ereg(): Argument #1 ($pattern) cannot be empty
67+
mb_ereg(): Argument #1 ($pattern) must not be empty
6868
With $regs arg:
69-
mb_ereg(): Argument #1 ($pattern) cannot be empty
69+
mb_ereg(): Argument #1 ($pattern) must not be empty
7070
NULL

ext/mbstring/tests/empty_pattern.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ try {
2525

2626
?>
2727
--EXPECT--
28-
mb_ereg_search_init(): Argument #2 ($pattern) cannot be empty
28+
mb_ereg_search_init(): Argument #2 ($pattern) must not be empty
2929
No pattern was provided

ext/mbstring/tests/mb_ereg1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ array(3) {
3535
array(0) {
3636
}
3737
}
38-
ValueError: mb_ereg(): Argument #1 ($pattern) cannot be empty
38+
ValueError: mb_ereg(): Argument #1 ($pattern) must not be empty
3939
array(3) {
4040
[0]=>
4141
string(0) ""

ext/mbstring/tests/mb_ord.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ try {
5656
bool(true)
5757
bool(true)
5858
bool(true)
59-
mb_ord(): Argument #1 ($string) cannot be empty
59+
mb_ord(): Argument #1 ($string) must not be empty
6060
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "typo" given
6161
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "pass" given
6262
mb_ord() does not support the "JIS" encoding

ext/mbstring/tests/mb_str_pad.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ foreach ($tests as $encoding => $test) {
8787
?>
8888
--EXPECT--
8989
--- Error conditions ---
90-
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
91-
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
92-
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
90+
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty
91+
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty
92+
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty
9393
ValueError: mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH
9494
ValueError: mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "non-existing" given
9595
--- Simple ASCII strings ---

ext/mbstring/tests/mb_substr_count.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ output_handler=
6969
?>
7070
--EXPECT--
7171
== Empty needle should raise an error ==
72-
mb_substr_count(): Argument #2 ($needle) cannot be empty
73-
mb_substr_count(): Argument #2 ($needle) cannot be empty
74-
mb_substr_count(): Argument #2 ($needle) cannot be empty
72+
mb_substr_count(): Argument #2 ($needle) must not be empty
73+
mb_substr_count(): Argument #2 ($needle) must not be empty
74+
mb_substr_count(): Argument #2 ($needle) must not be empty
7575
== Return value for empty haystack should always be zero ==
7676
int(0)
7777
int(0)

ext/mysqli/tests/mysqli_query.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
114114
mysqli_close($link);
115115
?>
116116
--EXPECTF--
117-
mysqli_query(): Argument #2 ($query) cannot be empty
117+
mysqli_query(): Argument #2 ($query) must not be empty
118118
array(1) {
119119
["valid"]=>
120120
string(30) "this is sql but with semicolon"

ext/mysqli/tests/mysqli_release_savepoint.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if (!have_innodb($link))
6161
require_once 'clean_table.inc';
6262
?>
6363
--EXPECT--
64-
mysqli_release_savepoint(): Argument #2 ($name) cannot be empty
64+
mysqli_release_savepoint(): Argument #2 ($name) must not be empty
6565
array(1) {
6666
["id"]=>
6767
string(1) "1"

0 commit comments

Comments
 (0)