reverting 311103,311105-311109, will commit them to all three branches

diff --git a/ext/date/tests/DateInterval_format_a.phpt b/ext/date/tests/DateInterval_format_a.phpt
index d095db56b36bb28148430f55a258a2b859a49bb5..f82a2f6f6deebe0e1f75038879a7bf9daa685150 100644 (file)
--- a/ext/date/tests/DateInterval_format_a.phpt
+++ b/ext/date/tests/DateInterval_format_a.phpt
@@ -3,13 +3,8 @@ DateInterval::format(), %a
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 # TestFest 2010 BKTK
---INI--
-date.timezone=UTC
 --SKIPIF--
-<?php 
-if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); 
-if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only");
-?>
+<?php if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); ?>
 --XFAIL--
 Windows VC6 libs' floor()/ceil() choke on floats
 --FILE--

diff --git a/ext/date/tests/bug51819.phpt b/ext/date/tests/bug51819.phpt
index eecf10813170f3eb89c68c8b589bcc1fb069aaa8..1ee7c324f624602f3d0f2b0014b14468a9efe493 100644 (file)
--- a/ext/date/tests/bug51819.phpt
+++ b/ext/date/tests/bug51819.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #51819 (Case discrepancy in timezone names cause Uncaught exception and fatal error)
---XFAIL--
-Bug #51819 isn't fixed yet
 --FILE--
 <?php
 date_default_timezone_set('UTC');
@@ -32,4 +30,4 @@ foreach ($aTz as $sTz) {
 var_dump('this should be the only output');
 ?>
 --EXPECTF--
-string(30) "this should be the only output"
+string(30) "this should be the only output"
\ No newline at end of file

diff --git a/ext/date/tests/bug51994.phpt b/ext/date/tests/bug51994.phpt
index fb0fe46d892adfc2783b68f4564455196a0e2641..e136c8f2b6fa950140aee2d8a3b4c31966300b71 100644 (file)
--- a/ext/date/tests/bug51994.phpt
+++ b/ext/date/tests/bug51994.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #51994 (date_parse_from_format is parsing invalid date using 'yz' format)
---XFAIL--
-Bug #51994 isn't fixed yet
 --FILE--
 <?php
 $trans_date = '10153'; // 152nd day of year 2010 -> 03.06.2010
@@ -37,4 +35,4 @@ array(12) {
   }
   ["is_localtime"]=>
   bool(false)
-}
+}
\ No newline at end of file

diff --git a/ext/standard/tests/file/bug39863.phpt b/ext/standard/tests/file/bug39863.phpt
index 6913655ee45bc9c55de7fe7c0acf3c3ce0a7678d..520a464123018c1b45d36627ff8a33e858aa7947 100644 (file)
--- a/ext/standard/tests/file/bug39863.phpt
+++ b/ext/standard/tests/file/bug39863.phpt
@@ -16,6 +16,8 @@ else {
 ?>
 ===DONE===
 <?php exit(0); ?>
+--XFAIL--
+Needs bug #39863 fixed
 --EXPECT--
 PASS
 ===DONE===

diff --git a/ext/standard/tests/network/gethostbynamel_error.phpt b/ext/standard/tests/network/gethostbynamel_error.phpt
index 7aa00e537e7f471009272d55708451e9ae426a23..ab2abb7b769f063b094e8fffd7262f9be2faca01 100644 (file)
--- a/ext/standard/tests/network/gethostbynamel_error.phpt
+++ b/ext/standard/tests/network/gethostbynamel_error.phpt
@@ -19,6 +19,7 @@ echo "\n-- Testing gethostbynamel() function with more than expected no. of argu
 $hostname = 'string_val';
 $extra_arg = 10;
 var_dump( gethostbynamel($hostname, $extra_arg) );
+
 echo "Done";
 ?>
 --EXPECTF--
@@ -33,4 +34,5 @@ NULL
 
 Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
+
 Done

diff --git a/ext/standard/tests/serialize/001.phpt b/ext/standard/tests/serialize/001.phpt
index 600c9b706d94175c95469e629f83b2f03b297795..21a2d6c5347a566259cbbed31a18dfe90ac529f5 100644 (file)
--- a/ext/standard/tests/serialize/001.phpt
+++ b/ext/standard/tests/serialize/001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 serialize()/unserialize()/var_dump()
---INI--
-serialize_precision=100
 --FILE--
 <?php 
 class t

diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt
index 51acfc4b469ad99790802a91f54b039a875bc53b..ff5f34c5b4c6bb7eb7bf84780ad2471c49ff06bf 100644 (file)
--- a/ext/standard/tests/serialize/serialization_arrays_001.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test serialize() & unserialize() functions: arrays (circular references)
---INI--
-serialize_precision=100
 --FILE--
 <?php 
 /* Prototype  : proto string serialize(mixed variable)

diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt
index f85b89e102789f82036ad3fc153f1a4c07783c70..aafb26629f2f1971a515a31d109568e70fd8f817 100644 (file)
Binary files a/ext/standard/tests/serialize/serialization_objects_001.phpt and b/ext/standard/tests/serialize/serialization_objects_001.phpt differ

diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt
index fbd9e261206e0be1212683d299f2ea488a6fc105..95c2dfb68196a480f0c926894f0fb048d09c4e85 100644 (file)
Binary files a/ext/standard/tests/serialize/serialization_objects_002.phpt and b/ext/standard/tests/serialize/serialization_objects_002.phpt differ

diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt
index 2313ffab8837231001c8760abb074f328c7138ce..c20590b79780454e8d12ff3cd1b0337455689d2f 100644 (file)
--- a/ext/standard/tests/serialize/serialization_objects_003.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test serialize() & unserialize() functions: objects (abstract classes)
---INI--
-serialize_precision=100
 --FILE--
 <?php 
 /* Prototype  : proto string serialize(mixed variable)
@@ -66,4 +64,4 @@ object(extendName)#%d (3) {
 string(18) "s:10:"extendName";"
 string(10) "extendName"
 
-Done
+Done
\ No newline at end of file