Skip to content

Commit c47d283

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

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
Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 6 additions & 6 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)