Use PHP_DEP_FE - good for reflection

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 1f2762b1913f89914cd297955a821fb2dc310803..6fd51f26398e8138a0e2470803b6158daa1cf7d6 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -251,8 +251,8 @@ static const zend_function_entry mysql_functions[] = {
 #endif /* NETWARE */
        PHP_FE(mysql_query,                                                                     arginfo_mysql_query)
        PHP_FE(mysql_unbuffered_query,                                          arginfo_mysql_query)
-       PHP_FE(mysql_db_query,                                                          arginfo_mysql_db_query)
-       PHP_FE(mysql_list_dbs,                                                          arginfo__optional_mysql_link)
+       PHP_DEP_FE(mysql_db_query,                                                      arginfo_mysql_db_query)
+       PHP_DEP_FE(mysql_list_dbs,                                                      arginfo__optional_mysql_link)
        PHP_DEP_FE(mysql_list_tables,                                           arginfo_mysql_select_db)
        PHP_FE(mysql_list_fields,                                                       arginfo_mysql_list_fields)
        PHP_FE(mysql_list_processes,                                            arginfo__optional_mysql_link)

diff --git a/ext/mysql/tests/mysql_db_name.phpt b/ext/mysql/tests/mysql_db_name.phpt
index e241bc0d9a8cdb9a154626cef6a455d100b47605..bed98bca52344bf0c85e8b768313f3a147775118 100644 (file)
--- a/ext/mysql/tests/mysql_db_name.phpt
+++ b/ext/mysql/tests/mysql_db_name.phpt
@@ -58,6 +58,8 @@ mysql_close($link);
 print "done!\n";
 ?>
 --EXPECTF--
+Deprecated: Function mysql_list_dbs() is deprecated in %s on line %d
+
 Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query() with SHOW DATABASES instead in %s on line %d
 
 Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in %s on line %d

diff --git a/ext/mysql/tests/mysql_list_dbs.phpt b/ext/mysql/tests/mysql_list_dbs.phpt
index e0850d5a5450afa7bf3407d1806cccded2091769..6900ab0e0a2c9a02be227d456cdaf32967591d0c 100644 (file)
--- a/ext/mysql/tests/mysql_list_dbs.phpt
+++ b/ext/mysql/tests/mysql_list_dbs.phpt
@@ -51,6 +51,8 @@ print "done!\n";
 require_once("clean_table.inc");
 ?>
 --EXPECTF--
+Deprecated: Function mysql_list_dbs() is deprecated in %s on line 15
+
 Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query() with SHOW DATABASES instead in %s on line %d
 
 Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query() with SHOW DATABASES instead in %s on line %d