From 964de035a7c9c78d262a7369a0b7a5eb747719ae Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 12:20:41 +0200 Subject: [PATCH] Deprecate restore_include_path() --- ext/standard/basic_functions.c | 2 +- .../tests/general_functions/include_path.phpt | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 0395b41358..2e13e1afb7 100644 --- 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 8b6626fbc8..23c5bc45aa 100644 --- 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 -- 2.40.0