Refactor zend_expected_type partially, as some ZPP errors need special handling anyway

Author: Girgias

Zend/zend_API.c

@@ -229,7 +229,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(uint32_t n
 {
 	static const char * const expected_error[] = {
 		Z_EXPECTED_TYPES(Z_EXPECTED_TYPE_STR)
-		NULL
 	};
 
 	if (EG(exception)) {
@@ -1081,7 +1080,7 @@ static zend_expected_type zend_parse_arg_impl(zval *arg, va_list *va, const char
 
 	*spec = spec_walk;
 
-	return Z_EXPECTED_LAST;
+	return Z_EXPECTED_OK;
 }
 /* }}} */
 
@@ -1090,7 +1089,7 @@ static zend_result zend_parse_arg(uint32_t arg_num, zval *arg, va_list *va, cons
 	char *error = NULL;
 
 	zend_expected_type expected_type = zend_parse_arg_impl(arg, va, spec, &error, arg_num);
-	if (expected_type != Z_EXPECTED_LAST) {
+	if (expected_type != Z_EXPECTED_OK) {
 		if (EG(exception)) {
 			return FAILURE;
 		}

Zend/zend_API.h

@@ -1555,8 +1555,6 @@ static zend_always_inline zval *zend_try_array_init(zval *zv)
 	_(Z_EXPECTED_ARRAY_OR_LONG_OR_NULL, "of type array|int|null") \
 	_(Z_EXPECTED_ITERABLE,				"of type Traversable|array") \
 	_(Z_EXPECTED_ITERABLE_OR_NULL,		"of type Traversable|array|null") \
-	_(Z_EXPECTED_FUNC,				"a valid callback") \
-	_(Z_EXPECTED_FUNC_OR_NULL,		"a valid callback or null") \
 	_(Z_EXPECTED_RESOURCE,			"of type resource") \
 	_(Z_EXPECTED_RESOURCE_OR_NULL,	"of type resource or null") \
 	_(Z_EXPECTED_PATH,				"of type string") \
@@ -1577,8 +1575,12 @@ static zend_always_inline zval *zend_try_array_init(zval *zv)
 	_(Z_EXPECTED_OBJECT_OR_CLASS_NAME_OR_NULL, "an object, a valid class name, or null") \
 	_(Z_EXPECTED_OBJECT_OR_STRING,	"of type object|string") \
 	_(Z_EXPECTED_OBJECT_OR_STRING_OR_NULL, "of type object|string|null") \
-	_(Z_EXPECTED_CLASS_NAME,	"a valid class name") \
-	_(Z_EXPECTED_CLASS_NAME_OR_NULL, "a valid class name or null") \
+	/* Have special error message behaviour */ \
+	_(Z_EXPECTED_FUNC,				NULL) \
+	_(Z_EXPECTED_FUNC_OR_NULL,		NULL) \
+	_(Z_EXPECTED_CLASS_NAME,	NULL) \
+	_(Z_EXPECTED_CLASS_NAME_OR_NULL, NULL) \
+	_(Z_EXPECTED_OK, NULL) \
 
 #define Z_EXPECTED_TYPE
 
@@ -1587,7 +1589,6 @@ static zend_always_inline zval *zend_try_array_init(zval *zv)
 
 typedef enum _zend_expected_type {
 	Z_EXPECTED_TYPES(Z_EXPECTED_TYPE_ENUM)
-	Z_EXPECTED_LAST
 } zend_expected_type;
 
 C23_ENUM(zpp_error, uint8_t) {
@@ -1638,7 +1639,7 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string
 		uint32_t _num_args = EX_NUM_ARGS(); \
 		uint32_t _i = 0; \
 		zval *_real_arg, *_arg = NULL; \
-		zend_expected_type _expected_type = Z_EXPECTED_LONG; \
+		zend_expected_type _expected_type = Z_EXPECTED_OK; \
 		char *_error = NULL; \
 		bool _dummy = 0; \
 		bool _optional = 0; \