Remove restore_include_path()

Closes GH-5189

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b7d2f4618b7e6faacb63da7c1a6bf51e018896f9..bf07aef503db771a1e0e9903e2667fa96cf8e53d 100755 (executable)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -434,7 +434,6 @@ 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_DEP_FE(restore_include_path,                                                                                        arginfo_restore_include_path)
 
        PHP_FE(setcookie,                                                                                                               arginfo_setcookie)
        PHP_FE(setrawcookie,                                                                                                    arginfo_setrawcookie)
@@ -2978,20 +2977,6 @@ PHP_FUNCTION(get_include_path)
 }
 /* }}} */
 
-/* {{{ proto void restore_include_path()
-   Restore the value of the include_path configuration option */
-PHP_FUNCTION(restore_include_path)
-{
-       zend_string *key;
-
-       ZEND_PARSE_PARAMETERS_NONE();
-
-       key = zend_string_init("include_path", sizeof("include_path")-1, 0);
-       zend_restore_ini_entry(key, PHP_INI_STAGE_RUNTIME);
-       zend_string_efree(key);
-}
-/* }}} */
-
 /* {{{ proto mixed print_r(mixed var [, bool return])
    Prints out or returns information about the specified variable */
 PHP_FUNCTION(print_r)

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index a010db88f680b63145797049ebaf574ce8742084..1366998983da158c8d4b53f44f26a5909ccbdecb 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -94,7 +94,6 @@ PHP_FUNCTION(ini_set);
 PHP_FUNCTION(ini_restore);
 PHP_FUNCTION(get_include_path);
 PHP_FUNCTION(set_include_path);
-PHP_FUNCTION(restore_include_path);
 
 PHP_FUNCTION(print_r);
 PHP_FUNCTION(fprintf);

diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 3d19f2137b48dfb433a0c8fdff6017919ab43f2b..baebfdd9f00e1ab3ce34e144874831a8b6a23395 100755 (executable)
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -336,8 +336,6 @@ function set_include_path(string $include_path): string|false {}
 
 function get_include_path(): string|false {}
 
-function restore_include_path(): void {}
-
 /** @param mixed $var */
 function print_r($var, bool $return = false): string|bool {}
 

diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index b5af02829d746d24cf361a05af00ba749ed5bcc5..964f412d7ebcd65ebc252fa5d32abbd68311b497 100755 (executable)
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -508,8 +508,6 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_get_include_path arginfo_ob_get_flush
 
-#define arginfo_restore_include_path arginfo_flush
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_print_r, 0, 1, MAY_BE_STRING|MAY_BE_BOOL)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_TYPE_INFO(0, return, _IS_BOOL, 0)

diff --git a/ext/standard/tests/general_functions/include_path.phpt b/ext/standard/tests/general_functions/include_path.phpt
index ffadbc280c8f1d903287a8620f8785c9b284edb0..56327500eaad740db84774998849d0995ea4fd98 100644 (file)
--- a/ext/standard/tests/general_functions/include_path.phpt
+++ b/ext/standard/tests/general_functions/include_path.phpt
@@ -6,58 +6,46 @@ include_path=.
 <?php
 
 var_dump(get_include_path());
-
-var_dump(restore_include_path());
+var_dump(ini_restore("include_path"));
 
 var_dump(set_include_path("var"));
 var_dump(get_include_path());
 
-var_dump(restore_include_path());
+var_dump(ini_restore("include_path"));
 var_dump(get_include_path());
 
 var_dump(set_include_path(".:/path/to/dir"));
 var_dump(get_include_path());
 
-var_dump(restore_include_path());
+var_dump(ini_restore("include_path"));
 var_dump(get_include_path());
 
 var_dump(set_include_path(""));
 var_dump(get_include_path());
 
-var_dump(restore_include_path());
+var_dump(ini_restore("include_path"));
 var_dump(get_include_path());
 
-var_dump(restore_include_path());
+var_dump(ini_restore("include_path"));
 var_dump(get_include_path());
 
-
 echo "Done\n";
 ?>
 --EXPECTF--
 string(1) "."
-
-Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 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) "."
-
-Deprecated: Function restore_include_path() is deprecated in %s on line %d
 NULL
 string(1) "."
 Done