archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570)

Browse source 
# Trunk patch will follow shortly
This commit is contained in:
Kalle Sommer Nielsen 2010-08-11 21:12:18 +00:00
parent 7d55780ca0
commit 8deefa8780
33 changed files with 57 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -1,6 +1,9 @@
PHP NEWS PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2010, PHP 5.3.4 ?? ??? 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 #52573 (SplFileObject::fscanf Segmentation fault). (Felipe)
- Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values). - Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values).
(Felipe) (Felipe)

2
Zend/tests/unset_cv05.phpt
View file

@ -19,7 +19,7 @@ echo $HTTP_SESSION_VARS;
echo "\nok\n"; echo "\nok\n";
?> ?>
--EXPECTF-- --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 ok
Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d

2
Zend/tests/unset_cv06.phpt
View file

@ -19,7 +19,7 @@ echo $x;
echo "ok\n"; echo "ok\n";
?> ?>
--EXPECTF-- --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 1
Deprecated: Function session_register() is deprecated in %s on line %d Deprecated: Function session_register() is deprecated in %s on line %d

2
ext/curl/tests/curl_setopt_basic001.phpt
View file

@ -27,7 +27,7 @@ curl_close($ch);
var_dump( $curl_content ); var_dump( $curl_content );
?> ?>
--EXPECTF-- --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 *** 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 Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d

2
ext/dba/tests/dba_cdb_make.phpt
View file

@ -37,7 +37,7 @@ magic_quotes_runtime=1
require(dirname(__FILE__) .'/clean.inc'); require(dirname(__FILE__) .'/clean.inc');
?> ?>
--EXPECT-- --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 database handler: cdb_make
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5" string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"

2
ext/exif/tests/exif006.phpt
View file

@ -20,7 +20,7 @@ magic_quotes_runtime=1
var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false)); var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false));
?> ?>
--EXPECTF-- --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) { array(5) {
["FILE"]=> ["FILE"]=>
array(6) { array(6) {

2
ext/filter/tests/bug39763.phpt
View file

@ -12,6 +12,6 @@ parse_str("val=%22probably+a+bug%22");
echo $val . "\n"; echo $val . "\n";
?> ?>
--EXPECT-- --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\"
\"probably a bug\" \"probably a bug\"

2
ext/oci8/tests/oci8safemode.phpt
View file

@ -15,7 +15,7 @@ $r = oci_password_change($c, "hr", "hrpwd", "hrpwd");
echo "Done\n"; echo "Done\n";
?> ?>
--EXPECTF-- --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 Warning: oci_connect(): Privileged connect is disabled in Safe Mode in %s on line %d

2
ext/pcre/tests/bug33200.phpt
View file

@ -9,5 +9,5 @@ $str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str);
echo $str . "\r\n"; echo $str . "\r\n";
?> ?>
--EXPECT-- --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 SOME '$SAMPLE' TEXT

2
ext/posix/tests/posix_access.phpt
View file

@ -43,7 +43,7 @@ chmod ($filename, 0700);
unlink($filename); unlink($filename);
?> ?>
--EXPECTF-- --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) bool(true)
bool(true) bool(true)

2
ext/posix/tests/posix_access_error_modes.phpt
View file

@ -37,7 +37,7 @@ chmod ($filename, 0700);
unlink($filename); unlink($filename);
?> ?>
--EXPECTF-- --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) bool(false)
bool(false) bool(false)

2
ext/posix/tests/posix_access_error_wrongparams.phpt
View file

@ -28,7 +28,7 @@ var_dump(posix_access('./foobar'));
?> ?>
===DONE=== ===DONE===
--EXPECTF-- --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 Warning: posix_access() expects at least 1 parameter, 0 given in %s on line %d
bool(false) bool(false)

2
ext/posix/tests/posix_access_safemode.phpt
View file

@ -19,6 +19,6 @@ var_dump(posix_access('/tmp', POSIX_W_OK));
?> ?>
===DONE=== ===DONE===
--EXPECTF-- --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) bool(false)
===DONE=== ===DONE===

2
ext/posix/tests/posix_mkfifo_safemode.phpt
View file

@ -36,7 +36,7 @@ unlink($dir . '/bar');
rmdir($dir); rmdir($dir);
?> ?>
--EXPECTF-- --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 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) bool(false)

2
ext/session/tests/001.phpt
View file

@ -31,7 +31,7 @@ print session_encode()."\n";
session_destroy(); session_destroy();
--EXPECTF-- --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 Deprecated: Function session_register() is deprecated in %s on line %d

2
ext/session/tests/003.phpt
View file

@ -28,7 +28,7 @@ var_dump($baz);
var_dump($arr); var_dump($arr);
session_destroy(); session_destroy();
--EXPECT-- --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) { object(foo)#1 (2) {
["bar"]=> ["bar"]=>
string(2) "ok" string(2) "ok"

2
ext/session/tests/004.phpt
View file

@ -73,7 +73,7 @@ var_dump($arr);
session_destroy(); session_destroy();
?> ?>
--EXPECT-- --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 OPEN: PHPSESSID
READ: abtest READ: abtest
object(foo)#2 (2) { object(foo)#2 (2) {

2
ext/session/tests/005.phpt
View file

@ -85,7 +85,7 @@ var_dump($baz); var_dump($arr); var_dump($c);
session_destroy(); session_destroy();
?> ?>
--EXPECTF-- --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 OPEN: PHPSESSID
READ: abtest READ: abtest
object(foo)#2 (2) { object(foo)#2 (2) {

2
ext/session/tests/006.phpt
View file

@ -45,7 +45,7 @@ echo "values after session:\n";
var_dump($a,$b); var_dump($a,$b);
?> ?>
--EXPECTF-- --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: original values:
object(a)#%d (1) { object(a)#%d (1) {
["test"]=> ["test"]=>

4
ext/session/tests/007.phpt
View file

@ -50,9 +50,9 @@ var_dump($HTTP_SESSION_VARS);
session_destroy(); session_destroy();
?> ?>
--EXPECTF-- --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 Deprecated: Function session_register() is deprecated in %s on line %d
float(3.14) float(3.14)

2
ext/session/tests/008-php4.2.3.phpt
View file

@ -58,7 +58,7 @@ var_dump($HTTP_SESSION_VARS);
session_destroy(); session_destroy();
?> ?>
--EXPECTF-- --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 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 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) { array(1) {

2
ext/session/tests/009.phpt
View file

@ -43,7 +43,7 @@ var_dump($HTTP_SESSION_VARS);
session_destroy(); session_destroy();
?> ?>
--EXPECT-- --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(0) {
} }
array(1) { array(1) {

2
ext/session/tests/012.phpt
View file

@ -32,7 +32,7 @@ session_destroy();
print "I live\n"; print "I live\n";
?> ?>
--EXPECTF-- --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 Deprecated: Function session_register() is deprecated in %s on line %d
I live I live

2
ext/session/tests/013.phpt
View file

@ -24,5 +24,5 @@ session_destroy();
print "I live\n"; print "I live\n";
?> ?>
--EXPECT-- --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 I live

2
ext/session/tests/014.phpt
View file

@ -33,7 +33,7 @@ ini_set("session.use_trans_sid","1");
session_destroy(); session_destroy();
?> ?>
--EXPECTF-- --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"> <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 Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d

2
ext/session/tests/019.phpt
View file

@ -47,7 +47,7 @@ var_dump($_SESSION);
session_destroy(); session_destroy();
?> ?>
--EXPECTF-- --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 Deprecated: Function session_register() is deprecated in %s on line %d
array(2) { array(2) {

40
ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
View file

@ -1,20 +1,20 @@
--TEST-- --TEST--
Test function get_cfg_var() by calling deprecated option Test function get_cfg_var() by calling deprecated option
--CREDITS-- --CREDITS--
Francesco Fullone ff@ideato.it Francesco Fullone ff@ideato.it
#PHPTestFest Cesena Italia on 2009-06-20 #PHPTestFest Cesena Italia on 2009-06-20
--INI-- --INI--
register_globals=1 register_globals=1
--SKIPIF-- --SKIPIF--
<?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or greater"); ?> <?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or greater"); ?>
--FILE-- --FILE--
<?php <?php
echo "*** Test by calling method or function with deprecated option ***\n"; echo "*** Test by calling method or function with deprecated option ***\n";
var_dump(get_cfg_var( 'register_globals' ) ); var_dump(get_cfg_var( 'register_globals' ) );
?> ?>
--EXPECTF-- --EXPECTF--
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0 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 *** *** Test by calling method or function with deprecated option ***
string(1) "1" string(1) "1"

2
ext/standard/tests/general_functions/putenv_error1.phpt
View file

@ -16,7 +16,7 @@ print ($set ? 'it worked' : 'boo') . "\n";
?> ?>
==DONE== ==DONE==
--EXPECTF-- --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 Warning: putenv(): Safe Mode warning: Cannot set environment variable 'FOO' - it's not in the allowed list in %s on line %d

2
ext/standard/tests/general_functions/putenv_error2.phpt
View file

@ -12,7 +12,7 @@ putenv('BAZ=bop');
?> ?>
==DONE== ==DONE==
--EXPECTF-- --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 Warning: putenv(): Safe Mode warning: Cannot override protected environment variable 'FOO' in %s on line %d

2
ext/standard/tests/misc/syslog_vars_variation1.phpt
View file

@ -7,5 +7,5 @@ define_syslog_variables=On
var_dump(isset($LOG_ERR)); var_dump(isset($LOG_ERR));
?> ?>
--EXPECTF-- --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) bool(true)

2
ext/standard/tests/strings/parse_str_basic3.phpt
View file

@ -91,7 +91,7 @@ var_dump($res);
?> ?>
===DONE=== ===DONE===
--EXPECTF-- --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 *** *** Testing parse_str() : basic functionality ***
Test string with array values Test string with array values

2
main/main.c
View file

@ -2076,7 +2076,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
while (*p) { while (*p) {
if (cfg_get_long((char*)*p, &val) == SUCCESS && val) { 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; ++p;
} }

5
tests/basic/bug46313-win.phpt
View file

@ -28,6 +28,8 @@ var_dump($GLOBALS["o1\'file"]);
var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]); var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]);
?> ?>
--EXPECTF-- --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) { array(2) {
["o1\'file"]=> ["o1\'file"]=>
array(5) { array(5) {
@ -60,6 +62,3 @@ string(12) "o1"
bool(true) bool(true)
string(%d) "%s" string(%d) "%s"
bool(true) 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