MFH

diff --git a/ext/spl/tests/dit_002.phpt b/ext/spl/tests/dit_002.phpt
index 565a12e95d5c29e240105d78cf5a8f47b4fbc960..fc111e501270eac9feb22040aa2e0bdf900b67d3 100755 (executable)
--- a/ext/spl/tests/dit_002.phpt
+++ b/ext/spl/tests/dit_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SPL: DirectoryIterator defaults
+--SKIPIF--
+<?php if (!extension_loaded("spl") || !extension_loaded('reflection')) print "skip"; ?>
 --FILE--
 <?php
 
@@ -29,7 +31,7 @@ foreach ($classes as $class => $flags) {
                        var_dump($obj->getFlags());
                        if ($isstring) {
                                $val = $obj->current();
-                               if (is_string($val)) {
+                               if (is_string($val) || is_unicode($val)) {
                                        var_dump(true);
                                } else {
                                        var_dump($val);

diff --git a/ext/standard/tests/general_functions/bug44394_2.phpt b/ext/standard/tests/general_functions/bug44394_2.phpt
index b725284488221090a7e8266fe7eaf4caa332adc7..3bd3f0e93ee732f96e382a221521a655cbffa82b 100644 (file)
--- a/ext/standard/tests/general_functions/bug44394_2.phpt
+++ b/ext/standard/tests/general_functions/bug44394_2.phpt
@@ -8,7 +8,7 @@ session.name=PHPSESSID
 <?php
 
 ini_set('session.use_trans_sid', 1);
-
+session_save_path(dirname(__FILE__));
 session_start();
 
 ob_start();
@@ -23,6 +23,8 @@ ob_flush();
 
 ob_end_clean();
 
+unlink(dirname(__FILE__).'/sess_'.session_id());
+
 ?>
 --EXPECTF--
 <a href='a?q=1&PHPSESSID=%s&a=b'>asd</a>