diff options
33 files changed, 57 insertions, 55 deletions
@@ -1,6 +1,9 @@ -PHP NEWS +PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2010, PHP 5.3.4 +- Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED. + (Kalle) + - Fixed bug #52573 (SplFileObject::fscanf Segmentation fault). (Felipe) - Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values). (Felipe) diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt index 8e3c6349b7..90ebc6ba34 100644 --- a/Zend/tests/unset_cv05.phpt +++ b/Zend/tests/unset_cv05.phpt @@ -19,7 +19,7 @@ echo $HTTP_SESSION_VARS; echo "\nok\n"; ?> --EXPECTF-- -Warning: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0 +Deprecated: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0 ok Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d diff --git a/Zend/tests/unset_cv06.phpt b/Zend/tests/unset_cv06.phpt index b1ef0cc2ac..ba21cf430d 100644 --- a/Zend/tests/unset_cv06.phpt +++ b/Zend/tests/unset_cv06.phpt @@ -19,7 +19,7 @@ echo $x; echo "ok\n"; ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0 1 Deprecated: Function session_register() is deprecated in %s on line %d diff --git a/ext/curl/tests/curl_setopt_basic001.phpt b/ext/curl/tests/curl_setopt_basic001.phpt index 178fbf7c13..9c92785b0a 100644 --- a/ext/curl/tests/curl_setopt_basic001.phpt +++ b/ext/curl/tests/curl_setopt_basic001.phpt @@ -27,7 +27,7 @@ curl_close($ch); var_dump( $curl_content ); ?> --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt index c1d0a01886..e3ff9662a8 100644 --- a/ext/dba/tests/dba_cdb_make.phpt +++ b/ext/dba/tests/dba_cdb_make.phpt @@ -37,7 +37,7 @@ magic_quotes_runtime=1 require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- -Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0 database handler: cdb_make string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" diff --git a/ext/exif/tests/exif006.phpt b/ext/exif/tests/exif006.phpt index cbd71919dc..10458c083d 100644 --- a/ext/exif/tests/exif006.phpt +++ b/ext/exif/tests/exif006.phpt @@ -20,7 +20,7 @@ magic_quotes_runtime=1 var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false)); ?> --EXPECTF-- -Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0 array(5) { ["FILE"]=> array(6) { diff --git a/ext/filter/tests/bug39763.phpt b/ext/filter/tests/bug39763.phpt index 1422f52acc..36ee41561a 100644 --- a/ext/filter/tests/bug39763.phpt +++ b/ext/filter/tests/bug39763.phpt @@ -12,6 +12,6 @@ parse_str("val=%22probably+a+bug%22"); echo $val . "\n"; ?> --EXPECT-- -Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 \"probably a bug\" \"probably a bug\"
\ No newline at end of file diff --git a/ext/oci8/tests/oci8safemode.phpt b/ext/oci8/tests/oci8safemode.phpt index 1c62f36d39..703393cc4e 100644 --- a/ext/oci8/tests/oci8safemode.phpt +++ b/ext/oci8/tests/oci8safemode.phpt @@ -15,7 +15,7 @@ $r = oci_password_change($c, "hr", "hrpwd", "hrpwd"); echo "Done\n"; ?> --EXPECTF-- -%sarning:%sDirective 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 Warning: oci_connect(): Privileged connect is disabled in Safe Mode in %s on line %d diff --git a/ext/pcre/tests/bug33200.phpt b/ext/pcre/tests/bug33200.phpt index 67a4d86a7a..ddbb06519b 100644 --- a/ext/pcre/tests/bug33200.phpt +++ b/ext/pcre/tests/bug33200.phpt @@ -9,5 +9,5 @@ $str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str); echo $str . "\r\n"; ?> --EXPECT-- -Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0 SOME '$SAMPLE' TEXT diff --git a/ext/posix/tests/posix_access.phpt b/ext/posix/tests/posix_access.phpt index 1bd601ad4b..e585e67b47 100644 --- a/ext/posix/tests/posix_access.phpt +++ b/ext/posix/tests/posix_access.phpt @@ -43,7 +43,7 @@ chmod ($filename, 0700); unlink($filename); ?> --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d bool(true) bool(true) bool(true) diff --git a/ext/posix/tests/posix_access_error_modes.phpt b/ext/posix/tests/posix_access_error_modes.phpt index 0d79996bd1..951ae01075 100644 --- a/ext/posix/tests/posix_access_error_modes.phpt +++ b/ext/posix/tests/posix_access_error_modes.phpt @@ -37,7 +37,7 @@ chmod ($filename, 0700); unlink($filename); ?> --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d bool(false) bool(false) bool(false) diff --git a/ext/posix/tests/posix_access_error_wrongparams.phpt b/ext/posix/tests/posix_access_error_wrongparams.phpt index 7f938a8492..111ec6c54d 100644 --- a/ext/posix/tests/posix_access_error_wrongparams.phpt +++ b/ext/posix/tests/posix_access_error_wrongparams.phpt @@ -28,7 +28,7 @@ var_dump(posix_access('./foobar')); ?> ===DONE=== --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 Warning: posix_access() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/posix/tests/posix_access_safemode.phpt b/ext/posix/tests/posix_access_safemode.phpt index 1e156f9515..ec0c3e8d8c 100644 --- a/ext/posix/tests/posix_access_safemode.phpt +++ b/ext/posix/tests/posix_access_safemode.phpt @@ -19,6 +19,6 @@ var_dump(posix_access('/tmp', POSIX_W_OK)); ?> ===DONE=== --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d bool(false) ===DONE=== diff --git a/ext/posix/tests/posix_mkfifo_safemode.phpt b/ext/posix/tests/posix_mkfifo_safemode.phpt index 9dbddc2611..6f1f092497 100644 --- a/ext/posix/tests/posix_mkfifo_safemode.phpt +++ b/ext/posix/tests/posix_mkfifo_safemode.phpt @@ -36,7 +36,7 @@ unlink($dir . '/bar'); rmdir($dir); ?> --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d Warning: posix_mkfifo(): SAFE MODE Restriction in effect. The script whose uid is %d is not allowed to access /tmp owned by uid %d in %s on line %d bool(false) diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt index 19dff78e1f..543eba7133 100644 --- a/ext/session/tests/001.phpt +++ b/ext/session/tests/001.phpt @@ -31,7 +31,7 @@ print session_encode()."\n"; session_destroy(); --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 Deprecated: Function session_register() is deprecated in %s on line %d diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt index 8a4e0027f8..677a958e8e 100644 --- a/ext/session/tests/003.phpt +++ b/ext/session/tests/003.phpt @@ -28,7 +28,7 @@ var_dump($baz); var_dump($arr); session_destroy(); --EXPECT-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 object(foo)#1 (2) { ["bar"]=> string(2) "ok" diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt index 2ff675e7cd..3e6de2523b 100644 --- a/ext/session/tests/004.phpt +++ b/ext/session/tests/004.phpt @@ -73,7 +73,7 @@ var_dump($arr); session_destroy(); ?> --EXPECT-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 OPEN: PHPSESSID READ: abtest object(foo)#2 (2) { diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt index 124f0a831e..4e6682c86b 100644 --- a/ext/session/tests/005.phpt +++ b/ext/session/tests/005.phpt @@ -85,7 +85,7 @@ var_dump($baz); var_dump($arr); var_dump($c); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 OPEN: PHPSESSID READ: abtest object(foo)#2 (2) { diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt index 7c7af61b73..9ab28f65d8 100644 --- a/ext/session/tests/006.phpt +++ b/ext/session/tests/006.phpt @@ -45,7 +45,7 @@ echo "values after session:\n"; var_dump($a,$b); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 original values: object(a)#%d (1) { ["test"]=> diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt index 9531b3dd8a..54768e2bd1 100644 --- a/ext/session/tests/007.phpt +++ b/ext/session/tests/007.phpt @@ -50,9 +50,9 @@ var_dump($HTTP_SESSION_VARS); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 -Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 Deprecated: Function session_register() is deprecated in %s on line %d float(3.14) diff --git a/ext/session/tests/008-php4.2.3.phpt b/ext/session/tests/008-php4.2.3.phpt index 4fe938fbcd..1b26900c8f 100644 --- a/ext/session/tests/008-php4.2.3.phpt +++ b/ext/session/tests/008-php4.2.3.phpt @@ -58,7 +58,7 @@ var_dump($HTTP_SESSION_VARS); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 NULL session_write_close(): Your script possibly relies on a session side-effect which existed until PHP 4.2.3. Please be advised that the session extension does not consider global variables as a source of data, unless register_globals is enabled. You can disable this functionality and this warning by setting session.bug_compat_42 or session.bug_compat_warn to off, respectively array(1) { diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt index 705a2758f6..1a7e87ce0d 100644 --- a/ext/session/tests/009.phpt +++ b/ext/session/tests/009.phpt @@ -43,7 +43,7 @@ var_dump($HTTP_SESSION_VARS); session_destroy(); ?> --EXPECT-- -Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 array(0) { } array(1) { diff --git a/ext/session/tests/012.phpt b/ext/session/tests/012.phpt index 32aeb29c11..b52333a994 100644 --- a/ext/session/tests/012.phpt +++ b/ext/session/tests/012.phpt @@ -32,7 +32,7 @@ session_destroy(); print "I live\n"; ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 Deprecated: Function session_register() is deprecated in %s on line %d I live diff --git a/ext/session/tests/013.phpt b/ext/session/tests/013.phpt index ad6c14e13e..04322f9f17 100644 --- a/ext/session/tests/013.phpt +++ b/ext/session/tests/013.phpt @@ -24,5 +24,5 @@ session_destroy(); print "I live\n"; ?> --EXPECT-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 I live diff --git a/ext/session/tests/014.phpt b/ext/session/tests/014.phpt index 4e77a7aeff..be1119d9a1 100644 --- a/ext/session/tests/014.phpt +++ b/ext/session/tests/014.phpt @@ -33,7 +33,7 @@ ini_set("session.use_trans_sid","1"); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 <a href="/link?PHPSESSID=abtest"> Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt index 5bdd03b5cf..9c4f8caf93 100644 --- a/ext/session/tests/019.phpt +++ b/ext/session/tests/019.phpt @@ -47,7 +47,7 @@ var_dump($_SESSION); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 Deprecated: Function session_register() is deprecated in %s on line %d array(2) { diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt index 31bcb80fc3..f679a41ebf 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt @@ -1,20 +1,20 @@ ---TEST-- -Test function get_cfg_var() by calling deprecated option ---CREDITS-- -Francesco Fullone ff@ideato.it -#PHPTestFest Cesena Italia on 2009-06-20 ---INI-- -register_globals=1 ---SKIPIF-- -<?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or greater"); ?> ---FILE-- -<?php -echo "*** Test by calling method or function with deprecated option ***\n"; -var_dump(get_cfg_var( 'register_globals' ) ); - -?> ---EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0 -*** Test by calling method or function with deprecated option *** -string(1) "1" - +--TEST--
+Test function get_cfg_var() by calling deprecated option
+--CREDITS--
+Francesco Fullone ff@ideato.it
+#PHPTestFest Cesena Italia on 2009-06-20
+--INI--
+register_globals=1
+--SKIPIF--
+<?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or greater"); ?>
+--FILE--
+<?php
+echo "*** Test by calling method or function with deprecated option ***\n";
+var_dump(get_cfg_var( 'register_globals' ) );
+
+?>
+--EXPECTF--
+Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0
+*** Test by calling method or function with deprecated option ***
+string(1) "1"
+
diff --git a/ext/standard/tests/general_functions/putenv_error1.phpt b/ext/standard/tests/general_functions/putenv_error1.phpt index c4b49f3f87..0fd0640bf4 100644 --- a/ext/standard/tests/general_functions/putenv_error1.phpt +++ b/ext/standard/tests/general_functions/putenv_error1.phpt @@ -16,7 +16,7 @@ print ($set ? 'it worked' : 'boo') . "\n"; ?> ==DONE== --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 Warning: putenv(): Safe Mode warning: Cannot set environment variable 'FOO' - it's not in the allowed list in %s on line %d diff --git a/ext/standard/tests/general_functions/putenv_error2.phpt b/ext/standard/tests/general_functions/putenv_error2.phpt index 456a7ab690..b8f306c79e 100644 --- a/ext/standard/tests/general_functions/putenv_error2.phpt +++ b/ext/standard/tests/general_functions/putenv_error2.phpt @@ -12,7 +12,7 @@ putenv('BAZ=bop'); ?> ==DONE== --EXPECTF-- -Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 Warning: putenv(): Safe Mode warning: Cannot override protected environment variable 'FOO' in %s on line %d diff --git a/ext/standard/tests/misc/syslog_vars_variation1.phpt b/ext/standard/tests/misc/syslog_vars_variation1.phpt index ae53a57bc5..0237830dfc 100644 --- a/ext/standard/tests/misc/syslog_vars_variation1.phpt +++ b/ext/standard/tests/misc/syslog_vars_variation1.phpt @@ -7,5 +7,5 @@ define_syslog_variables=On var_dump(isset($LOG_ERR)); ?> --EXPECTF-- -Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0 bool(true) diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt index 0cc7616153..06e614374e 100644 --- a/ext/standard/tests/strings/parse_str_basic3.phpt +++ b/ext/standard/tests/strings/parse_str_basic3.phpt @@ -91,7 +91,7 @@ var_dump($res); ?> ===DONE=== --EXPECTF-- -Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing parse_str() : basic functionality *** Test string with array values diff --git a/main/main.c b/main/main.c index 79138df20a..be83ea18bb 100644 --- a/main/main.c +++ b/main/main.c @@ -2076,7 +2076,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod while (*p) { if (cfg_get_long((char*)*p, &val) == SUCCESS && val) { - zend_error(E_WARNING, "Directive '%s' is deprecated in PHP 5.3 and greater", *p); + zend_error(E_DEPRECATED, "Directive '%s' is deprecated in PHP 5.3 and greater", *p); } ++p; } diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt index 1971e807bb..87786d44ea 100644 --- a/tests/basic/bug46313-win.phpt +++ b/tests/basic/bug46313-win.phpt @@ -28,6 +28,8 @@ var_dump($GLOBALS["o1\'file"]); var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]); ?> --EXPECTF-- +Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 array(2) { ["o1\'file"]=> array(5) { @@ -60,6 +62,3 @@ string(12) "o1" bool(true) string(%d) "%s" bool(true) -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 -Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 - |