Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Don't identify alias'ed functions

  • Loading branch information...
commit cec053f70763e9974b48836e37adcc03a8f052b6 1 parent ea36fc4
Marcus Boerger authored
View
2  Zend/zend_API.h
@@ -50,7 +50,7 @@ typedef struct _zend_function_entry {
#define ZEND_NAMED_FE(zend_name, name, arg_info) ZEND_FENTRY(zend_name, name, arg_info, 0)
#define ZEND_FE(name, arg_info) ZEND_FENTRY(name, ZEND_FN(name), arg_info, 0)
-#define ZEND_FALIAS(name, alias, arg_info) ZEND_FENTRY(name, ZEND_FN(alias), arg_info, ZEND_ACC_PUBLIC|ZEND_ACC_ALIAS)
+#define ZEND_FALIAS(name, alias, arg_info) ZEND_FENTRY(name, ZEND_FN(alias), arg_info, 0)
#define ZEND_ME(classname, name, arg_info, flags) ZEND_FENTRY(name, ZEND_FN(classname##_##name), arg_info, flags)
#define ZEND_ABSTRACT_ME(classname, name, arg_info) ZEND_FENTRY(name, NULL, arg_info, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
View
2  Zend/zend_compile.h
@@ -113,8 +113,6 @@ typedef struct _zend_brk_cont_element {
#define ZEND_ACC_CTOR 0x2000
#define ZEND_ACC_DTOR 0x4000
-#define ZEND_ACC_ALIAS 0x8000
-
char *zend_visibility_string(zend_uint fn_flags);
View
11 Zend/zend_reflection_api.c
@@ -357,9 +357,6 @@ static void _function_string(string *str, zend_function *fptr, char* indent TSRM
string_printf(str, fptr->common.scope ? "%sMethod [ " : "%sFunction [ ", indent);
string_printf(str, (fptr->type == ZEND_USER_FUNCTION) ? "<user> " : "<internal> ");
- if (fptr->common.fn_flags & ZEND_ACC_ALIAS) {
- string_printf(str, "<alias> ");
- }
if (fptr->common.fn_flags & ZEND_ACC_CTOR) {
string_printf(str, "<ctor> ");
}
@@ -643,14 +640,6 @@ ZEND_METHOD(reflection_function, isuserdefined)
}
/* }}} */
-/* {{{ proto public bool Reflection_Function::isAlias()
- Returns whether this method is static */
-ZEND_METHOD(reflection_function, isalias)
-{
- _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_ALIAS);
-}
-/* }}} */
-
/* {{{ proto public string Reflection_Function::getFileName()
Returns the filename of the file this function was declared in */
ZEND_METHOD(reflection_function, getfilename)
View
11 ext/reflection/php_reflection.c
@@ -357,9 +357,6 @@ static void _function_string(string *str, zend_function *fptr, char* indent TSRM
string_printf(str, fptr->common.scope ? "%sMethod [ " : "%sFunction [ ", indent);
string_printf(str, (fptr->type == ZEND_USER_FUNCTION) ? "<user> " : "<internal> ");
- if (fptr->common.fn_flags & ZEND_ACC_ALIAS) {
- string_printf(str, "<alias> ");
- }
if (fptr->common.fn_flags & ZEND_ACC_CTOR) {
string_printf(str, "<ctor> ");
}
@@ -643,14 +640,6 @@ ZEND_METHOD(reflection_function, isuserdefined)
}
/* }}} */
-/* {{{ proto public bool Reflection_Function::isAlias()
- Returns whether this method is static */
-ZEND_METHOD(reflection_function, isalias)
-{
- _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_ALIAS);
-}
-/* }}} */
-
/* {{{ proto public string Reflection_Function::getFileName()
Returns the filename of the file this function was declared in */
ZEND_METHOD(reflection_function, getfilename)

0 comments on commit cec053f

Please sign in to comment.
Something went wrong with that request. Please try again.