diff options
| author | Hannes Magnusson <bjori@php.net> | 2006-06-26 16:33:39 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2006-06-26 16:33:39 +0000 |
| commit | 223d122caeb65ab2f495891b604883b7db1b7032 (patch) | |
| tree | d938ae32556611316acb6b2fe15b59ad5370dc2a /ext/standard/basic_functions.c | |
| parent | d258bcd95122aad4d944cc601c1b0eeddd9a8d01 (diff) | |
| download | php-git-223d122caeb65ab2f495891b604883b7db1b7032.tar.gz | |
MFH: use the ZEND_ACC_DEPRECATED flag rather than custom warnings
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 0c38cc3e11..46f49f03ee 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -456,8 +456,8 @@ zend_function_entry basic_functions[] = { PHP_FE(error_log, NULL) PHP_FE(call_user_func, NULL) PHP_FE(call_user_func_array, NULL) - PHP_FE(call_user_method, second_arg_force_ref) - PHP_FE(call_user_method_array, second_arg_force_ref) + PHP_DEP_FE(call_user_method, second_arg_force_ref) + PHP_DEP_FE(call_user_method_array, second_arg_force_ref) PHP_FE(serialize, NULL) PHP_FE(unserialize, NULL) @@ -612,7 +612,7 @@ zend_function_entry basic_functions[] = { PHP_FE(stream_set_write_buffer, NULL) PHP_FALIAS(set_file_buffer, stream_set_write_buffer, NULL) - PHP_FE(set_socket_blocking, NULL) + PHP_DEP_FALIAS(set_socket_blocking, stream_set_blocking, NULL) PHP_FE(stream_set_blocking, NULL) PHP_FALIAS(socket_set_blocking, stream_set_blocking, NULL) @@ -2175,8 +2175,6 @@ PHP_FUNCTION(call_user_func_array) } /* }}} */ -#define _CUM_DEPREC "This function is deprecated, use the call_user_func variety with the array(&$obj, \"method\") syntax instead" - /* {{{ proto mixed call_user_method(string method_name, mixed object [, mixed parameter] [, mixed ...]) Call a user method on a specific object or class */ PHP_FUNCTION(call_user_method) @@ -2185,8 +2183,6 @@ PHP_FUNCTION(call_user_method) zval *retval_ptr; int arg_count = ZEND_NUM_ARGS(); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", _CUM_DEPREC); - if (arg_count < 2) { WRONG_PARAM_COUNT; } @@ -2222,8 +2218,6 @@ PHP_FUNCTION(call_user_method_array) HashTable *params_ar; int num_elems, element = 0; - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", _CUM_DEPREC); - if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &method_name, &obj, ¶ms) == FAILURE) { WRONG_PARAM_COUNT; } |