- Fixed tests

7 files changed, 24 insertions, 16 deletions

diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
index bd6344fa24..126c4b8327 100644
--- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
@@ -26,7 +26,7 @@ var_dump( $abbr["acst"] );
 --EXPECT--
 *** Testing DateTimeZone::listAbbreviations() : basic functionality ***
 string(5) "array"
-int(338)
+int(399)
 
 -- Format a sample entry --
 array(4) {
diff --git a/ext/date/tests/bug51393.phpt b/ext/date/tests/bug51393.phpt
index c4c4d61a1e..e3f0983ae2 100644
--- a/ext/date/tests/bug51393.phpt
+++ b/ext/date/tests/bug51393.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #51393 (DateTime::createFromFormat() fails if format string contains timezone)
+--INI--
+date.timezone=UTC
 --FILE--
 <?php
 $dt = DateTime::createFromFormat('O', '+0800');
diff --git a/ext/date/tests/date_diff.phpt b/ext/date/tests/date_diff.phpt
index 967e9136ce..31783a884d 100644
--- a/ext/date/tests/date_diff.phpt
+++ b/ext/date/tests/date_diff.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Extensive test for date_diff().
+--INI--
+date.timezone=UTC
 --FILE--
 <?php
 $ok = 0;
diff --git a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
index f3881c56db..1f5ba432c3 100644
--- a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
@@ -64,10 +64,7 @@ foreach ($classes as $class) {
 				 
 ?>
 --EXPECTF--
-
-Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26
-
-Strict Standards: %s for class NewAndOldCtor in %s on line 31
+Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
 Constructor of NewCtor: __construct
 Constructor of ExtendsNewCtor: __construct
 Constructor of OldCtor: OldCtor
@@ -79,4 +76,4 @@ Constructor of C: C
 Constructor of D1: __construct
 Constructor of D2: C
 No constructor for X
-No constructor for Y
\ No newline at end of file
+No constructor for Y
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt b/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
index dcc6080b42..2a2f02ffe0 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
@@ -86,8 +86,6 @@ var_dump($methodInfo->isConstructor());
 ?>
 --EXPECTF--
 Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
-
-Strict Standards: %s for class NewAndOldCtor in %s on line %d
 New-style constructor:
 bool(true)
 
diff --git a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
index a784f6d9e0..5a0c36f9ee 100644
--- a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
@@ -64,10 +64,7 @@ foreach ($classes as $class) {
 				
 ?>
 --EXPECTF--
-
-Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26
-
-Strict Standards: %s for class NewAndOldCtor in %s on line 31
+Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
 Constructor of NewCtor: __construct
 Constructor of ExtendsNewCtor: __construct
 Constructor of OldCtor: OldCtor
diff --git a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
index e8ffd5752a..0accb2c85f 100644
--- a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+++ b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
@@ -35,13 +35,25 @@ Class [ <internal%s> class Directory ] {
   }
 
   - Methods [3] {
-    Method [ <internal%s> public method close ] {
+    Method [ <internal:standard> public method close ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <optional> $dir_handle ]
+      }
     }
 
-    Method [ <internal%s> public method rewind ] {
+    Method [ <internal:standard> public method rewind ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <optional> $dir_handle ]
+      }
     }
 
-    Method [ <internal%s> public method read ] {
+    Method [ <internal:standard> public method read ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <optional> $dir_handle ]
+      }
     }
   }
 }
@@ -50,4 +62,4 @@ object(Directory)#%d (0) {
 }
 
 Warning: Directory::read(): Unable to find my handle property in %s on line 15
-bool(false)
\ No newline at end of file
+bool(false)