Revert "fix typos "paramer" -> "parameters""

ABI BC break

This reverts commit 6ac12f13379f3fc19f07abb9d1055274e5f98838.

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 08040b1e51ac15a6baa4d7956da751240582d618..0e6d89fc8a9c22dba793b263526de11f257b338d 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -197,7 +197,7 @@ ZEND_API char *zend_zval_type_name(const zval *arg) /* {{{ */
 /* }}} */
 
 #ifdef FAST_ZPP
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(int num_args, int min_num_args, int max_num_args) /* {{{ */
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramers_count_error(int num_args, int min_num_args, int max_num_args) /* {{{ */
 {
        zend_function *active_function = EG(current_execute_data)->func;
        const char *class_name = active_function->common.scope ? ZSTR_VAL(active_function->common.scope->name) : "";
@@ -213,7 +213,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(int num_
 }
 /* }}} */
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, zend_expected_type expected_type, zval *arg) /* {{{ */
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int num, zend_expected_type expected_type, zval *arg) /* {{{ */
 {
        const char *space;
        const char *class_name = get_active_class_name(&space);
@@ -227,7 +227,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, z
 }
 /* }}} */
 
-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_paramer_class_error(int num, char *name, zval *arg) /* {{{ */
 {
        const char *space;
        const char *class_name = get_active_class_name(&space);

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 7b511d16ab4ec9ab9ccb44c17d18a7bdaa233d98..6f6c391074f4a163e38cb73630e36f86140ebb5b 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -692,9 +692,9 @@ typedef enum _zend_expected_type {
        Z_EXPECTED_LAST
 } zend_expected_type;
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(int num_args, int min_num_args, int max_num_args);
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, zend_expected_type expected_type, zval *arg);
-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_paramers_count_error(int num_args, int min_num_args, int max_num_args);
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int num, zend_expected_type expected_type, zval *arg);
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_class_error(int num, char *name, zval *arg);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, char *error);
 
 #define ZPP_ERROR_OK             0
@@ -729,7 +729,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, in
                            (UNEXPECTED(_num_args > _max_num_args) && \
                             EXPECTED(_max_num_args >= 0))) { \
                                if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
-                                       zend_wrong_parameters_count_error(_num_args, _min_num_args, _max_num_args); \
+                                       zend_wrong_paramers_count_error(_num_args, _min_num_args, _max_num_args); \
                                } \
                                error_code = ZPP_ERROR_FAILURE; \
                                break; \
@@ -747,9 +747,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, in
                                if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \
                                        zend_wrong_callback_error(E_WARNING, _i, _error); \
                                } else if (error_code == ZPP_ERROR_WRONG_CLASS) { \
-                                       zend_wrong_parameter_class_error(_i, _error, _arg); \
+                                       zend_wrong_paramer_class_error(_i, _error, _arg); \
                                } else if (error_code == ZPP_ERROR_WRONG_ARG) { \
-                                       zend_wrong_parameter_type_error(_i, _expected_type, _arg); \
+                                       zend_wrong_paramer_type_error(_i, _expected_type, _arg); \
                                } \
                        } \
                        failure; \