summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/mcrypt/mcrypt.c12
-rw-r--r--ext/mcrypt/php_mcrypt.h1
-rw-r--r--ext/mysql/php_mysql.c18
-rw-r--r--ext/standard/basic_functions.c17
-rw-r--r--ext/standard/streamsfuncs.c9
-rw-r--r--ext/standard/streamsfuncs.h1
6 files changed, 10 insertions, 48 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 4f04977652..afee47e99a 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -63,7 +63,7 @@ zend_function_entry mcrypt_functions[] = {
PHP_FE(mcrypt_generic_init, NULL)
PHP_FE(mcrypt_generic, NULL)
PHP_FE(mdecrypt_generic, NULL)
- PHP_FE(mcrypt_generic_end, NULL)
+ PHP_DEP_FALIAS(mcrypt_generic_end, mcrypt_generic_deinit, NULL)
PHP_FE(mcrypt_generic_deinit, NULL)
PHP_FE(mcrypt_enc_self_test, NULL)
@@ -604,16 +604,6 @@ PHP_FUNCTION(mcrypt_module_close)
/* }}} */
-/* {{{ proto bool mcrypt_generic_end(resource td)
- This function terminates encrypt specified by the descriptor td */
-PHP_FUNCTION(mcrypt_generic_end)
-{
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "This function is deprecated, please use mcrypt_generic_deinit()");
- zif_mcrypt_generic_deinit(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
-
/* {{{ proto bool mcrypt_generic_deinit(resource td)
This function terminates encrypt specified by the descriptor td */
PHP_FUNCTION(mcrypt_generic_deinit)
diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h
index 64c5e5522e..871e96f6e5 100644
--- a/ext/mcrypt/php_mcrypt.h
+++ b/ext/mcrypt/php_mcrypt.h
@@ -52,7 +52,6 @@ PHP_FUNCTION(mcrypt_module_open);
PHP_FUNCTION(mcrypt_generic_init);
PHP_FUNCTION(mcrypt_generic);
PHP_FUNCTION(mdecrypt_generic);
-PHP_FUNCTION(mcrypt_generic_end);
PHP_FUNCTION(mcrypt_generic_deinit);
PHP_FUNCTION(mcrypt_enc_self_test);
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 0a022b935a..513a75cf48 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -126,15 +126,15 @@ zend_function_entry mysql_functions[] = {
PHP_FE(mysql_select_db, NULL)
#ifndef NETWARE /* The below two functions not supported on NetWare */
#if MYSQL_VERSION_ID < 40000
- PHP_FE(mysql_create_db, NULL)
- PHP_FE(mysql_drop_db, NULL)
+ PHP_DEP_FE(mysql_create_db, NULL)
+ PHP_DEP_FE(mysql_drop_db, NULL)
#endif
#endif /* NETWARE */
PHP_FE(mysql_query, NULL)
PHP_FE(mysql_unbuffered_query, NULL)
PHP_FE(mysql_db_query, NULL)
PHP_FE(mysql_list_dbs, NULL)
- PHP_FE(mysql_list_tables, NULL)
+ PHP_DEP_FE(mysql_list_tables, NULL)
PHP_FE(mysql_list_fields, NULL)
PHP_FE(mysql_list_processes, NULL)
PHP_FE(mysql_error, NULL)
@@ -185,15 +185,15 @@ zend_function_entry mysql_functions[] = {
PHP_FALIAS(mysql_selectdb, mysql_select_db, NULL)
#ifndef NETWARE /* The below two functions not supported on NetWare */
#if MYSQL_VERSION_ID < 40000
- PHP_FALIAS(mysql_createdb, mysql_create_db, NULL)
- PHP_FALIAS(mysql_dropdb, mysql_drop_db, NULL)
+ PHP_DEP_FALIAS(mysql_createdb, mysql_create_db, NULL)
+ PHP_DEP_FALIAS(mysql_dropdb, mysql_drop_db, NULL)
#endif
#endif /* NETWARE */
PHP_FALIAS(mysql_freeresult, mysql_free_result, NULL)
PHP_FALIAS(mysql_numfields, mysql_num_fields, NULL)
PHP_FALIAS(mysql_numrows, mysql_num_rows, NULL)
PHP_FALIAS(mysql_listdbs, mysql_list_dbs, NULL)
- PHP_FALIAS(mysql_listtables, mysql_list_tables, NULL)
+ PHP_DEP_FALIAS(mysql_listtables,mysql_list_tables, NULL)
PHP_FALIAS(mysql_listfields, mysql_list_fields, NULL)
PHP_FALIAS(mysql_db_name, mysql_result, NULL)
PHP_FALIAS(mysql_dbname, mysql_result, NULL)
@@ -1148,8 +1148,6 @@ PHP_FUNCTION(mysql_create_db)
break;
}
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated, please use mysql_query() to issue a SQL CREATE DATABASE statement instead.");
-
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
PHPMY_UNBUFFERED_QUERY_CHECK();
@@ -1191,9 +1189,6 @@ PHP_FUNCTION(mysql_drop_db)
break;
}
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated, please use mysql_query() to issue a SQL DROP DATABASE statement instead.");
-
-
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
convert_to_string_ex(db);
@@ -1446,7 +1441,6 @@ PHP_FUNCTION(mysql_list_tables)
WRONG_PARAM_COUNT;
break;
}
- php_error_docref(NULL TSRMLS_CC, E_STRICT, "mysql_list_tables() is deprecated");
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
convert_to_string_ex(db);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 092a7fcab2..5168cbd9f9 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2394,12 +2394,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_set_blocking, 0)
ZEND_ARG_INFO(0, mode)
ZEND_END_ARG_INFO()
-static
-ZEND_BEGIN_ARG_INFO(arginfo_set_socket_blocking, 0)
- ZEND_ARG_INFO(0, socket)
- ZEND_ARG_INFO(0, mode)
-ZEND_END_ARG_INFO()
-
#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
static
ZEND_BEGIN_ARG_INFO(arginfo_stream_set_timeout, 0)
@@ -3377,8 +3371,8 @@ zend_function_entry basic_functions[] = {
PHP_FE(error_log, arginfo_error_log)
PHP_FE(call_user_func, arginfo_call_user_func)
PHP_FE(call_user_func_array, arginfo_call_user_func_array)
- PHP_FE(call_user_method, arginfo_call_user_method)
- PHP_FE(call_user_method_array, arginfo_call_user_method_array)
+ PHP_DEP_FE(call_user_method, arginfo_call_user_method)
+ PHP_DEP_FE(call_user_method_array, arginfo_call_user_method_array)
PHP_FE(serialize, arginfo_serialize)
PHP_FE(unserialize, arginfo_unserialize)
@@ -3535,7 +3529,7 @@ zend_function_entry basic_functions[] = {
PHP_FE(stream_set_write_buffer, arginfo_stream_set_write_buffer)
PHP_FALIAS(set_file_buffer, stream_set_write_buffer, arginfo_stream_set_write_buffer)
- PHP_FE(set_socket_blocking, arginfo_set_socket_blocking)
+ PHP_DEP_FALIAS(set_socket_blocking, stream_set_blocking, arginfo_stream_set_blocking)
PHP_FE(stream_set_blocking, arginfo_stream_set_blocking)
PHP_FALIAS(socket_set_blocking, stream_set_blocking, arginfo_stream_set_blocking)
@@ -5050,8 +5044,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)
@@ -5060,8 +5052,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;
}
@@ -5099,7 +5089,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, &params) == FAILURE) {
WRONG_PARAM_COUNT;
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 4306f2ea1c..f8b22981d1 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1343,15 +1343,6 @@ PHP_FUNCTION(stream_set_blocking)
/* }}} */
-/* {{{ proto bool set_socket_blocking(resource socket, int mode)
- Set blocking/non-blocking mode on a socket */
-PHP_FUNCTION(set_socket_blocking)
-{
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated, use stream_set_blocking() instead");
- PHP_FN(stream_set_blocking)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
/* {{{ proto bool stream_set_timeout(resource stream, int seconds, int microseconds)
Set timeout on stream read to seconds + microseonds */
#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
diff --git a/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h
index bd0e99031a..ba9a79824f 100644
--- a/ext/standard/streamsfuncs.h
+++ b/ext/standard/streamsfuncs.h
@@ -33,7 +33,6 @@ PHP_FUNCTION(stream_socket_sendto);
PHP_FUNCTION(stream_copy_to_stream);
PHP_FUNCTION(stream_get_contents);
-PHP_FUNCTION(set_socket_blocking); /* deprecated */
PHP_FUNCTION(stream_set_blocking);
PHP_FUNCTION(stream_select);
PHP_FUNCTION(stream_set_timeout);
View Lorry Controller Status