- Fixed tests

diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt
index 30029c295016e52bd27d12a9692a4dc678dc21b7..7a1a54aec5cfc4cee8a155a7fff7997b9f265570 100644 (file)
--- 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--
 <?php if (!extension_loaded("imap")) print "skip"; ?>
+<?php if (!function_exists("imap_mutf7_to_utf8")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
index f092e938a4eb0f67c74b797ec7b504984cf3d86c..6598be0d25f381e5ab9995aecea6bb119ff9fdcb 100644 (file)
--- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
+++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
@@ -2,6 +2,7 @@
 imap_utf8_to_mutf7
 --SKIPIF--
 <?php if (!extension_loaded("imap")) print "skip"; ?>
+<?php if (!function_exists("imap_utf8_to_mutf7")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index f0d7af6ff74b6c3e9e81f8dea4c826f0f6b89054..1007f40ccd93fe2619d268aebbacd9739257e3d9 100644 (file)
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -31,8 +31,10 @@ print session_encode()."\n";
 
 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
 
 Deprecated: Function session_register() is deprecated in %s on line %d
 baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+

diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index ae7a7c18c237b4670b2fa72f702afe6d4a0a2291..253b740621c037aa814ccd69d73eed5641778ffd 100644 (file)
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -28,6 +28,7 @@ var_dump($baz);
 var_dump($arr);
 session_destroy();
 --EXPECT--
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 object(foo)#1 (2) {
   ["bar"]=>
   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 529e1d9aa26e418a80386cd2d05e4197ce065db3..7a611674452d3dcd7f2a8468901da2af74f503c4 100644 (file)
--- 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 9a4ed3ab016cabc839d034fcd7a7c2e5424ca073..4b7386590bb4321138c3f65ed6cb8dc1bbc37d94 100644 (file)
--- 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 b481face44f5f8b3f26acca4337a2d842e257c8e..08327eacdd772e0b5630f9be8c3faa281e171cf3 100644 (file)
--- 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 71a9f105e7136cd498ac603614e7775bad9f2c9d..64b5bc93b416129281c611f98f76bec0b2425f32 100644 (file)
--- 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 85b89b33ff47058693682b2c34e9ca6fe452b3db..fffc1d31490aa38489e0085b55536091cb241db1 100644 (file)
--- 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 dee12a0c340613bb94ab2f1ec74d20dd988106cb..206d8cddb915508dacdd7fff5317a00587ce893a 100644 (file)
--- 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 6e2c406ae8ad6406d0ff91370b8e15d290ac05df..c6b94de50f89127754b3ebfd7e5aa1dbb1f032c7 100644 (file)
--- 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 17622d33f4d8b12df68890383fe72a2ff94f8c70..818699e759304b798163ccd80da29eca7cc55e91 100644 (file)
--- 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 b91ac7835a49dc65e641c0c0d16439aa707af49f..eaeaab3bb3e6a8497490e5dab9331deaace85084 100644 (file)
--- 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
 <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
@@ -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
 <a href="/link?PHPSESSID=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/019.phpt b/ext/session/tests/019.phpt
index 84e6bba194a81973c96b1c6e624bff04e19fe241..f4d763095bea2ad997a5bd811e19d1f43d8d35ff 100644 (file)
--- 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 941c3f3c7ccdbee761103218db4256a439400148..c5af05a93826b7513861927cf00587d398ec410e 100644 (file)
--- 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 904b9b21749f7584022a05393b9ea7771dad39ff..365f0e544a3d66cc48ab5e1d9548ac84e69643d8 100644 (file)
--- 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 adf64cb1e82bc5db199bee266e4acea8262cf49e..c5b998527ab4b9012c5c9a827cf9a05420bfc346 100644 (file)
--- 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 010dbdd388e489a01e311c80432618ba1d53dd70..1e35633bc818e53511313a7fa187b57b75eff558 100644 (file)
--- 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===