Skip to content

Commit 5853cdb

Browse files
GirgiasGirgias
committed
Use "must not" instead of "cannot" wording
1 parent c811d58 commit 5853cdb

File tree

157 files changed

+281
-281
lines changed

Some content is hidden

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

157 files changed

+281
-281
lines changed

Diff for: ‎Zend/tests/property_hooks/invalid_empty_hooks.phpt

+2-2
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

Diff for: ‎Zend/zend_API.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,9 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
439439
}
440440
/* }}} */
441441

442-
ZEND_API ZEND_COLD void zend_argument_cannot_be_empty_error(uint32_t arg_num)
442+
ZEND_API ZEND_COLD void zend_argument_must_not_be_empty_error(uint32_t arg_num)
443443
{
444-
zend_argument_value_error(arg_num, "cannot be empty");
444+
zend_argument_value_error(arg_num, "must not be empty");
445445
}
446446

447447
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, zend_class_entry *old_ce)

Diff for: ‎Zend/zend_API.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_en
15641564
ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
15651565
ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);
15661566
ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *format, ...);
1567-
ZEND_API ZEND_COLD void zend_argument_cannot_be_empty_error(uint32_t arg_num);
1567+
ZEND_API ZEND_COLD void zend_argument_must_not_be_empty_error(uint32_t arg_num);
15681568
ZEND_API ZEND_COLD void zend_class_redeclaration_error(int type, zend_class_entry *old_ce);
15691569
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, zend_class_entry *old_ce);
15701570

Diff for: ‎Zend/zend_compile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8390,7 +8390,7 @@ static void zend_compile_property_hooks(
83908390
}
83918391

83928392
if (hooks->children == 0) {
8393-
zend_error_noreturn(E_COMPILE_ERROR, "Property hook list cannot be empty");
8393+
zend_error_noreturn(E_COMPILE_ERROR, "Property hook list must not be empty");
83948394
}
83958395

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

Diff for: ‎ext/bz2/bz2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ PHP_FUNCTION(bzopen)
349349
/* If it's not a resource its a string containing the filename to open */
350350
if (Z_TYPE_P(file) == IS_STRING) {
351351
if (Z_STRLEN_P(file) == 0) {
352-
zend_argument_cannot_be_empty_error(1);
352+
zend_argument_must_not_be_empty_error(1);
353353
RETURN_THROWS();
354354
}
355355

Diff for: ‎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"

Diff for: ‎ext/dba/dba.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -547,15 +547,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
547547
}
548548

549549
if (ZSTR_LEN(path) == 0) {
550-
zend_argument_cannot_be_empty_error(1);
550+
zend_argument_must_not_be_empty_error(1);
551551
RETURN_THROWS();
552552
}
553553
if (ZSTR_LEN(mode) == 0) {
554-
zend_argument_cannot_be_empty_error(2);
554+
zend_argument_must_not_be_empty_error(2);
555555
RETURN_THROWS();
556556
}
557557
if (handler_str && ZSTR_LEN(handler_str) == 0) {
558-
zend_argument_cannot_be_empty_error(3);
558+
zend_argument_must_not_be_empty_error(3);
559559
RETURN_THROWS();
560560
}
561561
// TODO Check Value for permission

Diff for: ‎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"

Diff for: ‎ext/dom/document.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode)
15251525
}
15261526

15271527
if (!source_len) {
1528-
zend_argument_cannot_be_empty_error(1);
1528+
zend_argument_must_not_be_empty_error(1);
15291529
RETURN_THROWS();
15301530
}
15311531
if (ZEND_SIZE_T_INT_OVFL(source_len)) {
@@ -1579,7 +1579,7 @@ PHP_METHOD(DOMDocument, save)
15791579
}
15801580

15811581
if (file_len == 0) {
1582-
zend_argument_cannot_be_empty_error(1);
1582+
zend_argument_must_not_be_empty_error(1);
15831583
RETURN_THROWS();
15841584
}
15851585

@@ -1883,7 +1883,7 @@ static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
18831883
}
18841884

18851885
if (!source_len) {
1886-
zend_argument_cannot_be_empty_error(1);
1886+
zend_argument_must_not_be_empty_error(1);
18871887
RETURN_THROWS();
18881888
}
18891889

@@ -1992,7 +1992,7 @@ static void dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type
19921992
}
19931993

19941994
if (!source_len) {
1995-
zend_argument_cannot_be_empty_error(1);
1995+
zend_argument_must_not_be_empty_error(1);
19961996
RETURN_THROWS();
19971997
}
19981998

@@ -2085,7 +2085,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
20852085
}
20862086

20872087
if (!source_len) {
2088-
zend_argument_cannot_be_empty_error(1);
2088+
zend_argument_must_not_be_empty_error(1);
20892089
RETURN_THROWS();
20902090
}
20912091

@@ -2162,7 +2162,7 @@ PHP_METHOD(DOMDocument, saveHTMLFile)
21622162
}
21632163

21642164
if (file_len == 0) {
2165-
zend_argument_cannot_be_empty_error(1);
2165+
zend_argument_must_not_be_empty_error(1);
21662166
RETURN_THROWS();
21672167
}
21682168

Diff for: ‎ext/dom/domimplementation.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ PHP_METHOD(DOMImplementation, createDocumentType)
6464
}
6565

6666
if (name_len == 0) {
67-
zend_argument_cannot_be_empty_error(1);
67+
zend_argument_must_not_be_empty_error(1);
6868
RETURN_THROWS();
6969
}
7070

Diff for: ‎ext/dom/element.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ PHP_METHOD(DOMElement, setAttribute)
411411
}
412412

413413
if (name_len == 0) {
414-
zend_argument_cannot_be_empty_error(1);
414+
zend_argument_must_not_be_empty_error(1);
415415
RETURN_THROWS();
416416
}
417417

@@ -903,7 +903,7 @@ PHP_METHOD(DOMElement, getAttributeNS)
903903
static void dom_set_attribute_ns_legacy(dom_object *intern, xmlNodePtr elemp, char *uri, size_t uri_len, char *name, size_t name_len, const char *value)
904904
{
905905
if (name_len == 0) {
906-
zend_argument_cannot_be_empty_error(2);
906+
zend_argument_must_not_be_empty_error(2);
907907
return;
908908
}
909909

Diff for: ‎ext/dom/html_document.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ PHP_METHOD(Dom_HTMLDocument, saveHtmlFile)
12831283
}
12841284

12851285
if (file_len == 0) {
1286-
zend_argument_cannot_be_empty_error(1);
1286+
zend_argument_must_not_be_empty_error(1);
12871287
RETURN_THROWS();
12881288
}
12891289

Diff for: ‎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

Diff for: ‎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

Diff for: ‎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

Diff for: ‎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)

Diff for: ‎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

Diff for: ‎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

Diff for: ‎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

Diff for: ‎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}

Diff for: ‎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}

Diff for: ‎ext/enchant/enchant.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ PHP_FUNCTION(enchant_broker_request_dict)
447447
PHP_ENCHANT_GET_BROKER;
448448

449449
if (taglen == 0) {
450-
zend_argument_cannot_be_empty_error(2);
450+
zend_argument_must_not_be_empty_error(2);
451451
RETURN_THROWS();
452452
}
453453

Diff for: ‎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

Diff for: ‎ext/exif/exif.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4550,7 +4550,7 @@ PHP_FUNCTION(exif_read_data)
45504550
}
45514551

45524552
if (!Z_STRLEN_P(stream)) {
4553-
zend_argument_cannot_be_empty_error(1);
4553+
zend_argument_must_not_be_empty_error(1);
45544554
RETURN_THROWS();
45554555
}
45564556

@@ -4727,7 +4727,7 @@ PHP_FUNCTION(exif_thumbnail)
47274727
}
47284728

47294729
if (!Z_STRLEN_P(stream)) {
4730-
zend_argument_cannot_be_empty_error(1);
4730+
zend_argument_must_not_be_empty_error(1);
47314731
RETURN_THROWS();
47324732
}
47334733

Diff for: ‎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

Diff for: ‎ext/fileinfo/fileinfo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
374374
php_stream_statbuf ssb;
375375

376376
if (buffer == NULL || buffer_len == 0) {
377-
zend_argument_cannot_be_empty_error(1);
377+
zend_argument_must_not_be_empty_error(1);
378378
goto clean;
379379
}
380380
if (CHECK_NULL_PATH(buffer, buffer_len)) {

Diff for: ‎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

Diff for: ‎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

Diff for: ‎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;

Diff for: ‎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

Diff for: ‎ext/gd/gd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ PHP_FUNCTION(imagesetstyle)
646646

647647
num_styles = zend_hash_num_elements(Z_ARRVAL_P(styles));
648648
if (num_styles == 0) {
649-
zend_argument_cannot_be_empty_error(2);
649+
zend_argument_must_not_be_empty_error(2);
650650
RETURN_THROWS();
651651
}
652652

Diff for: ‎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====

Diff for: ‎ext/gettext/gettext.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ZEND_GET_MODULE(php_gettext)
5555
zend_argument_value_error(_arg_num, "is too long"); \
5656
RETURN_THROWS(); \
5757
} else if (domain_len == 0) { \
58-
zend_argument_cannot_be_empty_error(_arg_num); \
58+
zend_argument_must_not_be_empty_error(_arg_num); \
5959
RETURN_THROWS(); \
6060
}
6161

Diff for: ‎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

Diff for: ‎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--

Diff for: ‎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

0 commit comments

Comments
 (0)