Merge branch 'PHP-7.4'

* PHP-7.4:
  Convert all php_error_docref0 to php_error_docref

9 files changed, 21 insertions, 23 deletions

diff --git a/ext/dba/dba_lmdb.c b/ext/dba/dba_lmdb.c
index 058c4c3d28..4bc085177d 100644
--- a/ext/dba/dba_lmdb.c
+++ b/ext/dba/dba_lmdb.c
@@ -251,14 +251,14 @@ DBA_FIRSTKEY_FUNC(lmdb)
 
 	rc = mdb_txn_begin(LMDB_IT(env), NULL, MDB_RDONLY, &LMDB_IT(txn));
 	if (rc) {
-		php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
+		php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
 		return NULL;
 	}
 
 	rc = mdb_cursor_open(LMDB_IT(txn), LMDB_IT(dbi), &LMDB_IT(cur));
 	if (rc) {
 		mdb_txn_abort(LMDB_IT(txn));
-		php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
+		php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
 		return NULL;
 	}
 
@@ -268,7 +268,7 @@ DBA_FIRSTKEY_FUNC(lmdb)
 		mdb_cursor_close(LMDB_IT(cur));
 		LMDB_IT(cur) = NULL;
 		if (MDB_NOTFOUND != rc) {
-			php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
+			php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
 		}
 		return NULL;
 	}
@@ -291,7 +291,7 @@ DBA_NEXTKEY_FUNC(lmdb)
 
 	rc = mdb_txn_renew(LMDB_IT(txn));
 	if (rc) {
-		php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
+		php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
 		return NULL;
 	}
 
@@ -301,7 +301,7 @@ DBA_NEXTKEY_FUNC(lmdb)
 		mdb_cursor_close(LMDB_IT(cur));
 		LMDB_IT(cur) = NULL;
 		if (MDB_NOTFOUND != rc) {
-			php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
+			php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
 		}
 		return NULL;
 	}
@@ -327,7 +327,7 @@ DBA_SYNC_FUNC(lmdb)
 
 	rc = mdb_env_sync(LMDB_IT(env), 1);
 	if (rc) {
-			php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
+			php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
 			return FAILURE;
 	}
 
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index 2e5dcda60b..6b45203552 100644
--- a/ext/intl/timezone/timezone_class.cpp
+++ b/ext/intl/timezone/timezone_class.cpp
@@ -505,7 +505,7 @@ U_CFUNC void timezone_register_IntlTimeZone_class(void)
 	TimeZone_ce_ptr = zend_register_internal_class(&ce);
 	if (!TimeZone_ce_ptr) {
 		//can't happen now without bigger problems before
-		php_error_docref0(NULL, E_ERROR,
+		php_error_docref(NULL, E_ERROR,
 			"IntlTimeZone: class registration has failed.");
 		return;
 	}
diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c
index c9e0f83c0b..e1134230e8 100644
--- a/ext/intl/transliterator/transliterator_class.c
+++ b/ext/intl/transliterator/transliterator_class.c
@@ -217,7 +217,7 @@ static zval *Transliterator_read_property( zend_object *object, zend_string *nam
 		( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
 		ZSTR_VAL( name ), ZSTR_LEN( name ) ) == 0 ) )
 	{
-		php_error_docref0( NULL, E_WARNING, "The property \"id\" is read-only" );
+		php_error_docref(NULL, E_WARNING, "The property \"id\" is read-only" );
 		retval = &EG( uninitialized_zval );
 	}
 	else
@@ -245,7 +245,7 @@ static zval *Transliterator_write_property( zend_object *object, zend_string *na
 		( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
 		ZSTR_VAL( name ), ZSTR_LEN( name ) ) == 0 ) )
 	{
-		php_error_docref0( NULL, E_WARNING, "The property \"id\" is read-only" );
+		php_error_docref(NULL, E_WARNING, "The property \"id\" is read-only" );
 	}
 	else
 	{
diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c
index 4f526c7ba8..81a643e666 100644
--- a/ext/intl/transliterator/transliterator_methods.c
+++ b/ext/intl/transliterator/transliterator_methods.c
@@ -326,7 +326,7 @@ PHP_FUNCTION( transliterator_transliterate )
 			if( res == FAILURE )
 			{
 				zend_string *message = intl_error_get_message( NULL );
-				php_error_docref0( NULL, E_WARNING, "Could not create "
+				php_error_docref(NULL, E_WARNING, "Could not create "
 					"transliterator with ID \"%s\" (%s)", Z_STRVAL_P( arg1 ), ZSTR_VAL(message) );
 				zend_string_free( message );
 				ZVAL_UNDEF(&tmp_object);
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index cbddc9d096..b7dae45407 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -199,7 +199,7 @@ static void do_to_zval_err(res_context *ctx, const char *fmt, ...)
 void err_msg_dispose(struct err_s *err)
 {
 	if (err->msg != NULL) {
-		php_error_docref0(NULL, err->level, "%s", err->msg);
+		php_error_docref(NULL, err->level, "%s", err->msg);
 		if (err->should_free) {
 			efree(err->msg);
 		}
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 27bee1edce..ce3cb79605 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -71,7 +71,7 @@ inline ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags)
 #define LONG_CHECK_VALID_INT(l) \
 	do { \
 		if ((l) < INT_MIN && (l) > INT_MAX) { \
-			php_error_docref0(NULL, E_WARNING, "The value " ZEND_LONG_FMT " does not fit inside " \
+			php_error_docref(NULL, E_WARNING, "The value " ZEND_LONG_FMT " does not fit inside " \
 					"the boundaries of a native integer", (l)); \
 			return; \
 		} \
@@ -292,14 +292,14 @@ PHP_FUNCTION(socket_cmsg_space)
 	LONG_CHECK_VALID_INT(n);
 
 	if (n < 0) {
-		php_error_docref0(NULL, E_WARNING, "The third argument "
+		php_error_docref(NULL, E_WARNING, "The third argument "
 				"cannot be negative");
 		return;
 	}
 
 	entry = get_ancillary_reg_entry(level, type);
 	if (entry == NULL) {
-		php_error_docref0(NULL, E_WARNING, "The pair level " ZEND_LONG_FMT "/type " ZEND_LONG_FMT " is "
+		php_error_docref(NULL, E_WARNING, "The pair level " ZEND_LONG_FMT "/type " ZEND_LONG_FMT " is "
 				"not supported by PHP", level, type);
 		return;
 	}
@@ -307,7 +307,7 @@ PHP_FUNCTION(socket_cmsg_space)
 	if (entry->var_el_size > 0 && n > (zend_long)((ZEND_LONG_MAX - entry->size -
 			CMSG_SPACE(0) - 15L) / entry->var_el_size)) {
 		/* the -15 is to account for any padding CMSG_SPACE may add after the data */
-		php_error_docref0(NULL, E_WARNING, "The value for the "
+		php_error_docref(NULL, E_WARNING, "The value for the "
 				"third argument (" ZEND_LONG_FMT ") is too large", n);
 		return;
 	}
@@ -331,7 +331,7 @@ int php_do_setsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname,
 	case IPV6_PKTINFO:
 #ifdef PHP_WIN32
 		if (Z_TYPE_P(arg4) == IS_ARRAY) {
-			php_error_docref0(NULL, E_WARNING, "Windows does not "
+			php_error_docref(NULL, E_WARNING, "Windows does not "
 					"support sticky IPV6_PKTINFO");
 			return FAILURE;
 		} else {
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 0de4679788..a724338e4a 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1187,7 +1187,7 @@ PHPAPI zend_string *php_escape_html_entities_ex(unsigned char *old, size_t oldle
 
 	if (all) { /* replace with all named entities */
 		if (CHARSET_PARTIAL_SUPPORT(charset)) {
-			php_error_docref0(NULL, E_STRICT, "Only basic entities "
+			php_error_docref(NULL, E_STRICT, "Only basic entities "
 				"substitution is supported for multi-byte encodings other than UTF-8; "
 				"functionality is equivalent to htmlspecialchars");
 		}
diff --git a/main/main.c b/main/main.c
index 0841bd4829..2d7ff3ac6b 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1150,9 +1150,9 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
 }
 /* }}} */
 
-/* {{{ php_error_docref0 */
-/* See: CODING_STANDARDS.md for details. */
-PHPAPI ZEND_COLD void php_error_docref0(const char *docref, int type, const char *format, ...)
+/* {{{ php_error_docref */
+/* Generate an error which links to docref or the php.net documentation if docref is NULL */
+PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...)
 {
 	va_list args;
 
diff --git a/main/php.h b/main/php.h
index 2d0a1f8ce1..c74f76f2ab 100644
--- a/main/php.h
+++ b/main/php.h
@@ -339,7 +339,7 @@ static inline ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {}
 PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int type, const char *format, va_list args) PHP_ATTRIBUTE_FORMAT(printf, 4, 0);
 
 /* PHPAPI void php_error(int type, const char *format, ...); */
-PHPAPI ZEND_COLD void php_error_docref0(const char *docref, int type, const char *format, ...)
+PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...)
 	PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
 PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...)
 	PHP_ATTRIBUTE_FORMAT(printf, 4, 5);
@@ -350,8 +350,6 @@ PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *para
 #endif
 END_EXTERN_C()
 
-#define php_error_docref php_error_docref0
-
 #define zenderror phperror
 #define zendlex phplex