Use a common function for "cannot be empty" ValueError

Zend/tests/property_hooks/invalid_empty_hooks.phpt

@@ -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

Zend/zend_API.c

@@ -439,6 +439,11 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
 }
 /* }}} */
 
+ZEND_API ZEND_COLD void zend_argument_must_not_be_empty_error(uint32_t arg_num)
+{
+	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)
 {
 	if (old_ce->type == ZEND_INTERNAL_CLASS) {

Zend/zend_API.h

@@ -1564,6 +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_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);
 

Zend/zend_compile.c

@@ -8383,7 +8383,7 @@ static void zend_compile_property_hooks(
 	zend_class_entry *ce = CG(active_class_entry);
 
 	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++) {

ext/bz2/bz2.c

@@ -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_value_error(1, "cannot be empty");
+			zend_argument_must_not_be_empty_error(1);
 			RETURN_THROWS();
 		}
 

ext/bz2/tests/001.phpt

@@ -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"

ext/dba/dba.c

@@ -547,15 +547,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 	}
 
 	if (ZSTR_LEN(path) == 0) {
-		zend_argument_value_error(1, "cannot be empty");
+		zend_argument_must_not_be_empty_error(1);
 		RETURN_THROWS();
 	}
 	if (ZSTR_LEN(mode) == 0) {
-		zend_argument_value_error(2, "cannot be empty");
+		zend_argument_must_not_be_empty_error(2);
 		RETURN_THROWS();
 	}
 	if (handler_str && ZSTR_LEN(handler_str) == 0) {
-		zend_argument_value_error(3, "cannot be empty");
+		zend_argument_must_not_be_empty_error(3);
 		RETURN_THROWS();
 	}
 	// TODO Check Value for permission
@@ -639,11 +639,6 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 	bool is_lock_ignored = false;
 	// bool is_file_lock = false;
 
-	if (ZSTR_LEN(mode) == 0) {
-		zend_argument_value_error(2, "cannot be empty");
-		efree(resource_key);
-		RETURN_THROWS();
-	}
 	if (ZSTR_LEN(mode) > 3) {
 		zend_argument_value_error(2, "must be at most 3 characters");
 		efree(resource_key);

ext/dba/tests/value_errors_open.phpt

@@ -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"

ext/dom/document.c

@@ -1525,7 +1525,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	}
 
 	if (!source_len) {
-		zend_argument_value_error(1, "must not be empty");
+		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_value_error(1, "must not be empty");
+		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_value_error(1, "must not be empty");
+		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_value_error(1, "must not be empty");
+		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_value_error(1, "must not be empty");
+		zend_argument_must_not_be_empty_error(1);
 		RETURN_THROWS();
 	}
 
@@ -2162,7 +2162,7 @@ PHP_METHOD(DOMDocument, saveHTMLFile)
 	}
 
 	if (file_len == 0) {
-		zend_argument_value_error(1, "must not be empty");
+		zend_argument_must_not_be_empty_error(1);
 		RETURN_THROWS();
 	}
 

ext/dom/domimplementation.c

@@ -64,7 +64,7 @@ PHP_METHOD(DOMImplementation, createDocumentType)
 	}
 
 	if (name_len == 0) {
-		zend_argument_value_error(1, "cannot be empty");
+		zend_argument_must_not_be_empty_error(1);
 		RETURN_THROWS();
 	}
 

ext/dom/element.c

@@ -411,7 +411,7 @@ PHP_METHOD(DOMElement, setAttribute)
 	}
 
 	if (name_len == 0) {
-		zend_argument_value_error(1, "cannot be empty");
+		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_value_error(2, "cannot be empty");
+		zend_argument_must_not_be_empty_error(2);
 		return;
 	}
 

ext/dom/html_document.c

@@ -1283,7 +1283,7 @@ PHP_METHOD(Dom_HTMLDocument, saveHtmlFile)
 	}
 
 	if (file_len == 0) {
-		zend_argument_value_error(1, "must not be empty");
+		zend_argument_must_not_be_empty_error(1);
 		RETURN_THROWS();
 	}
 

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

@@ -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}

ext/enchant/enchant.c

@@ -447,7 +447,7 @@ PHP_FUNCTION(enchant_broker_request_dict)
 	PHP_ENCHANT_GET_BROKER;
 
 	if (taglen == 0) {
-		zend_argument_value_error(2, "cannot be empty");
+		zend_argument_must_not_be_empty_error(2);
 		RETURN_THROWS();
 	}
 

ext/enchant/tests/broker_request_dict_error_on_empty_tag.phpt

@@ -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

ext/exif/exif.c

@@ -4550,7 +4550,7 @@ PHP_FUNCTION(exif_read_data)
 		}
 
 		if (!Z_STRLEN_P(stream)) {
-			zend_argument_value_error(1, "cannot be empty");
+			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_value_error(1, "cannot be empty");
+			zend_argument_must_not_be_empty_error(1);
 			RETURN_THROWS();
 		}
 

ext/exif/tests/filename_empty.phpt

@@ -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

ext/fileinfo/fileinfo.c

@@ -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_value_error(1, "cannot be empty");
+				zend_argument_must_not_be_empty_error(1);
 				goto clean;
 			}
 			if (CHECK_NULL_PATH(buffer, buffer_len)) {

ext/fileinfo/tests/finfo_file_001.phpt

@@ -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

ext/fileinfo/tests/mime_content_type_001.phpt

@@ -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

ext/filter/logical_filters.c

@@ -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;

ext/filter/tests/bug51368.phpt

@@ -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

ext/gd/gd.c

@@ -646,7 +646,7 @@ PHP_FUNCTION(imagesetstyle)
 
 	num_styles = zend_hash_num_elements(Z_ARRVAL_P(styles));
 	if (num_styles == 0) {
-		zend_argument_value_error(2, "cannot be empty");
+		zend_argument_must_not_be_empty_error(2);
 		RETURN_THROWS();
 	}
 

ext/gd/tests/bug72709.phpt

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

ext/gettext/gettext.c

@@ -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_value_error(_arg_num, "cannot be empty"); \
+		zend_argument_must_not_be_empty_error(_arg_num); \
 		RETURN_THROWS(); \
 	}
 
@@ -190,11 +190,6 @@ PHP_FUNCTION(bindtextdomain)
 
 	PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
 
-	if (!ZSTR_LEN(domain)) {
-		zend_argument_value_error(1, "cannot be empty");
-		RETURN_THROWS();
-	}
-
 	if (dir == NULL) {
 		RETURN_STRING(bindtextdomain(ZSTR_VAL(domain), NULL));
 	}
@@ -312,11 +307,6 @@ PHP_FUNCTION(bind_textdomain_codeset)
 
 	PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
 
-	if (!ZSTR_LEN(domain)) {
-		zend_argument_value_error(1, "cannot be empty");
-		RETURN_THROWS();
-	}
-
 	retval = bind_textdomain_codeset(ZSTR_VAL(domain), codeset ? ZSTR_VAL(codeset) : NULL);
 
 	if (!retval) {

ext/gettext/tests/dcngettext.phpt

@@ -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

ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt

@@ -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--

ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt

@@ -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

ext/gettext/tests/gettext_textdomain-retval.phpt

@@ -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