summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/basic_functions.c23
-rw-r--r--ext/standard/basic_functions.h1
-rw-r--r--ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt46
-rw-r--r--ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt37
4 files changed, 0 insertions, 107 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 27f340f923..096971eedc 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -607,10 +607,6 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_runtime, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_set_magic_quotes_runtime, 0, 0, 1)
- ZEND_ARG_INFO(0, new_setting)
-ZEND_END_ARG_INFO()
-
ZEND_BEGIN_ARG_INFO(arginfo_constant, 0)
ZEND_ARG_INFO(0, const_name)
ZEND_END_ARG_INFO()
@@ -2937,8 +2933,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(header_register_callback, arginfo_header_register_callback)
PHP_FE(get_cfg_var, arginfo_get_cfg_var)
- PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime)
- PHP_DEP_FE(set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime)
PHP_FE(get_magic_quotes_gpc, arginfo_get_magic_quotes_gpc)
PHP_FE(get_magic_quotes_runtime, arginfo_get_magic_quotes_runtime)
@@ -4572,23 +4566,6 @@ PHP_FUNCTION(get_cfg_var)
}
/* }}} */
-/* {{{ proto bool set_magic_quotes_runtime(int new_setting)
- magic_quotes_runtime is not supported anymore */
-PHP_FUNCTION(set_magic_quotes_runtime)
-{
- zend_bool new_setting;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "b", &new_setting) == FAILURE) {
- return;
- }
-
- if (new_setting) {
- php_error_docref(NULL, E_CORE_ERROR, "magic_quotes_runtime is not supported anymore");
- }
- RETURN_FALSE;
-}
-/* }}} */
-
/* {{{ proto int get_magic_quotes_runtime(void)
Get the current active configuration setting of magic_quotes_runtime */
PHP_FUNCTION(get_magic_quotes_runtime)
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 894045b9c2..59f7498fb9 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -76,7 +76,6 @@ PHP_FUNCTION(set_time_limit);
PHP_FUNCTION(header_register_callback);
PHP_FUNCTION(get_cfg_var);
-PHP_FUNCTION(set_magic_quotes_runtime);
PHP_FUNCTION(get_magic_quotes_runtime);
PHP_FUNCTION(get_magic_quotes_gpc);
diff --git a/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt b/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt
deleted file mode 100644
index ad786fb525..0000000000
--- a/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-Test set_magic_quotes_runtime() function - basic test
---INI--
-magic_quotes_runtime = 0
---FILE--
-<?php
-/* Prototype: bool set_magic_quotes_runtime ( int $new_setting )
- * Description: Sets the current active configuration setting of magic_quotes_runtime
-*/
-
-echo "Simple testcase for set_magic_quotes_runtime() function - basic test\n";
-
-$g = get_magic_quotes_runtime();
-echo "\n-- magic quotes runtime set in INI file: " . $g . "--\n";
-
-echo "\n-- Set magic quotes runtime to 0: --\n";
-var_dump(set_magic_quotes_runtime(0));
-$g = get_magic_quotes_runtime();
-echo "\n-- magic quotes runtime after set: " . $g . " --\n";
-
-echo "\n-- Set magic quotes runtime to 1: --\n";
-var_dump(set_magic_quotes_runtime(1));
-$g = get_magic_quotes_runtime();
-echo "\n-- magic quotes runtime after set: " . $g . " --\n";
-
-?>
-===DONE===
---EXPECTF--
-Simple testcase for set_magic_quotes_runtime() function - basic test
-
--- magic quotes runtime set in INI file: --
-
--- Set magic quotes runtime to 0: --
-
-Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(false)
-
--- magic quotes runtime after set: --
-
--- Set magic quotes runtime to 1: --
-
-Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-
-Fatal error: set_magic_quotes_runtime(): magic_quotes_runtime is not supported anymore in Unknown on line 0
-
-
diff --git a/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt b/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt
deleted file mode 100644
index c54846cb24..0000000000
--- a/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-Test set_magic_quotes_runtime() function - error conditions - pass function incorrect arguments
---FILE--
-<?php
-/* Prototype: bool set_magic_quotes_runtime ( int $new_setting )
- * Description: Sets the current active configuration setting of magic_quotes_runtime
-*/
-
-echo "Simple testcase for set_magic_quotes_runtime() - error test\n";
-
-//Note: No error msgs on invalid input; just a return value of FALSE
-
-echo "\n-- Testing set_magic_quotes_runtime() function with less than expected no. of arguments --\n";
-var_dump(set_magic_quotes_runtime());
-
-echo "\n-- Testing set_magic_quotes_runtime() function with more than expected no. of arguments --\n";
-var_dump(set_magic_quotes_runtime(1, true));
-
-?>
-===DONE===
---EXPECTF--
-Simple testcase for set_magic_quotes_runtime() - error test
-
--- Testing set_magic_quotes_runtime() function with less than expected no. of arguments --
-
-Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-
-Warning: set_magic_quotes_runtime() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing set_magic_quotes_runtime() function with more than expected no. of arguments --
-
-Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-
-Warning: set_magic_quotes_runtime() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===