- Fixed tests

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
 

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
 

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
+

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
+

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

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
+

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
+

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

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
+

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
+

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

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

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

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
+

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

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

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)

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===