Amend error messages

Author: Girgias

ext/imap/php_imap.c

@@ -715,8 +715,7 @@ PHP_FUNCTION(imap_open)
 
 	if (flags && ((flags & ~(OP_READONLY | OP_ANONYMOUS | OP_HALFOPEN | CL_EXPUNGE | OP_DEBUG | OP_SHORTCACHE
 	 		| OP_SILENT | OP_PROTOTYPE | OP_SECURE)) != 0)) {
-		zend_argument_value_error(4, "must be a bitmask of OP_READONLY, OP_ANONYMOUS, OP_HALFOPEN, CL_EXPUNGE, "
-			"OP_DEBUG, OP_SHORTCACHE, OP_SILENT, OP_PROTOTYPE, and OP_SECURE");
+		zend_argument_value_error(4, "must be a bitmask of the OP_* constants, and CL_EXPUNGE");
 		RETURN_THROWS();
 	}
 
@@ -2720,7 +2719,7 @@ PHP_FUNCTION(imap_sort)
 
 	if (!(sort == SORTDATE || sort == SORTARRIVAL || sort == SORTFROM || sort == SORTSUBJECT || sort == SORTTO ||
 			sort == SORTCC || sort == SORTSIZE) ) {
-		zend_argument_value_error(2, "must be one of SORTDATE, SORTARRIVAL, SORTFROM, SORTSUBJECT, SORTTO, SORTCC, or SORTSIZE");
+		zend_argument_value_error(2, "must be one of the SORT* constants");
 		RETURN_THROWS();
 	}
 
@@ -2860,8 +2859,7 @@ PHP_FUNCTION(imap_status)
 	}
 
 	if (flags && ((flags & ~(SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY /*| SA_ALL*/)) != 0)) {
-		zend_argument_value_error(3, "must be a bitmask of SA_MESSAGES, SA_RECENT, SA_UNSEEN, "
-			"SA_UIDNEXT, SA_UIDVALIDITY, and SA_ALL");
+		zend_argument_value_error(3, "must be a bitmask of SA_* constants");
 		RETURN_THROWS();
 	}
 

ext/imap/tests/imap_open_error.phpt

@@ -32,7 +32,7 @@ try {
 Checking with incorrect parameters
 
 Warning: imap_open(): Couldn't open stream  in %s on line %d
-imap_open(): Argument #4 ($options) must be a bitmask of OP_READONLY, OP_ANONYMOUS, OP_HALFOPEN, CL_EXPUNGE, OP_DEBUG, OP_SHORTCACHE, OP_SILENT, OP_PROTOTYPE, and OP_SECURE
+imap_open(): Argument #4 ($options) must be a bitmask of the OP_* constants, and CL_EXPUNGE
 imap_open(): Argument #5 ($n_retries) must be greater than or equal to 0
 
 Notice: Unknown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0