From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 16 May 2011 23:22:17 +0000 (+0000)
Subject: reverting 311103,311105-311109, will commit them to all three branches
X-Git-Tag: php-5.3.7RC1~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a944f7a6636719922e61e823e1b63d6f78ee01eb;p=php

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 d095db56b3..f82a2f6f6d 100644
--- 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 eecf108131..1ee7c324f6 100644
--- 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 fb0fe46d89..e136c8f2b6 100644
--- 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 6913655ee4..520a464123 100644
--- 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 7aa00e537e..ab2abb7b76 100644
--- 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 600c9b706d..21a2d6c534 100644
--- 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 51acfc4b46..ff5f34c5b4 100644
--- 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 f85b89e102..aafb26629f 100644
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 fbd9e26120..95c2dfb681 100644
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 2313ffab88..c20590b797 100644
--- 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