Deprecate restore_include_path()

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 0395b413583262b728f1972676a05c868ed168ee..2e13e1afb7782c6bce60399d30a5e39ea01d48f5 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3047,7 +3047,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
        PHP_FE(ini_restore,                                                                                                             arginfo_ini_restore)
        PHP_FE(get_include_path,                                                                                                arginfo_get_include_path)
        PHP_FE(set_include_path,                                                                                                arginfo_set_include_path)
-       PHP_FE(restore_include_path,                                                                                    arginfo_restore_include_path)
+       PHP_DEP_FE(restore_include_path,                                                                                        arginfo_restore_include_path)
 
        PHP_FE(setcookie,                                                                                                               arginfo_setcookie)
        PHP_FE(setrawcookie,                                                                                                    arginfo_setrawcookie)

diff --git a/ext/standard/tests/general_functions/include_path.phpt b/ext/standard/tests/general_functions/include_path.phpt
index 8b6626fbc876a8e68d29446c9dbfe336653120df..23c5bc45aa505a855c3270461d7d65dd3f4bf530 100644 (file)
--- a/ext/standard/tests/general_functions/include_path.phpt
+++ b/ext/standard/tests/general_functions/include_path.phpt
@@ -46,8 +46,12 @@ string(1) "."
 
 Warning: get_include_path() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
+
+Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 
+Deprecated: Function restore_include_path() is deprecated in %s on line %d
+
 Warning: restore_include_path() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
@@ -56,20 +60,28 @@ NULL
 string(1) "."
 string(1) "."
 string(3) "var"
+
+Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 string(1) "."
 string(1) "."
 string(14) ".:/path/to/dir"
+
+Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 string(1) "."
 bool(false)
 string(1) "."
+
+Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 string(1) "."
 
 Warning: set_include_path() expects parameter 1 to be a valid path, array given in %s on line %d
 NULL
 string(1) "."
+
+Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 string(1) "."
 Done