Index: Zend/zend_reflection_api.c =================================================================== RCS file: /repository/ZendEngine2/zend_reflection_api.c,v retrieving revision 1.163 diff -u -p -d -r1.163 zend_reflection_api.c --- Zend/zend_reflection_api.c 7 Jul 2005 16:07:09 -0000 1.163 +++ Zend/zend_reflection_api.c 2 Aug 2005 18:51:16 -0000 @@ -41,13 +41,13 @@ zend_class_entry *reflection_property_pt zend_class_entry *reflection_extension_ptr; /* Method macros */ -#define METHOD_NOTSTATIC \ - if (!this_ptr) { \ +#define METHOD_NOTSTATIC(ce) \ + if (!this_ptr || !instanceof_function(Z_OBJCE_P(this_ptr), ce TSRMLS_CC)) { \ zend_error(E_ERROR, "%s() cannot be called statically", get_active_function_name(TSRMLS_C)); \ return; \ } \ -#define METHOD_NOTSTATIC_NUMPARAMS(c) METHOD_NOTSTATIC \ +#define METHOD_NOTSTATIC_NUMPARAMS(ce, c) METHOD_NOTSTATIC(ce) \ if (ZEND_NUM_ARGS() > c) { \ ZEND_WRONG_PARAM_COUNT(); \ } \ @@ -852,7 +852,7 @@ static void _function_check_flag(INTERNA reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & mask); } @@ -1252,7 +1252,7 @@ ZEND_METHOD(reflection_function, __toStr zend_function *fptr; string str; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); string_init(&str); _function_string(&str, fptr, "" TSRMLS_CC); @@ -1264,7 +1264,7 @@ ZEND_METHOD(reflection_function, __toStr Returns this function's name */ ZEND_METHOD(reflection, function_getName) { - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -1276,7 +1276,7 @@ ZEND_METHOD(reflection, function_isInter reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_INTERNAL_FUNCTION); } @@ -1289,7 +1289,7 @@ ZEND_METHOD(reflection_function, isUserD reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_USER_FUNCTION); } @@ -1302,7 +1302,7 @@ ZEND_METHOD(reflection_function, getFile reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_STRING(fptr->op_array.filename, 1); @@ -1318,7 +1318,7 @@ ZEND_METHOD(reflection_function, getStar reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_LONG(fptr->op_array.line_start); @@ -1334,7 +1334,7 @@ ZEND_METHOD(reflection_function, getEndL reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_LONG(fptr->op_array.line_end); @@ -1350,7 +1350,7 @@ ZEND_METHOD(reflection_function, getDocC reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.doc_comment) { RETURN_STRINGL(fptr->op_array.doc_comment, fptr->op_array.doc_comment_len, 1); @@ -1367,7 +1367,7 @@ ZEND_METHOD(reflection_function, getStat reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); GET_REFLECTION_OBJECT_PTR(fptr); /* Return an empty array in case no static variables exist */ @@ -1391,7 +1391,7 @@ ZEND_METHOD(reflection_function, invoke) reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_function_ptr); GET_REFLECTION_OBJECT_PTR(fptr); params = safe_emalloc(sizeof(zval **), argc, 0); @@ -1451,7 +1451,7 @@ ZEND_METHOD(reflection_function, invokeA zend_function *fptr; zval *param_array; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_function_ptr); GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", ¶m_array) == FAILURE) { @@ -1502,7 +1502,7 @@ ZEND_METHOD(reflection_function, returns reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_function_ptr); GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->op_array.return_reference); @@ -1516,7 +1516,7 @@ ZEND_METHOD(reflection_function, getNumb reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_function_ptr); GET_REFLECTION_OBJECT_PTR(fptr); RETURN_LONG(fptr->common.num_args); @@ -1530,7 +1530,7 @@ ZEND_METHOD(reflection_function, getNumb reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_function_ptr); GET_REFLECTION_OBJECT_PTR(fptr); RETURN_LONG(fptr->common.required_num_args); @@ -1546,7 +1546,7 @@ ZEND_METHOD(reflection_function, getPara zend_uint i; struct _zend_arg_info *arg_info; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_function_ptr); GET_REFLECTION_OBJECT_PTR(fptr); arg_info= fptr->common.arg_info; @@ -1708,7 +1708,7 @@ ZEND_METHOD(reflection_parameter, __toSt parameter_reference *param; string str; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); string_init(&str); _parameter_string(&str, param->fptr, param->arg_info, param->offset, param->required, "" TSRMLS_CC); @@ -1720,7 +1720,7 @@ ZEND_METHOD(reflection_parameter, __toSt Returns this parameters's name */ ZEND_METHOD(reflection_parameter, getName) { - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -1732,7 +1732,7 @@ ZEND_METHOD(reflection_parameter, getCla reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); if (!param->arg_info->class_name) { @@ -1760,7 +1760,7 @@ ZEND_METHOD(reflection_parameter, isArra reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->array_type_hint); @@ -1774,7 +1774,7 @@ ZEND_METHOD(reflection_parameter, allows reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->allow_null); @@ -1788,7 +1788,7 @@ ZEND_METHOD(reflection_parameter, isPass reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->pass_by_reference); @@ -1802,7 +1802,7 @@ ZEND_METHOD(reflection_parameter, isOpti reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->offset >= param->required); @@ -1817,7 +1817,7 @@ ZEND_METHOD(reflection_parameter, isDefa parameter_reference *param; zend_op *precv; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->type != ZEND_USER_FUNCTION) @@ -1844,7 +1844,7 @@ ZEND_METHOD(reflection_parameter, getDef zend_op *precv; zval *zv, zv_copy; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->type != ZEND_USER_FUNCTION) @@ -1953,7 +1953,7 @@ ZEND_METHOD(reflection_method, __toStrin zend_function *mptr; string str; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); GET_REFLECTION_OBJECT_PTR(mptr); string_init(&str); _function_string(&str, mptr, "" TSRMLS_CC); @@ -1976,7 +1976,7 @@ ZEND_METHOD(reflection_method, invoke) zend_fcall_info_cache fcc; zend_class_entry *obj_ce; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_method_ptr); if (argc < 1) { zend_error(E_WARNING, "Invoke() expects at least one parameter, none given"); @@ -2080,7 +2080,7 @@ ZEND_METHOD(reflection_method, invokeArg zend_class_entry *obj_ce; zval *param_array; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_method_ptr); GET_REFLECTION_OBJECT_PTR(mptr); @@ -2223,7 +2223,7 @@ ZEND_METHOD(reflection_method, isConstru reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); GET_REFLECTION_OBJECT_PTR(mptr); /* we need to check if the ctor is the ctor of the class level we we * looking at since we might be looking at an inherited old style ctor @@ -2239,7 +2239,7 @@ ZEND_METHOD(reflection_method, isDestruc reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & ZEND_ACC_DTOR); } @@ -2252,7 +2252,7 @@ ZEND_METHOD(reflection_method, getModifi reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); GET_REFLECTION_OBJECT_PTR(mptr); RETURN_LONG(mptr->common.fn_flags); @@ -2266,7 +2266,7 @@ ZEND_METHOD(reflection_method, getDeclar reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_method_ptr); GET_REFLECTION_OBJECT_PTR(mptr); zend_reflection_class_factory(mptr->common.scope, return_value TSRMLS_CC); @@ -2350,7 +2350,7 @@ ZEND_METHOD(reflection_class, getStaticP reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); zend_update_class_constants(ce TSRMLS_CC); @@ -2436,7 +2436,7 @@ ZEND_METHOD(reflection_class, getDefault zend_class_entry *ce; int count; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); @@ -2482,7 +2482,7 @@ ZEND_METHOD(reflection_class, __toString zend_class_entry *ce; string str; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); string_init(&str); _class_string(&str, ce, intern->obj, "" TSRMLS_CC); @@ -2494,7 +2494,7 @@ ZEND_METHOD(reflection_class, __toString Returns the class' name */ ZEND_METHOD(reflection_class, getName) { - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -2506,7 +2506,7 @@ ZEND_METHOD(reflection_class, isInternal reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_INTERNAL_CLASS); } @@ -2519,7 +2519,7 @@ ZEND_METHOD(reflection_class, isUserDefi reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_USER_CLASS); } @@ -2532,7 +2532,7 @@ ZEND_METHOD(reflection_class, getFileNam reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_STRING(ce->filename, 1); @@ -2548,7 +2548,7 @@ ZEND_METHOD(reflection_class, getStartLi reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_FUNCTION) { RETURN_LONG(ce->line_start); @@ -2564,7 +2564,7 @@ ZEND_METHOD(reflection_class, getEndLine reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_LONG(ce->line_end); @@ -2580,7 +2580,7 @@ ZEND_METHOD(reflection_class, getDocComm reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS && ce->doc_comment) { RETURN_STRINGL(ce->doc_comment, ce->doc_comment_len, 1); @@ -2596,7 +2596,7 @@ ZEND_METHOD(reflection_class, getConstru reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->constructor) { @@ -2616,7 +2616,7 @@ ZEND_METHOD(reflection_class, hasMethod) char *name, *lc_name; int name_len; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { return; } @@ -2643,7 +2643,7 @@ ZEND_METHOD(reflection_class, getMethod) char *name, *lc_name; int name_len; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { return; } @@ -2689,7 +2689,7 @@ ZEND_METHOD(reflection_class, getMethods long filter = 0; int argc = ZEND_NUM_ARGS(); - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (argc) { if (zend_parse_parameters(argc TSRMLS_CC, "|l", &filter) == FAILURE) { return; @@ -2716,7 +2716,7 @@ ZEND_METHOD(reflection_class, hasPropert int name_len; zval *property; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { return; } @@ -2750,7 +2750,7 @@ ZEND_METHOD(reflection_class, getPropert char *name; int name_len; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { return; } @@ -2797,7 +2797,7 @@ ZEND_METHOD(reflection_class, getPropert long filter = 0; int argc = ZEND_NUM_ARGS(); - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (argc) { if (zend_parse_parameters(argc TSRMLS_CC, "|l", &filter) == FAILURE) { return; @@ -2823,7 +2823,7 @@ ZEND_METHOD(reflection_class, hasConstan char *name; int name_len; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { return; } @@ -2845,7 +2845,7 @@ ZEND_METHOD(reflection_class, getConstan reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); zend_hash_apply_with_argument(&ce->constants_table, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); @@ -2863,7 +2863,7 @@ ZEND_METHOD(reflection_class, getConstan char *name; int name_len; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { return; } @@ -2884,7 +2884,7 @@ static void _class_check_flag(INTERNAL_F reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); RETVAL_BOOL(ce->ce_flags & mask); } @@ -2897,7 +2897,7 @@ ZEND_METHOD(reflection_class, isInstanti reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_ABSTRACT)) { RETURN_FALSE; @@ -2944,7 +2944,7 @@ ZEND_METHOD(reflection_class, getModifie reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); RETURN_LONG(ce->ce_flags); @@ -2959,7 +2959,7 @@ ZEND_METHOD(reflection_class, isInstance zend_class_entry *ce; zval *object; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &object) == FAILURE) { return; } @@ -2977,7 +2977,7 @@ ZEND_METHOD(reflection_class, newInstanc zend_class_entry *ce; int argc = ZEND_NUM_ARGS(); - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); object_init_ex(return_value, ce); @@ -3035,7 +3035,7 @@ ZEND_METHOD(reflection_class, getInterfa reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); /* Return an empty array if this class implements no interfaces */ @@ -3061,7 +3061,7 @@ ZEND_METHOD(reflection_class, getParentC reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); GET_REFLECTION_OBJECT_PTR(ce); if (ce->parent) { @@ -3080,7 +3080,7 @@ ZEND_METHOD(reflection_class, isSubclass zend_class_entry *ce, **pce, *class_ce; zval *class_name; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &class_name) == FAILURE) { @@ -3126,7 +3126,7 @@ ZEND_METHOD(reflection_class, implements zend_class_entry *ce, *interface_ce, **pce; zval *interface; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &interface) == FAILURE) { @@ -3175,7 +3175,7 @@ ZEND_METHOD(reflection_class, isIteratea reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->get_iterator != NULL); @@ -3189,7 +3189,7 @@ ZEND_METHOD(reflection_class, getExtensi reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); if (ce->module) { @@ -3205,7 +3205,7 @@ ZEND_METHOD(reflection_class, getExtensi reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); if (ce->module) { @@ -3332,7 +3332,7 @@ ZEND_METHOD(reflection_property, __toStr property_reference *ref; string str; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); GET_REFLECTION_OBJECT_PTR(ref); string_init(&str); _property_string(&str, ref->prop, NULL, "" TSRMLS_CC); @@ -3344,7 +3344,7 @@ ZEND_METHOD(reflection_property, __toStr Returns the class' name */ ZEND_METHOD(reflection_property, getName) { - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -3354,7 +3354,7 @@ static void _property_check_flag(INTERNA reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(ref->prop->flags & mask); } @@ -3406,7 +3406,7 @@ ZEND_METHOD(reflection_property, getModi reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); GET_REFLECTION_OBJECT_PTR(ref); RETURN_LONG(ref->prop->flags); @@ -3422,7 +3422,7 @@ ZEND_METHOD(reflection_property, getValu zval *object; zval **member= NULL; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_property_ptr); GET_REFLECTION_OBJECT_PTR(ref); if (!(ref->prop->flags & ZEND_ACC_PUBLIC)) { @@ -3464,7 +3464,7 @@ ZEND_METHOD(reflection_property, setValu zval *tmp; HashTable *prop_table; - METHOD_NOTSTATIC; + METHOD_NOTSTATIC(reflection_property_ptr); GET_REFLECTION_OBJECT_PTR(ref); if (ref->prop->flags & ~(ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)) { @@ -3522,7 +3522,7 @@ ZEND_METHOD(reflection_property, getDecl reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); GET_REFLECTION_OBJECT_PTR(ref); zend_reflection_class_factory(ref->ce, return_value TSRMLS_CC); @@ -3535,7 +3535,7 @@ ZEND_METHOD(reflection_property, getDocC reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); GET_REFLECTION_OBJECT_PTR(ref); if (ref->prop->doc_comment) { RETURN_STRINGL(ref->prop->doc_comment, ref->prop->doc_comment_len, 1); @@ -3598,7 +3598,7 @@ ZEND_METHOD(reflection_extension, __toSt zend_module_entry *module; string str; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); string_init(&str); _extension_string(&str, module, "" TSRMLS_CC); @@ -3610,7 +3610,7 @@ ZEND_METHOD(reflection_extension, __toSt Returns this extension's name */ ZEND_METHOD(reflection_extension, getName) { - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -3622,7 +3622,7 @@ ZEND_METHOD(reflection_extension, getVer reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); /* An extension does not necessarily have a version number */ @@ -3641,7 +3641,7 @@ ZEND_METHOD(reflection_extension, getFun reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -3689,7 +3689,7 @@ ZEND_METHOD(reflection_extension, getCon reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -3721,7 +3721,7 @@ ZEND_METHOD(reflection_extension, getINI reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -3757,7 +3757,7 @@ ZEND_METHOD(reflection_extension, getCla reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -3772,7 +3772,7 @@ ZEND_METHOD(reflection_extension, getCla reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(0); + METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); GET_REFLECTION_OBJECT_PTR(module); array_init(return_value);