diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | UPGRADING | 1 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 23 | ||||
| -rw-r--r-- | ext/standard/basic_functions.h | 1 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt | 46 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt | 37 | ||||
| -rwxr-xr-x | run-tests.php | 2 | ||||
| -rwxr-xr-x | server-tests.php | 1 |
9 files changed, 3 insertions, 111 deletions
diff --git a/.gitattributes b/.gitattributes index 091043a35b..a237ec7f84 100644 --- a/.gitattributes +++ b/.gitattributes @@ -49,7 +49,6 @@ UPGRADING.INTERNALS merge=NEWS /ext/spl/tests/SplArray_fromArray.phpt -crlf /ext/standard/tests/dir/scandir_variation3.phpt -crlf /ext/standard/tests/general_functions/escapeshellcmd-win32.phpt -crlf -/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt -crlf /ext/standard/tests/strings/bug26817.phpt -crlf /ext/standard/tests/strings/bug26973.phpt -crlf /ext/standard/tests/strings/bug27457.phpt -crlf @@ -109,6 +109,8 @@ . Added intdiv() function. (Andrea) . Improved precision of log() function for base 2 and 10. (Marc Bennewitz) . Remove string category support in setlocale(). (Nikita) + . Remove set_magic_quotes_runtime() and its alias magic_quotes_runtime(). + (Nikita) - Streams: . Fixed bug #68532 (convert.base64-encode omits padding bytes). @@ -78,6 +78,7 @@ PHP X.Y UPGRADE NOTES - Standard: . Removed string category support in setlocale(). Use the LC_* constants instead. + . Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime(). ======================================== 2. New Features 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=== diff --git a/run-tests.php b/run-tests.php index 15b7fe2093..9d1a78c1e4 100755 --- a/run-tests.php +++ b/run-tests.php @@ -114,7 +114,6 @@ if (ob_get_level()) echo "Not all buffers were deleted.\n"; error_reporting(E_ALL); if (PHP_MAJOR_VERSION < 6) { - ini_set('magic_quotes_runtime',0); // this would break tests by modifying EXPECT sections if (ini_get('safe_mode')) { echo <<< SAFE_MODE_WARNING @@ -236,7 +235,6 @@ $ini_overwrites = array( 'error_append_string=', 'auto_prepend_file=', 'auto_append_file=', - 'magic_quotes_runtime=0', 'ignore_repeated_errors=0', 'precision=14', 'memory_limit=128M', diff --git a/server-tests.php b/server-tests.php index 3c5e36532a..8c2ae8607b 100755 --- a/server-tests.php +++ b/server-tests.php @@ -472,7 +472,6 @@ class testHarness { 'error_append_string'=>'', 'auto_prepend_file'=>'', 'auto_append_file'=>'', - 'magic_quotes_runtime'=>'0', ); public $env = array(); public $info_params = array(); |