Imported Upstream version 5.5.8+dfsgupstream/5.5.8+dfsg

27 files changed, 59 insertions, 69 deletions

diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt
index 19ee728fd..974808c08 100644
--- a/ext/standard/tests/array/each.phpt
+++ b/ext/standard/tests/array/each.phpt
diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt
index 52a358476..5f51b4bd9 100644
--- a/ext/standard/tests/class_object/class_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt
@@ -100,15 +100,12 @@ In __autoload(12345)
 bool(false)
 
 Arg value -2345 
-In __autoload(-2345)
 bool(false)
 
 Arg value 10.5 
-In __autoload(10.5)
 bool(false)
 
 Arg value -10.5 
-In __autoload(-10.5)
 bool(false)
 
 Arg value 101234567000 
@@ -116,11 +113,9 @@ In __autoload(101234567000)
 bool(false)
 
 Arg value 1.07654321E-9 
-In __autoload(1.07654321E-9)
 bool(false)
 
 Arg value 0.5 
-In __autoload(0.5)
 bool(false)
 Error: 8 - Array to string conversion, %sclass_exists_variation_001.php(%d)
 
diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
index e7fa4afd1..81df711cf 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
@@ -100,15 +100,12 @@ In __autoload(12345)
 bool(false)
 
 Arg value -2345 
-In __autoload(-2345)
 bool(false)
 
 Arg value 10.5 
-In __autoload(10.5)
 bool(false)
 
 Arg value -10.5 
-In __autoload(-10.5)
 bool(false)
 
 Arg value 101234567000 
@@ -116,11 +113,9 @@ In __autoload(101234567000)
 bool(false)
 
 Arg value 1.07654321E-9 
-In __autoload(1.07654321E-9)
 bool(false)
 
 Arg value 0.5 
-In __autoload(0.5)
 bool(false)
 Error: 8 - Array to string conversion, %strait_exists_variation_001.php(%d)
 
diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index a369c9d97..112beb305 100644
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -76,7 +76,7 @@ bool(false)
 Warning: fopen() expects at least 2 parameters, 0 given in %s on line %d
 bool(false)
 
-Warning: fclose(): 5 is not a valid stream resource in %s on line %d
+Warning: fclose(): %d is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d
@@ -85,7 +85,7 @@ bool(false)
 Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)
 
-Warning: feof(): 5 is not a valid stream resource in %s on line %d
+Warning: feof(): %d is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: feof() expects parameter 1 to be resource, string given in %s on line %d
diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index 3691e962e..2b4ad6812 100644
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -98,7 +98,7 @@ bool(false)
 Warning: fgetss() expects parameter 1 to be resource, object given in %s on line %d
 bool(false)
 -- Testing fgetss() with closed/unset file handle --
-Warning: fgetss(): 5 is not a valid stream resource in %s on line %d
+Warning: fgetss(): %d is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fgetss() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index a28095bc2..254ad7688 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -114,7 +114,7 @@ Warning: ftruncate() expects parameter 1 to be resource, object given in %s on l
 bool(false)
 -- Testing ftruncate() with closed/unset file handle --
 
-Warning: ftruncate(): 5 is not a valid stream resource in %s on line %d
+Warning: ftruncate(): %d is not a valid stream resource in %s on line %d
 bool(false)
 int(36)
 
diff --git a/ext/standard/tests/general_functions/floatval.phpt b/ext/standard/tests/general_functions/floatval.phpt
index b427bda7d..9b7a3281e 100644
--- a/ext/standard/tests/general_functions/floatval.phpt
+++ b/ext/standard/tests/general_functions/floatval.phpt
@@ -157,8 +157,8 @@ float(-5000000)
 *** Testing floatval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-float(5)
-float(6)
+float(%d)
+float(%d)
 float(0)
 float(1)
 float(-1300)
@@ -175,8 +175,8 @@ float(0)
 *** Testing doubleval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-float(5)
-float(6)
+float(%d)
+float(%d)
 float(0)
 float(1)
 float(-1300)
diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
index d6fb0d495..d1fd4095b 100644
--- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
@@ -232,11 +232,11 @@ int(0)
 string(7) "integer"
 -- Iteration 12 --
 bool(true)
-int(5)
+int(%d)
 string(7) "integer"
 -- Iteration 13 --
 bool(true)
-int(6)
+int(%d)
 string(7) "integer"
 -- Iteration 14 --
 8: Object of class point could not be converted to int
@@ -291,11 +291,11 @@ int(0)
 string(7) "integer"
 -- Iteration 12 --
 bool(true)
-int(5)
+int(%d)
 string(7) "integer"
 -- Iteration 13 --
 bool(true)
-int(6)
+int(%d)
 string(7) "integer"
 -- Iteration 14 --
 8: Object of class point could not be converted to int
@@ -350,11 +350,11 @@ float(0)
 string(6) "double"
 -- Iteration 12 --
 bool(true)
-float(5)
+float(%d)
 string(6) "double"
 -- Iteration 13 --
 bool(true)
-float(6)
+float(%d)
 string(6) "double"
 -- Iteration 14 --
 8: Object of class point could not be converted to double
@@ -409,11 +409,11 @@ float(0)
 string(6) "double"
 -- Iteration 12 --
 bool(true)
-float(5)
+float(%d)
 string(6) "double"
 -- Iteration 13 --
 bool(true)
-float(6)
+float(%d)
 string(6) "double"
 -- Iteration 14 --
 8: Object of class point could not be converted to double
@@ -610,12 +610,12 @@ string(6) "string"
 -- Iteration 12 --
 2: settype(): Cannot convert to resource type
 bool(false)
-resource(5) of type (stream)
+resource(%d) of type (stream)
 string(8) "resource"
 -- Iteration 13 --
 2: settype(): Cannot convert to resource type
 bool(false)
-resource(6) of type (stream)
+resource(%d) of type (stream)
 string(8) "resource"
 -- Iteration 14 --
 2: settype(): Cannot convert to resource type
@@ -716,14 +716,14 @@ string(5) "array"
 bool(true)
 array(1) {
   [0]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
 }
 string(5) "array"
 -- Iteration 13 --
 bool(true)
 array(1) {
   [0]=>
-  resource(6) of type (stream)
+  resource(%d) of type (stream)
 }
 string(5) "array"
 -- Iteration 14 --
@@ -824,14 +824,14 @@ string(6) "object"
 bool(true)
 object(stdClass)#2 (1) {
   ["scalar"]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
 }
 string(6) "object"
 -- Iteration 13 --
 bool(true)
 object(stdClass)#2 (1) {
   ["scalar"]=>
-  resource(6) of type (stream)
+  resource(%d) of type (stream)
 }
 string(6) "object"
 -- Iteration 14 --
@@ -893,11 +893,11 @@ string(6) "string"
 string(6) "string"
 -- Iteration 12 --
 bool(true)
-string(14) "Resource id #5"
+string(14) "Resource id #%d"
 string(6) "string"
 -- Iteration 13 --
 bool(true)
-string(14) "Resource id #6"
+string(14) "Resource id #%d"
 string(6) "string"
 -- Iteration 14 --
 bool(true)
diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index 81a523ad0..19e71fbfd 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -1484,13 +1484,13 @@ object_class Object
 *** Testing print_r() on resources ***
 
 -- Iteration 1 --
-Resource id #5
-Resource id #5
-Resource id #5
+Resource id #%d
+Resource id #%d
+Resource id #%d
 -- Iteration 2 --
-Resource id #6
-Resource id #6
-Resource id #6
+Resource id #%d
+Resource id #%d
+Resource id #%d
 *** Testing print_r() on different combinations of scalar 
             and non-scalar variables ***
 
diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt
index b92be41ef..372ac6701 100644
--- a/ext/standard/tests/general_functions/strval.phpt
+++ b/ext/standard/tests/general_functions/strval.phpt
@@ -279,9 +279,9 @@ string(0) ""
 -- Iteration 1 --
 string(6) "Object"
 -- Iteration 2 --
-string(14) "Resource id #5"
+string(14) "Resource id #%d"
 -- Iteration 3 --
-string(14) "Resource id #6"
+string(14) "Resource id #%d"
 -- Iteration 4 --
 
 Notice: Array to string conversion in %sstrval.php on line %d
diff --git a/ext/standard/tests/general_functions/type.phpt b/ext/standard/tests/general_functions/type.phpt
index 98eccbbda..51654b185 100644
--- a/ext/standard/tests/general_functions/type.phpt
+++ b/ext/standard/tests/general_functions/type.phpt
@@ -105,9 +105,9 @@ int(0)
 bool(true)
 int(0)
 bool(true)
-int(5)
+int(%d)
 bool(true)
-int(6)
+int(%d)
 string(54) "Object of class stdClass could not be converted to int"
 bool(true)
 int(%d)
@@ -128,9 +128,9 @@ float(0)
 bool(true)
 float(0)
 bool(true)
-float(5)
+float(%d)
 bool(true)
-float(6)
+float(%d)
 string(57) "Object of class stdClass could not be converted to double"
 bool(true)
 float(%d)
diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index 09e9f3b99..c47227141 100644
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -844,9 +844,9 @@ object(object_class)#13 (8) {
 
 *** Testing var_dump() on resources ***
 -- Iteration 1 --
-resource(5) of type (stream)
+resource(%d) of type (stream)
 -- Iteration 2 --
-resource(6) of type (stream)
+resource(%d) of type (stream)
 
 *** Testing var_dump() on different combinations of scalar 
             and non-scalar variables ***
@@ -1227,9 +1227,9 @@ array(4) {
 }
 array(2) {
   [0]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
   [1]=>
-  resource(6) of type (stream)
+  resource(%d) of type (stream)
 }
 array(9) {
   [0]=>
diff --git a/ext/standard/tests/mail/bug51604.phpt b/ext/standard/tests/mail/bug51604.phpt
index a65702102..988849c4e 100644
--- a/ext/standard/tests/mail/bug51604.phpt
+++ b/ext/standard/tests/mail/bug51604.phpt
@@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 $additional_headers = "KHeaders\n\n\n\n\n";
@@ -27,7 +27,7 @@ unlink($outFile);
 ===DONE===
 --EXPECT--
 bool(true)
-To: user@company.com
+To: user@example.com
 Subject: Test Subject
 KHeaders
 
diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt
index fecb50f32..70f32df40 100644
--- a/ext/standard/tests/mail/mail_basic.phpt
+++ b/ext/standard/tests/mail/mail_basic.phpt
@@ -20,7 +20,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 $additional_headers = 'KHeaders';
@@ -45,7 +45,7 @@ unlink($outFile);
 *** Testing mail() : basic functionality ***
 -- All Mail Content Parameters --
 bool(true)
-To: user@company.com
+To: user@example.com
 Subject: Test Subject
 KHeaders
 
@@ -53,7 +53,7 @@ A Message
 
 -- Mandatory Parameters --
 bool(true)
-To: user@company.com
+To: user@example.com
 Subject: Test Subject
 
 A Message
diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt
index 8967d18c4..60ad00919 100644
--- a/ext/standard/tests/mail/mail_basic2.phpt
+++ b/ext/standard/tests/mail/mail_basic2.phpt
@@ -20,7 +20,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 $additional_headers = 'KHeaders';
@@ -40,7 +40,7 @@ unlink($outFile);
 *** Testing mail() : basic functionality ***
 -- extra parameters --
 bool(true)
-%w1%wTo: user@company.com
+%w1%wTo: user@example.com
 %w2%wSubject: Test Subject
 %w3%wKHeaders
 %w4%w
diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt
index 58eae0379..3e648e5ca 100644
--- a/ext/standard/tests/mail/mail_basic3.phpt
+++ b/ext/standard/tests/mail/mail_basic3.phpt
@@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 
diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt
index 9ecc886ae..de2407a74 100644
--- a/ext/standard/tests/mail/mail_basic4.phpt
+++ b/ext/standard/tests/mail/mail_basic4.phpt
@@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 
diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt
index 7e42ccb83..8d755ebb8 100644
--- a/ext/standard/tests/mail/mail_basic5.phpt
+++ b/ext/standard/tests/mail/mail_basic5.phpt
@@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 
diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
index 3c4dd88a5..fc5049834 100644
--- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
@@ -22,7 +22,7 @@ max_execution_time = 120
 error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localhost");
 ini_set("smtp_port", 25);
-ini_set("sendmail_from", "user@company.com");
+ini_set("sendmail_from", "user@example.com");
 
 echo "*** Testing mail() : basic functionality ***\n";
 require_once(dirname(__FILE__).'/mail_include.inc');
diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
index d7bae62a0..892d92391 100644
--- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
@@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi
 Send an email message
 HERE;
 
-$extra_headers = "from: user@company.com";
+$extra_headers = "from: user@example.com";
 
 $res = mail($to, $subject, $message, $extra_headers);
 
diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
index 86b57eb81..1caa68c06 100644
--- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
@@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi
 Send an email message
 HERE;
 
-$extra_headers = "FRom: user@company.com";
+$extra_headers = "FRom: user@example.com";
 
 $res = mail($to, $subject, $message, $extra_headers);
 
diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
index f4a9d466b..c8e45242e 100644
--- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
@@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi
 Send an email message
 HERE;
 
-$extra_headers = "from: user@company.com";
+$extra_headers = "from: user@example.com";
 $extra_parameters = "addons"; // should be ignored
 
 $res = mail($to, $subject, $message, $extra_headers, $extra_parameters);
diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt
index bf37bf41e..a8eb6bec7 100644
--- a/ext/standard/tests/mail/mail_variation1.phpt
+++ b/ext/standard/tests/mail/mail_variation1.phpt
@@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 echo "*** Testing mail() : variation ***\n";
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 var_dump( mail($to, $subject, $message) );
diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt
index c16c2706a..f0e44241b 100644
--- a/ext/standard/tests/mail/mail_variation2.phpt
+++ b/ext/standard/tests/mail/mail_variation2.phpt
@@ -21,7 +21,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$to = 'user@company.com';
+$to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 $outFile = "/tmp/php_test_mailVariation2.out";
@@ -36,7 +36,7 @@ unlink($outFile);
 --EXPECTF--
 *** Testing mail() : basic functionality ***
 bool(true)
-%w1%wTo: user@company.com
+%w1%wTo: user@example.com
 %w2%wSubject: Test Subject
 %w3%w
 %w4%wA Message
diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
index b81f3af9d..dd7fd937e 100644
--- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
+++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
@@ -21,7 +21,7 @@ max_execution_time = 120
 error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localhost");
 ini_set("smtp_port", 2525);
-ini_set("sendmail_from", "user@company.com");
+ini_set("sendmail_from", "user@example.com");
 
 echo "*** Testing mail() : basic functionality ***\n";
 require_once(dirname(__FILE__).'/mail_include.inc');
diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
index 6ae06bb20..817cc36af 100644
--- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
+++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
@@ -21,7 +21,7 @@ max_execution_time = 120
 error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localplace");
 ini_set("smtp_port", 25);
-ini_set("sendmail_from", "user@company.com");
+ini_set("sendmail_from", "user@example.com");
 
 echo "*** Testing mail() : basic functionality ***\n";
 require_once(dirname(__FILE__).'/mail_include.inc');
diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 3997c54b5..3720c0692 100644
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt