kalle Wed, 11 Aug 2010 21:12:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302118
Log:
Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes
#52570)
# Trunk patch will follow shortly
Bug: http://bugs.php.net/52570 (Assigned) register_globals on in php 5.3
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/Zend/tests/unset_cv05.phpt
U php/php-src/branches/PHP_5_3/Zend/tests/unset_cv06.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt
U php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt
U php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt
U php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt
U php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt
U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt
U
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt
U
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt
U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt
U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt
U php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
U php/php-src/branches/PHP_5_3/main/main.c
U php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-08-11 21:12:18 UTC (rev 302118)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/Zend/tests/unset_cv05.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/unset_cv05.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/Zend/tests/unset_cv05.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -19,7 +19,7 @@
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
Modified: php/php-src/branches/PHP_5_3/Zend/tests/unset_cv06.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/unset_cv06.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/Zend/tests/unset_cv06.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -19,7 +19,7 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -27,7 +27,7 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -37,7 +37,7 @@
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"
Modified: php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -20,7 +20,7 @@
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) {
Modified: php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -12,6 +12,6 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -15,7 +15,7 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -9,5 +9,5 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -43,7 +43,7 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -37,7 +37,7 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -28,7 +28,7 @@
?>
===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)
Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -19,6 +19,6 @@
?>
===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===
Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -36,7 +36,7 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -31,7 +31,7 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -28,7 +28,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
object(foo)#1 (2) {
["bar"]=>
string(2) "ok"
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -73,7 +73,7 @@
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) {
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -85,7 +85,7 @@
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) {
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -45,7 +45,7 @@
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"]=>
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -50,9 +50,9 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -58,7 +58,7 @@
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) {
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -43,7 +43,7 @@
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) {
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -32,7 +32,7 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -24,5 +24,5 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -33,7 +33,7 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -47,7 +47,7 @@
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) {
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -1,20 +1,20 @@
---TEST--
-Test function get_cfg_var() by calling deprecated option
---CREDITS--
-Francesco Fullone f...@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 f...@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"
+
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -16,7 +16,7 @@
?>
==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
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -12,7 +12,7 @@
?>
==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
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -7,5 +7,5 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -91,7 +91,7 @@
?>
===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
Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/main/main.c 2010-08-11 21:12:18 UTC (rev 302118)
@@ -2076,7 +2076,7 @@
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;
}
Modified: php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt 2010-08-11 20:39:03 UTC (rev 302117)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt 2010-08-11 21:12:18 UTC (rev 302118)
@@ -28,6 +28,8 @@
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 @@
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
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
