mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 01:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use "must not" instead of "cannot" wording

Browse Source
This commit is contained in:
Gina Peter Bnayard 2024-08-20 13:45:39 +02:00 committed by Gina Peter Banyard
parent c811d58953
commit 5853cdb73d
157 changed files with 281 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/tests/property_hooks/invalid_empty_hooks.phpt
View File

@ -1,5 +1,5 @@
--TEST--
Property hook list cannot be empty
Property hook list must not be empty
--FILE--
<?php
@ -9,4 +9,4 @@ class Test {
?>
--EXPECTF--
Fatal error: Property hook list cannot be empty in %s on line %d
Fatal error: Property hook list must not be empty in %s on line %d

4
Zend/zend_API.c
View File

@ -439,9 +439,9 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
}
/* }}} */
ZEND_API ZEND_COLD void zend_argument_cannot_be_empty_error(uint32_t arg_num)
ZEND_API ZEND_COLD void zend_argument_must_not_be_empty_error(uint32_t arg_num)
{
zend_argument_value_error(arg_num, "cannot be empty");
zend_argument_value_error(arg_num, "must not be empty");
}
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, zend_class_entry *old_ce)

2
Zend/zend_API.h
View File

@ -1564,7 +1564,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_en
ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_cannot_be_empty_error(uint32_t arg_num);
ZEND_API ZEND_COLD void zend_argument_must_not_be_empty_error(uint32_t arg_num);
ZEND_API ZEND_COLD void zend_class_redeclaration_error(int type, zend_class_entry *old_ce);
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, zend_class_entry *old_ce);

2
Zend/zend_compile.c
View File

@ -8390,7 +8390,7 @@ static void zend_compile_property_hooks(
}
if (hooks->children == 0) {
zend_error_noreturn(E_COMPILE_ERROR, "Property hook list cannot be empty");
zend_error_noreturn(E_COMPILE_ERROR, "Property hook list must not be empty");
}
for (uint32_t i = 0; i < hooks->children; i++) {

2
ext/bz2/bz2.c
View File

@ -349,7 +349,7 @@ PHP_FUNCTION(bzopen)
/* If it's not a resource its a string containing the filename to open */
if (Z_TYPE_P(file) == IS_STRING) {
if (Z_STRLEN_P(file) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

4
ext/bz2/tests/001.phpt
View File

@ -42,8 +42,8 @@ var_dump(bzopen($fp, "r"));
?>
--EXPECTF--
bzopen(): Argument #1 ($file) cannot be empty
bzopen(): Argument #1 ($file) cannot be empty
bzopen(): Argument #1 ($file) must not be empty
bzopen(): Argument #1 ($file) must not be empty
bzopen(): Argument #2 ($mode) must be either "r" or "w"
bzopen(): Argument #2 ($mode) must be either "r" or "w"
bzopen(): Argument #2 ($mode) must be either "r" or "w"

6
ext/dba/dba.c
View File

@ -547,15 +547,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
}
if (ZSTR_LEN(path) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
if (ZSTR_LEN(mode) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
if (handler_str && ZSTR_LEN(handler_str) == 0) {
zend_argument_cannot_be_empty_error(3);
zend_argument_must_not_be_empty_error(3);
RETURN_THROWS();
}
// TODO Check Value for permission

12
ext/dba/tests/value_errors_open.phpt
View File

@ -121,9 +121,9 @@ object(Dba\Connection)#%d (%d) {
Warning: dba_open(): Handler "bogus" is not available in %s on line %d
bool(false)
dba_open(): Argument #1 ($path) cannot be empty
dba_open(): Argument #2 ($mode) cannot be empty
dba_open(): Argument #3 ($handler) cannot be empty
dba_open(): Argument #1 ($path) must not be empty
dba_open(): Argument #2 ($mode) must not be empty
dba_open(): Argument #3 ($handler) must not be empty
dba_open(): Argument #2 ($mode) first character must be one of "r", "w", "c", or "n"
dba_open(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
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
Warning: dba_popen(): Handler "bogus" is not available in %s on line %d
bool(false)
dba_popen(): Argument #1 ($path) cannot be empty
dba_popen(): Argument #2 ($mode) cannot be empty
dba_popen(): Argument #3 ($handler) cannot be empty
dba_popen(): Argument #1 ($path) must not be empty
dba_popen(): Argument #2 ($mode) must not be empty
dba_popen(): Argument #3 ($handler) must not be empty
dba_popen(): Argument #2 ($mode) first character must be one of "r", "w", "c", or "n"
dba_popen(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
dba_popen(): Argument #2 ($mode) third character must be "t"

12
ext/dom/document.c
View File

@ -1525,7 +1525,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode)
}
if (!source_len) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
if (ZEND_SIZE_T_INT_OVFL(source_len)) {
@ -1579,7 +1579,7 @@ PHP_METHOD(DOMDocument, save)
}
if (file_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1883,7 +1883,7 @@ static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
}
if (!source_len) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1992,7 +1992,7 @@ static void dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type
}
if (!source_len) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -2085,7 +2085,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
}
if (!source_len) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -2162,7 +2162,7 @@ PHP_METHOD(DOMDocument, saveHTMLFile)
}
if (file_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

2
ext/dom/domimplementation.c
View File

@ -64,7 +64,7 @@ PHP_METHOD(DOMImplementation, createDocumentType)
}
if (name_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

4
ext/dom/element.c
View File

@ -411,7 +411,7 @@ PHP_METHOD(DOMElement, setAttribute)
}
if (name_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -903,7 +903,7 @@ PHP_METHOD(DOMElement, getAttributeNS)
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)
{
if (name_len == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
return;
}

2
ext/dom/html_document.c
View File

@ -1283,7 +1283,7 @@ PHP_METHOD(Dom_HTMLDocument, saveHtmlFile)
}
if (file_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

2
ext/dom/tests/DOMDocument_loadHTML_error2.phpt
View File

@ -14,4 +14,4 @@ try {
}
?>
--EXPECT--
DOMDocument::loadHTML(): Argument #1 ($source) cannot be empty
DOMDocument::loadHTML(): Argument #1 ($source) must not be empty

2
ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
View File

@ -23,5 +23,5 @@ try {
}
?>
--EXPECT--
DOMDocument::loadHTMLFile(): Argument #1 ($filename) cannot be empty
DOMDocument::loadHTMLFile(): Argument #1 ($filename) must not be empty
DOMDocument::loadHTMLFile(): Argument #1 ($filename) must not contain any null bytes

2
ext/dom/tests/DOMDocument_loadXML_error6.phpt
View File

@ -13,4 +13,4 @@ try {
}
?>
--EXPECT--
DOMDocument::loadXML(): Argument #1 ($source) cannot be empty
DOMDocument::loadXML(): Argument #1 ($source) must not be empty

2
ext/dom/tests/DOMDocument_load_error6.phpt
View File

@ -22,6 +22,6 @@ try {
var_dump($dom->load(str_repeat(" ", PHP_MAXPATHLEN + 1)));
?>
--EXPECT--
DOMDocument::load(): Argument #1 ($filename) cannot be empty
DOMDocument::load(): Argument #1 ($filename) must not be empty
DOMDocument::load(): Argument #1 ($filename) must not contain any null bytes
bool(false)

2
ext/dom/tests/DOMDocument_saveHTMLFile_invalid_filename.phpt
View File

@ -24,4 +24,4 @@ try {
}
?>
--EXPECT--
DOMDocument::saveHTMLFile(): Argument #1 ($filename) cannot be empty
DOMDocument::saveHTMLFile(): Argument #1 ($filename) must not be empty

2
ext/dom/tests/DOMDocument_schemaValidateSource_error3.phpt
View File

@ -20,4 +20,4 @@ try {
?>
--EXPECT--
DOMDocument::schemaValidateSource(): Argument #1 ($source) cannot be empty
DOMDocument::schemaValidateSource(): Argument #1 ($source) must not be empty

2
ext/dom/tests/DOMDocument_schemaValidate_error3.phpt
View File

@ -20,4 +20,4 @@ try {
?>
--EXPECT--
DOMDocument::schemaValidate(): Argument #1 ($filename) cannot be empty
DOMDocument::schemaValidate(): Argument #1 ($filename) must not be empty

2
ext/dom/tests/modern/html/interactions/HTMLDocument_saveHTMLFile_empty_path.phpt
View File

@ -11,7 +11,7 @@ $dom->saveHtmlFile("");
?>
--EXPECTF--
Fatal error: Uncaught ValueError: Dom\HTMLDocument::saveHtmlFile(): Argument #1 ($filename) cannot be empty in %s:%d
Fatal error: Uncaught ValueError: Dom\HTMLDocument::saveHtmlFile(): Argument #1 ($filename) must not be empty in %s:%d
Stack trace:
#0 %s(%d): Dom\HTMLDocument->saveHtmlFile('')
#1 {main}

2
ext/dom/tests/modern/html/parser/HTMLDocument_fromFile_empty_path.phpt
View File

@ -9,7 +9,7 @@ $dom = Dom\HTMLDocument::createFromFile("");
?>
--EXPECTF--
Fatal error: Uncaught ValueError: Path cannot be empty in %s:%d
Fatal error: Uncaught ValueError: Path must not be empty in %s:%d
Stack trace:
#0 %s(%d): Dom\HTMLDocument::createFromFile('')
#1 {main}

2
ext/enchant/enchant.c
View File

@ -447,7 +447,7 @@ PHP_FUNCTION(enchant_broker_request_dict)
PHP_ENCHANT_GET_BROKER;
if (taglen == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

2
ext/enchant/tests/broker_request_dict_error_on_empty_tag.phpt
View File

@ -18,4 +18,4 @@ try {
?>
--EXPECT--
enchant_broker_request_dict(): Argument #2 ($tag) cannot be empty
enchant_broker_request_dict(): Argument #2 ($tag) must not be empty

4
ext/exif/exif.c
View File

@ -4550,7 +4550,7 @@ PHP_FUNCTION(exif_read_data)
}
if (!Z_STRLEN_P(stream)) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -4727,7 +4727,7 @@ PHP_FUNCTION(exif_thumbnail)
}
if (!Z_STRLEN_P(stream)) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

4
ext/exif/tests/filename_empty.phpt
View File

@ -31,7 +31,7 @@ try {
?>
--EXPECT--
exif_read_data(): Argument #1 ($file) cannot be empty
exif_thumbnail(): Argument #1 ($file) cannot be empty
exif_read_data(): Argument #1 ($file) must not be empty
exif_thumbnail(): Argument #1 ($file) must not be empty
exif_read_data(): Argument #1 ($file) must not contain any null bytes
exif_thumbnail(): Argument #1 ($file) must not contain any null bytes

2
ext/fileinfo/fileinfo.c
View File

@ -374,7 +374,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
php_stream_statbuf ssb;
if (buffer == NULL || buffer_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
goto clean;
}
if (CHECK_NULL_PATH(buffer, buffer_len)) {

2
ext/fileinfo/tests/finfo_file_001.phpt
View File

@ -22,7 +22,7 @@ var_dump(finfo_file($fp, '&'));
?>
--EXPECTF--
finfo_file(): Argument #1 ($finfo) must not contain any null bytes
finfo_file(): Argument #1 ($finfo) cannot be empty
finfo_file(): Argument #1 ($finfo) must not be empty
string(9) "directory"
Warning: finfo_file(&): Failed to open stream: No such file or directory in %s on line %d

2
ext/fileinfo/tests/mime_content_type_001.phpt
View File

@ -47,5 +47,5 @@ mime_content_type(): Argument #1 ($filename) must be of type resource|string, st
mime_content_type(): Argument #1 ($filename) must be of type resource|string, array given
Warning: mime_content_type(foo/inexistent): Failed to open stream: No such file or directory in %s on line %d
mime_content_type(): Argument #1 ($filename) cannot be empty
mime_content_type(): Argument #1 ($filename) must not be empty
mime_content_type(): Argument #1 ($filename) must not contain any null bytes

2
ext/filter/logical_filters.c
View File

@ -382,7 +382,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
if (thousand_set) {
if (thousand_len < 1) {
zend_value_error("%s(): \"thousand\" option cannot be empty", get_active_function_name());
zend_value_error("%s(): \"thousand\" option must not be empty", get_active_function_name());
RETURN_VALIDATION_FAILED
} else {
tsd_sep = thousand;

2
ext/filter/tests/bug51368.phpt
View File

@ -21,4 +21,4 @@ try {
--EXPECT--
float(1000)
float(1234.567)
filter_var(): "thousand" option cannot be empty
filter_var(): "thousand" option must not be empty

2
ext/gd/gd.c
View File

@ -646,7 +646,7 @@ PHP_FUNCTION(imagesetstyle)
num_styles = zend_hash_num_elements(Z_ARRVAL_P(styles));
if (num_styles == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

2
ext/gd/tests/bug72709.phpt
View File

@ -18,5 +18,5 @@ imagedestroy($im);
?>
====DONE====
--EXPECT--
imagesetstyle(): Argument #2 ($style) cannot be empty
imagesetstyle(): Argument #2 ($style) must not be empty
====DONE====

2
ext/gettext/gettext.c
View File

@ -55,7 +55,7 @@ ZEND_GET_MODULE(php_gettext)
zend_argument_value_error(_arg_num, "is too long"); \
RETURN_THROWS(); \
} else if (domain_len == 0) { \
zend_argument_cannot_be_empty_error(_arg_num); \
zend_argument_must_not_be_empty_error(_arg_num); \
RETURN_THROWS(); \
}

4
ext/gettext/tests/dcngettext.phpt
View File

@ -33,6 +33,6 @@ string(1) "1"
string(4) "test"
string(4) "test"
string(4) "test"
dcngettext(): Argument #1 ($domain) cannot be empty
dcngettext(): Argument #1 ($domain) cannot be empty
dcngettext(): Argument #1 ($domain) must not be empty
dcngettext(): Argument #1 ($domain) must not be empty
Done

4
ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
View File

@ -20,8 +20,8 @@ gettext
echo "Done\n";
?>
--EXPECT--
bind_textdomain_codeset(): Argument #1 ($domain) cannot be empty
bind_textdomain_codeset(): Argument #1 ($domain) cannot be empty
bind_textdomain_codeset(): Argument #1 ($domain) must not be empty
bind_textdomain_codeset(): Argument #1 ($domain) must not be empty
string(5) "UTF-8"
Done
--CREDITS--

2
ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
View File

@ -15,7 +15,7 @@ try {
?>
--EXPECT--
bindtextdomain(): Argument #1 ($domain) cannot be empty
bindtextdomain(): Argument #1 ($domain) must not be empty
--CREDITS--
Till Klampaeckel, till@php.net
PHP Testfest Berlin 2009-05-09

2
ext/gettext/tests/gettext_textdomain-retval.phpt
View File

@ -36,7 +36,7 @@ test
test
foo
textdomain(): Argument #1 ($domain) cannot be zero
textdomain(): Argument #1 ($domain) cannot be empty
textdomain(): Argument #1 ($domain) must not be empty
--CREDITS--
Christian Weiske, cweiske@php.net
PHP Testfest Berlin 2009-05-09

4
ext/hash/hash.c
View File

@ -635,7 +635,7 @@ PHP_FUNCTION(hash_init)
}
if (!key || (ZSTR_LEN(key) == 0)) {
/* Note: a zero length key is no key at all */
zend_argument_value_error(3, "cannot be empty when HMAC is requested");
zend_argument_value_error(3, "must not be empty when HMAC is requested");
RETURN_THROWS();
}
}
@ -914,7 +914,7 @@ PHP_FUNCTION(hash_hkdf)
}
if (ZSTR_LEN(ikm) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

2
ext/hash/tests/hash_hkdf_error.phpt
View File

@ -61,6 +61,6 @@ trycatch_dump(
[ValueError] hash_hkdf(): Argument #1 ($algo) must be a valid cryptographic hashing algorithm
-- Testing hash_hkdf() function with invalid parameters --
[ValueError] hash_hkdf(): Argument #2 ($key) cannot be empty
[ValueError] hash_hkdf(): Argument #2 ($key) must not be empty
[ValueError] hash_hkdf(): Argument #3 ($length) must be greater than or equal to 0
[ValueError] hash_hkdf(): Argument #3 ($length) must be less than or equal to 5100

4
ext/hash/tests/hash_init_error.phpt
View File

@ -47,7 +47,7 @@ hash_init(): Argument #1 ($algo) must be a valid hashing algorithm
hash_init(): Argument #1 ($algo) must be a cryptographic hashing algorithm if HMAC is requested
-- Testing hash_init() function with HASH_HMAC and no key --
hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested
hash_init(): Argument #3 ($key) must not be empty when HMAC is requested
Deprecated: hash_init(): Passing null to parameter #3 ($key) of type string is deprecated in %s on line %d
hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested
hash_init(): Argument #3 ($key) must not be empty when HMAC is requested

2
ext/intl/idn/idn.c
View File

@ -125,7 +125,7 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(domain) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
if (ZSTR_LEN(domain) > INT32_MAX - 1) {

4
ext/intl/resourcebundle/resourcebundle_class.c
View File

@ -186,9 +186,9 @@ static zval *resource_bundle_array_fetch(
if (offset_str) {
if (UNEXPECTED(ZSTR_LEN(offset_str) == 0)) {
if (offset_arg_num) {
zend_argument_cannot_be_empty_error(offset_arg_num);
zend_argument_must_not_be_empty_error(offset_arg_num);
} else {
zend_value_error("Offset cannot be empty");
zend_value_error("Offset must not be empty");
}
return NULL;
}

2
ext/intl/tests/idn_uts46_errors.phpt
View File

@ -48,7 +48,7 @@ var_dump($foo["errors"]==IDNA_ERROR_CONTEXTJ);
bad variant:
ValueError: idn_to_ascii(): Argument #2 ($flags) must be INTL_IDNA_VARIANT_UTS46
empty domain:
ValueError: idn_to_ascii(): Argument #1 ($domain) cannot be empty
ValueError: idn_to_ascii(): Argument #1 ($domain) must not be empty
with error, but no details arg:
bool(false)
with error, with details arg:

2
ext/intl/tests/resourcebundle_dimension_errors.phpt
View File

@ -57,5 +57,5 @@ Error: Cannot use object of type ResourceBundle as array
string(7) "default"
TypeError: Cannot access offset of type float on ResourceBundle
TypeError: Cannot access offset of type stdClass on ResourceBundle
ValueError: Offset cannot be empty
ValueError: Offset must not be empty
ValueError: Index must be between -2147483648 and 2147483647

4
ext/ldap/ldap.c
View File

@ -1501,7 +1501,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
nlinks = zend_hash_num_elements(Z_ARRVAL_P(link));
if (nlinks == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
ret = 0;
goto cleanup;
}
@ -2696,7 +2696,7 @@ PHP_FUNCTION(ldap_modify_batch)
zend_hash_internal_pointer_reset(Z_ARRVAL_P(modinfo));
num_modvals = zend_hash_num_elements(Z_ARRVAL_P(modinfo));
if (num_modvals == 0) {
zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" cannot be empty", get_active_function_name());
zend_value_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must not be empty", get_active_function_name());
RETURN_THROWS();
}

2
ext/ldap/tests/ldap_search_error.phpt
View File

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

8
ext/mbstring/mbstring.c
View File

@ -2238,7 +2238,7 @@ PHP_FUNCTION(mb_substr_count)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(needle) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -2278,7 +2278,7 @@ PHP_FUNCTION(mb_substr_count)
if (ZSTR_LEN(needle_u8) == 0) {
zend_string_free(haystack_u8);
zend_string_free(needle_u8);
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
}
@ -5673,7 +5673,7 @@ PHP_FUNCTION(mb_ord)
ZEND_PARSE_PARAMETERS_END();
if (str_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -5810,7 +5810,7 @@ PHP_FUNCTION(mb_str_pad)
}
if (ZSTR_LEN(pad) == 0) {
zend_argument_cannot_be_empty_error(3);
zend_argument_must_not_be_empty_error(3);
RETURN_THROWS();
}

4
ext/mbstring/php_mbregex.c
View File

@ -900,7 +900,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
}
if (arg_pattern_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1468,7 +1468,7 @@ PHP_FUNCTION(mb_ereg_search_init)
}
if (arg_pattern && arg_pattern_len == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

16
ext/mbstring/tests/bug43994.phpt
View File

@ -43,28 +43,28 @@ foreach($inputs as $input) {
--EXPECT--
-- Iteration 1 --
Without $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
With $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
NULL
-- Iteration 2 --
Without $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
With $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
NULL
-- Iteration 3 --
Without $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
With $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
NULL
-- Iteration 4 --
Without $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
With $regs arg:
mb_ereg(): Argument #1 ($pattern) cannot be empty
mb_ereg(): Argument #1 ($pattern) must not be empty
NULL

2
ext/mbstring/tests/empty_pattern.phpt
View File

@ -25,5 +25,5 @@ try {
?>
--EXPECT--
mb_ereg_search_init(): Argument #2 ($pattern) cannot be empty
mb_ereg_search_init(): Argument #2 ($pattern) must not be empty
No pattern was provided

2
ext/mbstring/tests/mb_ereg1.phpt
View File

@ -35,7 +35,7 @@ array(3) {
array(0) {
}
}
ValueError: mb_ereg(): Argument #1 ($pattern) cannot be empty
ValueError: mb_ereg(): Argument #1 ($pattern) must not be empty
array(3) {
[0]=>
string(0) ""

2
ext/mbstring/tests/mb_ord.phpt
View File

@ -56,7 +56,7 @@ try {
bool(true)
bool(true)
bool(true)
mb_ord(): Argument #1 ($string) cannot be empty
mb_ord(): Argument #1 ($string) must not be empty
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "typo" given
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "pass" given
mb_ord() does not support the "JIS" encoding

6
ext/mbstring/tests/mb_str_pad.phpt
View File

@ -87,9 +87,9 @@ foreach ($tests as $encoding => $test) {
?>
--EXPECT--
--- Error conditions ---
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
ValueError: mb_str_pad(): Argument #3 ($pad_string) cannot be empty
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty
ValueError: mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH
ValueError: mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "non-existing" given
--- Simple ASCII strings ---

6
ext/mbstring/tests/mb_substr_count.phpt
View File

@ -69,9 +69,9 @@ output_handler=
?>
--EXPECT--
== Empty needle should raise an error ==
mb_substr_count(): Argument #2 ($needle) cannot be empty
mb_substr_count(): Argument #2 ($needle) cannot be empty
mb_substr_count(): Argument #2 ($needle) cannot be empty
mb_substr_count(): Argument #2 ($needle) must not be empty
mb_substr_count(): Argument #2 ($needle) must not be empty
mb_substr_count(): Argument #2 ($needle) must not be empty
== Return value for empty haystack should always be zero ==
int(0)
int(0)

2
ext/mysqli/mysqli_api.c
View File

@ -139,7 +139,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
if (!types_len) {
zend_argument_cannot_be_empty_error(ERROR_ARG_POS(2));
zend_argument_must_not_be_empty_error(ERROR_ARG_POS(2));
RETURN_THROWS();
}

8
ext/mysqli/mysqli_nonapi.c
View File

@ -572,7 +572,7 @@ PHP_FUNCTION(mysqli_query)
}
if (!query_len) {
zend_argument_cannot_be_empty_error(ERROR_ARG_POS(2));
zend_argument_must_not_be_empty_error(ERROR_ARG_POS(2));
RETURN_THROWS();
}
if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT &&
@ -1013,7 +1013,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
RETURN_THROWS();
}
if (name && !name_len) {
zend_argument_cannot_be_empty_error(ERROR_ARG_POS(3));
zend_argument_must_not_be_empty_error(ERROR_ARG_POS(3));
RETURN_THROWS();
}
@ -1037,7 +1037,7 @@ PHP_FUNCTION(mysqli_savepoint)
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
if (name_len == 0) {
zend_argument_cannot_be_empty_error(ERROR_ARG_POS(2));
zend_argument_must_not_be_empty_error(ERROR_ARG_POS(2));
RETURN_THROWS();
}
@ -1061,7 +1061,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
if (name_len == 0) {
zend_argument_cannot_be_empty_error(ERROR_ARG_POS(2));
zend_argument_must_not_be_empty_error(ERROR_ARG_POS(2));
RETURN_THROWS();
}
if (FAIL == mysqlnd_release_savepoint(mysql->mysql, name)) {

2
ext/mysqli/tests/mysqli_query.phpt
View File

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

2
ext/mysqli/tests/mysqli_release_savepoint.phpt
View File

@ -61,7 +61,7 @@ if (!have_innodb($link))
require_once 'clean_table.inc';
?>
--EXPECT--
mysqli_release_savepoint(): Argument #2 ($name) cannot be empty
mysqli_release_savepoint(): Argument #2 ($name) must not be empty
array(1) {
["id"]=>
string(1) "1"

2
ext/mysqli/tests/mysqli_savepoint.phpt
View File

@ -52,5 +52,5 @@ if (!have_innodb($link))
require_once 'clean_table.inc';
?>
--EXPECT--
mysqli_savepoint(): Argument #2 ($name) cannot be empty
mysqli_savepoint(): Argument #2 ($name) must not be empty
done!

2
ext/mysqli/tests/mysqli_stmt_bind_param.phpt
View File

@ -413,7 +413,7 @@ require_once 'skipifconnectfailure.inc';
?>
--EXPECT--
The number of variables must match the number of parameters in the prepared statement
mysqli_stmt_bind_param(): Argument #2 ($types) cannot be empty
mysqli_stmt_bind_param(): Argument #2 ($types) must not be empty
The number of elements in the type definition string must match the number of bind variables
The number of variables must match the number of parameters in the prepared statement
The number of elements in the type definition string must match the number of bind variables

8
ext/openssl/openssl.c
View File

@ -7243,7 +7243,7 @@ PHP_FUNCTION(openssl_seal)
pubkeysht = Z_ARRVAL_P(pubkeys);
nkeys = pubkeysht ? zend_hash_num_elements(pubkeysht) : 0;
if (!nkeys) {
zend_argument_cannot_be_empty_error(4);
zend_argument_must_not_be_empty_error(4);
RETURN_THROWS();
}
@ -8017,7 +8017,7 @@ PHP_FUNCTION(openssl_decrypt)
}
if (!method_len) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -8059,7 +8059,7 @@ PHP_FUNCTION(openssl_cipher_iv_length)
}
if (ZSTR_LEN(method) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -8088,7 +8088,7 @@ PHP_FUNCTION(openssl_cipher_key_length)
}
if (ZSTR_LEN(method) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

2
ext/openssl/tests/openssl_cipher_iv_length_error.phpt
View File

@ -18,4 +18,4 @@ try {
Warning: openssl_cipher_iv_length(): Unknown cipher algorithm in %s on line %d
bool(false)
openssl_cipher_iv_length(): Argument #1 ($cipher_algo) cannot be empty
openssl_cipher_iv_length(): Argument #1 ($cipher_algo) must not be empty

2
ext/openssl/tests/openssl_cipher_key_length_error.phpt
View File

@ -18,4 +18,4 @@ try {
Warning: openssl_cipher_key_length(): Unknown cipher algorithm in %s on line %d
bool(false)
openssl_cipher_key_length(): Argument #1 ($cipher_algo) cannot be empty
openssl_cipher_key_length(): Argument #1 ($cipher_algo) must not be empty

4
ext/openssl/tests/openssl_seal_basic.phpt
View File

@ -40,13 +40,13 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong), $method));
--EXPECTF--
Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d
bool(false)
openssl_seal(): Argument #4 ($public_key) cannot be empty
openssl_seal(): Argument #4 ($public_key) must not be empty
int(32)
int(32)
Warning: openssl_seal(): Not a public key (2th member of pubkeys) in %s on line %d
bool(false)
openssl_seal(): Argument #4 ($public_key) cannot be empty
openssl_seal(): Argument #4 ($public_key) must not be empty
Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d
bool(false)

4
ext/pcntl/pcntl.c
View File

@ -860,7 +860,7 @@ static bool php_pcntl_set_user_signal_infos(
bool allow_empty_signal_array
) {
if (!allow_empty_signal_array && zend_hash_num_elements(user_signals) == 0) {
zend_argument_cannot_be_empty_error(arg_num);
zend_argument_must_not_be_empty_error(arg_num);
return false;
}
@ -1695,7 +1695,7 @@ PHP_FUNCTION(pcntl_setcpuaffinity)
// TODO Why are the arguments optional?
if (!hmask || zend_hash_num_elements(Z_ARRVAL_P(hmask)) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

2
ext/pcntl/tests/pcntl_cpuaffinity.phpt
View File

@ -60,7 +60,7 @@ array(0) {
array(0) {
}
bool(true)
pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cannot be empty
pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) must not be empty
pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id invalid value (def)
pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (%d)
pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (-1024)

2
ext/pcntl/tests/pcntl_sigprocmask_errors.phpt
View File

@ -60,7 +60,7 @@ try {
?>
--EXPECTF--
ValueError: pcntl_sigprocmask(): Argument #1 ($mode) must be one of SIG_BLOCK, SIG_UNBLOCK, or SIG_SETMASK
ValueError: pcntl_sigprocmask(): Argument #2 ($signals) cannot be empty
ValueError: pcntl_sigprocmask(): Argument #2 ($signals) must not be empty
ValueError: pcntl_sigprocmask(): Argument #2 ($signals) signals must be between 1 and %d
ValueError: pcntl_sigprocmask(): Argument #2 ($signals) signals must be between 1 and %d
TypeError: pcntl_sigprocmask(): Argument #2 ($signals) signals must be of type int, string given

2
ext/pcntl/tests/pcntl_sigtimedwait_errors.phpt
View File

@ -86,7 +86,7 @@ try {
?>
--EXPECTF--
ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) cannot be empty
ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) must not be empty
ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d
ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d
ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d

2
ext/pcntl/tests/pcntl_sigwaitinfo_errors.phpt
View File

@ -51,7 +51,7 @@ try {
}
?>
--EXPECTF--
ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) cannot be empty
ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) must not be empty
ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 1 and %d
ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 1 and %d
TypeError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be of type int, string given

6
ext/pdo/pdo_dbh.c
View File

@ -563,7 +563,7 @@ PHP_METHOD(PDO, prepare)
PDO_CONSTRUCT_CHECK;
if (ZSTR_LEN(statement) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1030,7 +1030,7 @@ PHP_METHOD(PDO, exec)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(statement) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1166,7 +1166,7 @@ PHP_METHOD(PDO, query)
PDO_CONSTRUCT_CHECK;
if (ZSTR_LEN(statement) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

4
ext/pdo/pdo_stmt.c
View File

@ -1423,7 +1423,7 @@ static void register_bound_param(INTERNAL_FUNCTION_PARAMETERS, int is_param) /*
if (param.name) {
if (ZSTR_LEN(param.name) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
param.paramno = -1;
@ -1471,7 +1471,7 @@ PHP_METHOD(PDOStatement, bindValue)
if (param.name) {
if (ZSTR_LEN(param.name) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
param.paramno = -1;

2
ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
View File

@ -162,7 +162,7 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_emulated');
?>
--EXPECTF--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
array(1) {
["one"]=>
string(1) "1"

2
ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous_placeholders.phpt
View File

@ -161,7 +161,7 @@ $db = MySQLPDOTest::factory();
$db->query('DROP TABLE IF EXISTS test_prepare_emulated_anonymous_placeholder');
?>
--EXPECTF--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
array(1) {
[0]=>
array(1) {

2
ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_myisam.phpt
View File

@ -152,5 +152,5 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_emulated_myisam');
?>
--EXPECT--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
done!

2
ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_myisam_index.phpt
View File

@ -164,5 +164,5 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_emulated_myisam_index');
?>
--EXPECT--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
done!

2
ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt
View File

@ -165,7 +165,7 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_native');
?>
--EXPECT--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
array(1) {
[0]=>
array(1) {

2
ext/pdo_mysql/tests/pdo_mysql_prepare_native_anonymous_placeholder.phpt
View File

@ -243,7 +243,7 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_native_anonymous_placeholder');
?>
--EXPECT--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
array(1) {
[0]=>
array(1) {

2
ext/pdo_mysql/tests/pdo_mysql_prepare_native_myisam.phpt
View File

@ -155,5 +155,5 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_native_myisam');
?>
--EXPECT--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
done!

2
ext/pdo_mysql/tests/pdo_mysql_prepare_native_myisam_index.phpt
View File

@ -175,5 +175,5 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test_prepare_native_myisam_index');
?>
--EXPECT--
PDO::prepare(): Argument #1 ($query) cannot be empty
PDO::prepare(): Argument #1 ($query) must not be empty
done!

2
ext/pdo_pgsql/pgsql_driver.c
View File

@ -627,7 +627,7 @@ void pgsqlCopyFromArray_internal(INTERNAL_FUNCTION_PARAMETERS)
}
if (!zend_hash_num_elements(Z_ARRVAL_P(pg_rows))) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

2
ext/pdo_sqlite/pdo_sqlite.c
View File

@ -82,7 +82,7 @@ PHP_METHOD(Pdo_Sqlite, loadExtension)
}
if (extension_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

18
ext/pgsql/pgsql.c
View File

@ -4613,7 +4613,7 @@ PHP_FUNCTION(pg_meta_data)
/* php_pgsql_meta_data() asserts that table_name is not empty */
if (ZSTR_LEN(table_name) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -4799,7 +4799,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const zend_string *
ZEND_ASSERT(Z_TYPE_P(result) == IS_ARRAY);
ZEND_ASSERT(!(opt & ~PGSQL_CONV_OPTS));
ZEND_ASSERT(table_name);
/* Table name cannot be empty for php_pgsql_meta_data() */
/* Table name must not be empty for php_pgsql_meta_data() */
ZEND_ASSERT(ZSTR_LEN(table_name) != 0);
array_init(&meta);
@ -5405,7 +5405,7 @@ PHP_FUNCTION(pg_convert)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(table_name) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -5618,7 +5618,7 @@ PHP_FUNCTION(pg_insert)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(table) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -5840,7 +5840,7 @@ PHP_FUNCTION(pg_update)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(table) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -5939,7 +5939,7 @@ PHP_FUNCTION(pg_delete)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(table) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -6095,7 +6095,7 @@ PHP_FUNCTION(pg_select)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(table) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -6143,13 +6143,13 @@ PHP_FUNCTION(pg_change_password)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(user) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
/* it is technically possible, but better to disallow it */
if (ZSTR_LEN(passwd) == 0) {
zend_argument_cannot_be_empty_error(3);
zend_argument_must_not_be_empty_error(3);
RETURN_THROWS();
}

4
ext/pgsql/tests/changepassword.phpt
View File

@ -24,6 +24,6 @@ try {
var_dump(pg_change_password($conn, "inexistent_user", "postitpwd"));
?>
--EXPECT--
pg_change_password(): Argument #2 ($user) cannot be empty
pg_change_password(): Argument #3 ($password) cannot be empty
pg_change_password(): Argument #2 ($user) must not be empty
pg_change_password(): Argument #3 ($password) must not be empty
bool(false)

2
ext/pgsql/tests/pg_insert_002.phpt
View File

@ -21,7 +21,7 @@ foreach (array('', '.', '..') as $table) {
?>
Done
--EXPECTF--
pg_insert(): Argument #2 ($table_name) cannot be empty
pg_insert(): Argument #2 ($table_name) must not be empty
pg_insert(): Argument #2 ($table_name) must be specified (.)
pg_insert(): Argument #2 ($table_name) must be specified (..)
Done

8
ext/phar/tests/create_path_error.phpt
View File

@ -65,10 +65,10 @@ foreach($checks as $check)
--EXPECTF--
string(5) "query"
string(5) "query"
1:Error: file_put_contents(phar://%s//): Failed to open stream: phar error: file "" in phar "%s" cannot be empty
2:Error: file_put_contents(phar://%s/.): Failed to open stream: phar error: file "" in phar "%s" cannot be empty
3:Error: file_put_contents(phar://%s/../): Failed to open stream: phar error: file "" in phar "%s" cannot be empty
4:Error: file_put_contents(phar://%s/a/..): Failed to open stream: phar error: file "" in phar "%s" cannot be empty
1:Error: file_put_contents(phar://%s//): Failed to open stream: phar error: file "" in phar "%s" must not be empty
2:Error: file_put_contents(phar://%s/.): Failed to open stream: phar error: file "" in phar "%s" must not be empty
3:Error: file_put_contents(phar://%s/../): Failed to open stream: phar error: file "" in phar "%s" must not be empty
4:Error: file_put_contents(phar://%s/a/..): Failed to open stream: phar error: file "" in phar "%s" must not be empty
5:
6:
7:

2
ext/phar/util.c
View File

@ -380,7 +380,7 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, ch
if (!path_len) {
if (error) {
spprintf(error, 4096, "phar error: file \"\" in phar \"%s\" cannot be empty", fname);
spprintf(error, 4096, "phar error: file \"\" in phar \"%s\" must not be empty", fname);
}
return FAILURE;
}

4
ext/posix/posix.c
View File

@ -746,7 +746,7 @@ PHP_FUNCTION(posix_eaccess)
path = expand_filepath(filename, NULL);
if (!path) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1285,7 +1285,7 @@ PHP_FUNCTION(posix_pathconf)
ZEND_PARSE_PARAMETERS_END();
if (path_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
} else if (php_check_open_basedir(path)) {
php_error_docref(NULL, E_WARNING, "Invalid path supplied: %s", path);

2
ext/posix/tests/posix_eaccess.phpt
View File

@ -17,4 +17,4 @@ try {
?>
--EXPECT--
posix_eaccess(): Argument #1 ($filename) cannot be empty
posix_eaccess(): Argument #1 ($filename) must not be empty

2
ext/posix/tests/posix_pathconf.phpt
View File

@ -18,7 +18,7 @@ var_dump(posix_errno() != 0);
var_dump(posix_pathconf(sys_get_temp_dir(), POSIX_PC_PATH_MAX));
?>
--EXPECTF--
posix_pathconf(): Argument #1 ($path) cannot be empty
posix_pathconf(): Argument #1 ($path) must not be empty
bool(false)
bool(true)
int(%d)

2
ext/random/randomizer.c
View File

@ -434,7 +434,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
const size_t max_offset = source_length - 1;
if (source_length < 1) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

2
ext/random/tests/03_randomizer/methods/getBytesFromString_error.phpt
View File

@ -24,5 +24,5 @@ try {
?>
--EXPECTF--
Random\Randomizer::getBytesFromString(): Argument #1 ($string) cannot be empty
Random\Randomizer::getBytesFromString(): Argument #1 ($string) must not be empty
Random\Randomizer::getBytesFromString(): Argument #2 ($length) must be greater than 0

2
ext/random/tests/03_randomizer/methods/pickArrayKeys_error.phpt
View File

@ -43,7 +43,7 @@ try {
?>
--EXPECTF--
Random\Randomizer::pickArrayKeys(): Argument #1 ($array) must be of type array, string given
Random\Randomizer::pickArrayKeys(): Argument #1 ($array) cannot be empty
Random\Randomizer::pickArrayKeys(): Argument #1 ($array) must not be empty
Random\Randomizer::pickArrayKeys(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
Random\Randomizer::pickArrayKeys(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
Random\Randomizer::pickArrayKeys(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)

4
ext/simplexml/simplexml.c
View File

@ -1667,7 +1667,7 @@ PHP_METHOD(SimpleXMLElement, addChild)
}
if (qname_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1734,7 +1734,7 @@ PHP_METHOD(SimpleXMLElement, addAttribute)
}
if (qname_len == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}

2
ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
View File

@ -18,6 +18,6 @@ try {
echo $a->asXML();
?>
--EXPECT--
SimpleXMLElement::addAttribute(): Argument #1 ($qualifiedName) cannot be empty
SimpleXMLElement::addAttribute(): Argument #1 ($qualifiedName) must not be empty
<?xml version="1.0"?>
<php>testfest</php>

2
ext/snmp/snmp.c
View File

@ -668,7 +668,7 @@ static bool php_snmp_parse_oid(
objid_query->count++;
} else if (oid_ht) { /* we got objid array */
if (zend_hash_num_elements(oid_ht) == 0) {
zend_value_error("Array of object IDs cannot be empty");
zend_value_error("Array of object IDs must not be empty");
return false;
}
objid_query->vars = (snmpobjarg *)safe_emalloc(sizeof(snmpobjarg), zend_hash_num_elements(oid_ht), 0);

2
ext/snmp/tests/snmp2_get.phpt
View File

@ -54,7 +54,7 @@ var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.
--EXPECTF--
Checking error handling
Empty OID array
Array of object IDs cannot be empty
Array of object IDs must not be empty
Checking working
Single OID
string(%d) "%s"

6
ext/soap/soap.c
View File

@ -571,7 +571,7 @@ PHP_METHOD(SoapParam, __construct)
}
if (ZSTR_LEN(name) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}
@ -602,11 +602,11 @@ PHP_METHOD(SoapHeader, __construct)
ZEND_PARSE_PARAMETERS_END();
if (ZSTR_LEN(ns) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
if (ZSTR_LEN(name) == 0) {
zend_argument_cannot_be_empty_error(2);
zend_argument_must_not_be_empty_error(2);
RETURN_THROWS();
}

2
ext/soap/tests/bugs/bug31755.phpt
View File

@ -26,6 +26,6 @@ $response= $client->__soapCall('function', array(), null, $header);
print $client->__getLastRequest();
?>
--EXPECT--
SoapHeader::__construct(): Argument #1 ($namespace) cannot be empty
SoapHeader::__construct(): Argument #1 ($namespace) must not be empty
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="myNS" xmlns:ns2="namespace" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns2:foo>bar</ns2:foo></SOAP-ENV:Header><SOAP-ENV:Body><ns1:function/></SOAP-ENV:Body></SOAP-ENV:Envelope>

2
ext/sockets/conversions.c
View File

@ -662,7 +662,7 @@ static void from_zval_write_sun_path(const zval *path, char *sockaddr_un_c, ser_
* this is not required, at least on linux for abstract paths. It also
* assumes that the path is not empty */
if (ZSTR_LEN(path_str) == 0) {
do_from_zval_err(ctx, "%s", "the path is cannot be empty");
do_from_zval_err(ctx, "%s", "the path is must not be empty");
zend_tmp_string_release(tmp_path_str);
return;
}

4
ext/spl/spl_directory.c
View File

@ -696,7 +696,7 @@ static void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_l
}
if (ZSTR_LEN(path) == 0) {
zend_argument_cannot_be_empty_error(1);
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
}
@ -1227,7 +1227,7 @@ PHP_METHOD(SplFileInfo, getLinkTarget)
}
#if defined(PHP_WIN32) || defined(HAVE_SYMLINK)
if (intern->file_name == NULL) {
zend_value_error("Filename cannot be empty");
zend_value_error("Filename must not be empty");
RETURN_THROWS();
}
if (!IS_ABSOLUTE_PATH(ZSTR_VAL(intern->file_name), ZSTR_LEN(intern->file_name))) {

Some files were not shown because too many files have changed in this diff Show More