Skip to content

Commit 927b9ee

Browse files
arshidkv12arshidkv12
authored
Drop unused error_type argument from zend_check_magic_method_public() (GH-21095)
1 parent 6a08718 commit 927b9ee

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎Zend/zend_API.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2743,7 +2743,7 @@ static void zend_check_magic_method_static(
27432743
}
27442744

27452745
static void zend_check_magic_method_public(
2746-
const zend_class_entry *ce, const zend_function *fptr, int error_type)
2746+
const zend_class_entry *ce, const zend_function *fptr)
27472747
{
27482748
// TODO: Remove this warning after adding proper visibility handling.
27492749
if (!(fptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
@@ -2786,77 +2786,77 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
27862786
} else if (zend_string_equals_literal(lcname, ZEND_GET_FUNC_NAME)) {
27872787
zend_check_magic_method_args(1, ce, fptr, error_type);
27882788
zend_check_magic_method_non_static(ce, fptr, error_type);
2789-
zend_check_magic_method_public(ce, fptr, error_type);
2789+
zend_check_magic_method_public(ce, fptr);
27902790
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_STRING);
27912791
} else if (zend_string_equals_literal(lcname, ZEND_SET_FUNC_NAME)) {
27922792
zend_check_magic_method_args(2, ce, fptr, error_type);
27932793
zend_check_magic_method_non_static(ce, fptr, error_type);
2794-
zend_check_magic_method_public(ce, fptr, error_type);
2794+
zend_check_magic_method_public(ce, fptr);
27952795
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_STRING);
27962796
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_VOID);
27972797
} else if (zend_string_equals_literal(lcname, ZEND_UNSET_FUNC_NAME)) {
27982798
zend_check_magic_method_args(1, ce, fptr, error_type);
27992799
zend_check_magic_method_non_static(ce, fptr, error_type);
2800-
zend_check_magic_method_public(ce, fptr, error_type);
2800+
zend_check_magic_method_public(ce, fptr);
28012801
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_STRING);
28022802
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_VOID);
28032803
} else if (zend_string_equals_literal(lcname, ZEND_ISSET_FUNC_NAME)) {
28042804
zend_check_magic_method_args(1, ce, fptr, error_type);
28052805
zend_check_magic_method_non_static(ce, fptr, error_type);
2806-
zend_check_magic_method_public(ce, fptr, error_type);
2806+
zend_check_magic_method_public(ce, fptr);
28072807
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_STRING);
28082808
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_BOOL);
28092809
} else if (zend_string_equals_literal(lcname, ZEND_CALL_FUNC_NAME)) {
28102810
zend_check_magic_method_args(2, ce, fptr, error_type);
28112811
zend_check_magic_method_non_static(ce, fptr, error_type);
2812-
zend_check_magic_method_public(ce, fptr, error_type);
2812+
zend_check_magic_method_public(ce, fptr);
28132813
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_STRING);
28142814
zend_check_magic_method_arg_type(1, ce, fptr, error_type, MAY_BE_ARRAY);
28152815
} else if (zend_string_equals_literal(lcname, ZEND_CALLSTATIC_FUNC_NAME)) {
28162816
zend_check_magic_method_args(2, ce, fptr, error_type);
28172817
zend_check_magic_method_static(ce, fptr, error_type);
2818-
zend_check_magic_method_public(ce, fptr, error_type);
2818+
zend_check_magic_method_public(ce, fptr);
28192819
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_STRING);
28202820
zend_check_magic_method_arg_type(1, ce, fptr, error_type, MAY_BE_ARRAY);
28212821
} else if (zend_string_equals_literal(lcname, ZEND_TOSTRING_FUNC_NAME)) {
28222822
zend_check_magic_method_args(0, ce, fptr, error_type);
28232823
zend_check_magic_method_non_static(ce, fptr, error_type);
2824-
zend_check_magic_method_public(ce, fptr, error_type);
2824+
zend_check_magic_method_public(ce, fptr);
28252825
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_STRING);
28262826
} else if (zend_string_equals_literal(lcname, ZEND_DEBUGINFO_FUNC_NAME)) {
28272827
zend_check_magic_method_args(0, ce, fptr, error_type);
28282828
zend_check_magic_method_non_static(ce, fptr, error_type);
2829-
zend_check_magic_method_public(ce, fptr, error_type);
2829+
zend_check_magic_method_public(ce, fptr);
28302830
zend_check_magic_method_return_type(ce, fptr, error_type, (MAY_BE_ARRAY | MAY_BE_NULL));
28312831
} else if (zend_string_equals_literal(lcname, "__serialize")) {
28322832
zend_check_magic_method_args(0, ce, fptr, error_type);
28332833
zend_check_magic_method_non_static(ce, fptr, error_type);
2834-
zend_check_magic_method_public(ce, fptr, error_type);
2834+
zend_check_magic_method_public(ce, fptr);
28352835
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_ARRAY);
28362836
} else if (zend_string_equals_literal(lcname, "__unserialize")) {
28372837
zend_check_magic_method_args(1, ce, fptr, error_type);
28382838
zend_check_magic_method_non_static(ce, fptr, error_type);
2839-
zend_check_magic_method_public(ce, fptr, error_type);
2839+
zend_check_magic_method_public(ce, fptr);
28402840
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_ARRAY);
28412841
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_VOID);
28422842
} else if (zend_string_equals_literal(lcname, "__set_state")) {
28432843
zend_check_magic_method_args(1, ce, fptr, error_type);
28442844
zend_check_magic_method_static(ce, fptr, error_type);
2845-
zend_check_magic_method_public(ce, fptr, error_type);
2845+
zend_check_magic_method_public(ce, fptr);
28462846
zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_ARRAY);
28472847
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_OBJECT);
28482848
} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE))) {
28492849
zend_check_magic_method_non_static(ce, fptr, error_type);
2850-
zend_check_magic_method_public(ce, fptr, error_type);
2850+
zend_check_magic_method_public(ce, fptr);
28512851
} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_SLEEP))) {
28522852
zend_check_magic_method_args(0, ce, fptr, error_type);
28532853
zend_check_magic_method_non_static(ce, fptr, error_type);
2854-
zend_check_magic_method_public(ce, fptr, error_type);
2854+
zend_check_magic_method_public(ce, fptr);
28552855
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_ARRAY);
28562856
} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_WAKEUP))) {
28572857
zend_check_magic_method_args(0, ce, fptr, error_type);
28582858
zend_check_magic_method_non_static(ce, fptr, error_type);
2859-
zend_check_magic_method_public(ce, fptr, error_type);
2859+
zend_check_magic_method_public(ce, fptr);
28602860
zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_VOID);
28612861
}
28622862
}

0 commit comments

Comments
 (0)