diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt index 30029c29501..7a1a54aec5c 100644 --- a/ext/imap/tests/imap_mutf7_to_utf8.phpt +++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt @@ -2,6 +2,7 @@ imap_mutf7_to_utf8 --SKIPIF-- + --FILE-- + --FILE-- string(2) "ok" @@ -43,4 +44,4 @@ array(1) { int(2) } } -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 + diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt index 529e1d9aa26..7a611674452 100644 --- a/ext/session/tests/004.phpt +++ b/ext/session/tests/004.phpt @@ -73,6 +73,7 @@ var_dump($arr); session_destroy(); ?> --EXPECT-- +PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 OPEN: PHPSESSID READ: abtest object(foo)#2 (2) { @@ -109,4 +110,3 @@ array(1) { } } DESTROY: abtest -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt index 9a4ed3ab016..4b7386590bb 100644 --- a/ext/session/tests/005.phpt +++ b/ext/session/tests/005.phpt @@ -85,6 +85,7 @@ var_dump($baz); var_dump($arr); var_dump($c); session_destroy(); ?> --EXPECTF-- +PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 OPEN: PHPSESSID READ: abtest object(foo)#2 (2) { @@ -146,4 +147,4 @@ array(1) { int(123) DESTROY: abtest CLOSE -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 + diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt index b481face44f..08327eacdd7 100644 --- a/ext/session/tests/006.phpt +++ b/ext/session/tests/006.phpt @@ -45,6 +45,7 @@ echo "values after session:\n"; var_dump($a,$b); ?> --EXPECTF-- +PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 original values: object(a)#%d (1) { ["test"]=> @@ -77,4 +78,4 @@ object(b)#%d (1) { string(5) "hallo" } } -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 + diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt index 71a9f105e71..64b5bc93b41 100644 --- a/ext/session/tests/007.phpt +++ b/ext/session/tests/007.phpt @@ -50,6 +50,9 @@ var_dump($HTTP_SESSION_VARS); session_destroy(); ?> --EXPECTF-- +PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +PHP Warning: 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) array(1) { @@ -61,5 +64,3 @@ array(1) { ["c"]=> &float(3.14) } -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 -PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/ext/session/tests/008-php4.2.3.phpt b/ext/session/tests/008-php4.2.3.phpt index 85b89b33ff4..fffc1d31490 100644 --- a/ext/session/tests/008-php4.2.3.phpt +++ b/ext/session/tests/008-php4.2.3.phpt @@ -58,6 +58,7 @@ var_dump($HTTP_SESSION_VARS); session_destroy(); ?> --EXPECTF-- +PHP Warning: 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) { @@ -69,4 +70,4 @@ array(1) { ["c"]=> float(3.14) } -PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 + diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt index dee12a0c340..206d8cddb91 100644 --- a/ext/session/tests/009.phpt +++ b/ext/session/tests/009.phpt @@ -43,6 +43,7 @@ var_dump($HTTP_SESSION_VARS); session_destroy(); ?> --EXPECT-- +PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 array(0) { } array(1) { @@ -57,4 +58,4 @@ array(0) { } array(0) { } -PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0 + diff --git a/ext/session/tests/012.phpt b/ext/session/tests/012.phpt index 6e2c406ae8a..c6b94de50f8 100644 --- a/ext/session/tests/012.phpt +++ b/ext/session/tests/012.phpt @@ -32,6 +32,7 @@ session_destroy(); print "I live\n"; ?> --EXPECTF-- +PHP Warning: 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 -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/ext/session/tests/013.phpt b/ext/session/tests/013.phpt index 17622d33f4d..818699e7593 100644 --- a/ext/session/tests/013.phpt +++ b/ext/session/tests/013.phpt @@ -24,5 +24,5 @@ session_destroy(); print "I live\n"; ?> --EXPECT-- -I live PHP Warning: 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 b91ac7835a4..eaeaab3bb3e 100644 --- a/ext/session/tests/014.phpt +++ b/ext/session/tests/014.phpt @@ -33,6 +33,7 @@ ini_set("session.use_trans_sid","1"); session_destroy(); ?> --EXPECTF-- +PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d @@ -40,4 +41,3 @@ Warning: ini_set(): A session is active. You cannot change the session module's Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt index 84e6bba194a..f4d763095be 100644 --- a/ext/session/tests/019.phpt +++ b/ext/session/tests/019.phpt @@ -47,6 +47,8 @@ var_dump($_SESSION); session_destroy(); ?> --EXPECTF-- +PHP Warning: 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) { ["o1"]=> @@ -72,4 +74,4 @@ array(2) { int(44) } } -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 + diff --git a/ext/standard/tests/general_functions/putenv_error1.phpt b/ext/standard/tests/general_functions/putenv_error1.phpt index 941c3f3c7cc..c5af05a9382 100644 --- a/ext/standard/tests/general_functions/putenv_error1.phpt +++ b/ext/standard/tests/general_functions/putenv_error1.phpt @@ -16,10 +16,11 @@ print ($set ? 'it worked' : 'boo') . "\n"; ?> ==DONE== --EXPECTF-- +PHP Warning: 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 'BAZ' - it's not in the allowed list in %s on line %d it worked it worked ==DONE== -PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/ext/standard/tests/general_functions/putenv_error2.phpt b/ext/standard/tests/general_functions/putenv_error2.phpt index 904b9b21749..365f0e544a3 100644 --- a/ext/standard/tests/general_functions/putenv_error2.phpt +++ b/ext/standard/tests/general_functions/putenv_error2.phpt @@ -12,8 +12,9 @@ putenv('BAZ=bop'); ?> ==DONE== --EXPECTF-- +PHP Warning: 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 'BAZ' in %s on line %d ==DONE== -PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/ext/standard/tests/misc/syslog_vars_variation1.phpt b/ext/standard/tests/misc/syslog_vars_variation1.phpt index adf64cb1e82..c5b998527ab 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-- -bool(true) PHP Warning: 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/network/define_syslog_variables_variation.phpt b/ext/standard/tests/network/define_syslog_variables_variation.phpt index 010dbdd388e..1e35633bc81 100644 --- a/ext/standard/tests/network/define_syslog_variables_variation.phpt +++ b/ext/standard/tests/network/define_syslog_variables_variation.phpt @@ -91,6 +91,7 @@ if ($failed == false) { ?> ===DONE=== --EXPECT-- +PHP Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing define_syslog_variables() : variation *** PASSED ===DONE===