Remove more leftovers from invalid static calls

nikic · nikic · commit e93bbf4d5d28 · 2019-01-30T13:13:47.000+01:00
Callbacks are now always valid or not valid, there is no in-between.
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -315,17 +315,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
 }
 /* }}} */
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_deprecated(int num, char *error) /* {{{ */
-{
-	const char *space;
-	const char *class_name = get_active_class_name(&space);
-
-	zend_error(E_DEPRECATED, "%s%s%s() expects parameter %d to be a valid callback, %s",
-		class_name, space, get_active_function_name(), num, error);
-	efree(error);
-}
-/* }}} */
-
 ZEND_API int ZEND_FASTCALL zend_parse_arg_class(zval *arg, zend_class_entry **pce, int num, int check_null) /* {{{ */
 {
 	zend_class_entry *ce_base = *pce;
@@ -557,7 +546,7 @@ ZEND_API int ZEND_FASTCALL zend_parse_arg_str_slow(zval *arg, zend_string **dest
 }
 /* }}} */
 
-static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, const char **spec, char **error, int *severity) /* {{{ */
+static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, const char **spec, char **error) /* {{{ */
 {
 	const char *spec_walk = *spec;
 	char c = *spec_walk++;
@@ -773,7 +762,6 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 				}
 
 				if (is_callable_error) {
-					*severity = E_ERROR;
 					zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error);
 					efree(is_callable_error);
 					return "";
@@ -807,9 +795,8 @@ static int zend_parse_arg(int arg_num, zval *arg, va_list *va, const char **spec
 {
 	const char *expected_type = NULL;
 	char *error = NULL;
-	int severity = 0;
 
-	expected_type = zend_parse_arg_impl(arg_num, arg, va, spec, &error, &severity);
+	expected_type = zend_parse_arg_impl(arg_num, arg, va, spec, &error);
 	if (expected_type) {
 		if (!(flags & ZEND_PARSE_PARAMS_QUIET) && (*expected_type || error)) {
 			const char *space;
@@ -828,9 +815,7 @@ static int zend_parse_arg(int arg_num, zval *arg, va_list *va, const char **spec
 						zend_zval_type_name(arg));
 			}
 		}
-		if (severity != E_DEPRECATED) {
-			return FAILURE;
-		}
+		return FAILURE;
 	}
 
 	return SUCCESS;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
@@ -951,7 +951,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_exception(int nu
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, char *name, zval *arg);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_exception(int num, char *name, zval *arg);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *error);
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_deprecated(int num, char *error);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, char *error);
 
 #define ZPP_ERROR_OK             0
@@ -1142,14 +1141,11 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
 			if (!_error) { \
 				_expected_type = Z_EXPECTED_FUNC; \
 				_error_code = ZPP_ERROR_WRONG_ARG; \
-				break; \
 			} else { \
 				_error_code = ZPP_ERROR_WRONG_CALLBACK; \
-				break; \
 			} \
-		} else if (UNEXPECTED(_error != NULL)) { \
-			zend_wrong_callback_deprecated(_i, _error); \
-		}
+			break; \
+		} \
 
 #define Z_PARAM_FUNC_EX(dest_fci, dest_fcc, check_null, separate) \
 	Z_PARAM_FUNC_EX2(dest_fci, dest_fcc, check_null, separate, separate)

Original file line number	Diff line number	Diff line change
`@@ -315,17 +315,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha`
`315`	`315`	`}`
`316`	`316`	`/* }}} */`
`317`	`317`
`318`		`-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_deprecated(int num, char error) / {{{ */`
`319`		`-{`
`320`		`- const char *space;`
`321`		`- const char *class_name = get_active_class_name(&space);`
`322`		`-`
`323`		`- zend_error(E_DEPRECATED, "%s%s%s() expects parameter %d to be a valid callback, %s",`
`324`		`- class_name, space, get_active_function_name(), num, error);`
`325`		`- efree(error);`
`326`		`-}`
`327`		`-/* }}} */`
`328`		`-`
`329`	`318`	`ZEND_API int ZEND_FASTCALL zend_parse_arg_class(zval arg, zend_class_entry pce, int num, int check_null) / {{{ */`
`330`	`319`	`{`
`331`	`320`	`zend_class_entry ce_base = pce;`
`@@ -557,7 +546,7 @@ ZEND_API int ZEND_FASTCALL zend_parse_arg_str_slow(zval arg, zend_string *dest`
`557`	`546`	`}`
`558`	`547`	`/* }}} */`
`559`	`548`
`560`		`-static const char zend_parse_arg_impl(int arg_num, zval arg, va_list va, const char spec, char error, int severity) /* {{{ */`
	`549`	`+static const char zend_parse_arg_impl(int arg_num, zval arg, va_list va, const char spec, char error) / {{{ */`
`561`	`550`	`{`
`562`	`551`	`const char spec_walk = spec;`
`563`	`552`	`char c = *spec_walk++;`
`@@ -773,7 +762,6 @@ static const char zend_parse_arg_impl(int arg_num, zval arg, va_list *va, cons`
`773`	`762`	`}`
`774`	`763`
`775`	`764`	`if (is_callable_error) {`
`776`		`- *severity = E_ERROR;`
`777`	`765`	`zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error);`
`778`	`766`	`efree(is_callable_error);`
`779`	`767`	`return "";`
`@@ -807,9 +795,8 @@ static int zend_parse_arg(int arg_num, zval arg, va_list va, const char **spec`
`807`	`795`	`{`
`808`	`796`	`const char *expected_type = NULL;`
`809`	`797`	`char *error = NULL;`
`810`		`- int severity = 0;`
`811`	`798`
`812`		`- expected_type = zend_parse_arg_impl(arg_num, arg, va, spec, &error, &severity);`
	`799`	`+ expected_type = zend_parse_arg_impl(arg_num, arg, va, spec, &error);`
`813`	`800`	`if (expected_type) {`
`814`	`801`	`if (!(flags & ZEND_PARSE_PARAMS_QUIET) && (*expected_type \|\| error)) {`
`815`	`802`	`const char *space;`
`@@ -828,9 +815,7 @@ static int zend_parse_arg(int arg_num, zval arg, va_list va, const char **spec`
`828`	`815`	`zend_zval_type_name(arg));`
`829`	`816`	`}`
`830`	`817`	`}`
`831`		`- if (severity != E_DEPRECATED) {`
`832`		`- return FAILURE;`
`833`		`- }`
	`818`	`+ return FAILURE;`
`834`	`819`	`}`
`835`	`820`
`836`	`821`	`return SUCCESS;`