MFH

diff --git a/ext/spl/tests/array_009.phpt b/ext/spl/tests/array_009.phpt
index f9c5fe1c7309f60b593d095b4feef60e054a8030..5499caad695fa057ff781965767c6234eb4b5b13 100755 (executable)
--- a/ext/spl/tests/array_009.phpt
+++ b/ext/spl/tests/array_009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SPL: ArrayIterator implementing RecursiveIterator
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/ext/spl/tests/array_010.phpt b/ext/spl/tests/array_010.phpt
index 2c59b3be182483a3a12bf54d3b4dc160888e84cb..dae6b93d6de280c842f7598e69a9780bec802514 100755 (executable)
--- a/ext/spl/tests/array_010.phpt
+++ b/ext/spl/tests/array_010.phpt
@@ -1,9 +1,7 @@
 --TEST--
 SPL: ArrayIterator implements ArrayAccess
 --SKIPIF--
-<?php
-       if (!class_exists('ArrayAccess')) die('skip ArrayAccess not present');
-?>
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/ext/spl/tests/array_014.phpt b/ext/spl/tests/array_014.phpt
index 2bd3fc8808634618f78f1d267b64331d10f95311..6cd560fe3070b5e6cc84c49277d8451c7abdecbb 100755 (executable)
--- a/ext/spl/tests/array_014.phpt
+++ b/ext/spl/tests/array_014.phpt
@@ -16,8 +16,10 @@ var_dump($it->current());
 $it->seek(12);
 var_dump($it->current());
 
+$pos = 0;
 foreach($it as $v)
 {
+       $it->seek($pos++);
        var_dump($v);
 }
 

diff --git a/ext/spl/tests/bug28822.phpt b/ext/spl/tests/bug28822.phpt
index c3da4607f557a3fd32820652805b46c97f3a4f8b..28c22c5ed2f94cc9e7ccd1396f9068a8481ad5da 100755 (executable)
--- a/ext/spl/tests/bug28822.phpt
+++ b/ext/spl/tests/bug28822.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #28822: ArrayObject::offsetExists() works inverted
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/ext/spl/tests/dit_001.phpt b/ext/spl/tests/dit_001.phpt
index 62aae99c8b087d2899a9e6d76fc7e488d1f1df2c..f02291c77ba1172953af2b599bfe855062d2cc19 100755 (executable)
--- a/ext/spl/tests/dit_001.phpt
+++ b/ext/spl/tests/dit_001.phpt
@@ -1,11 +1,19 @@
 --TEST--
 SPL: Problem with casting to string
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $d = new DirectoryIterator('.');
-preg_match('/x/', $d);
 var_dump($d);
+var_dump(is_string($d));
+preg_match('/x/', $d);
+var_dump(is_string($d));
 ?>
+===DONE===
 --EXPECTF--
 object(DirectoryIterator)#%d (0) {
 }
+bool(false)
+bool(false)
+===DONE===

diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt
index 25a9ce218d59eb8eca869c22eebbd67258668e15..b481a0e00fc4a76f179c1f0558c180b1012bc1c8 100755 (executable)
--- a/ext/spl/tests/iterator_002.phpt
+++ b/ext/spl/tests/iterator_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SPL: Iterator using getInnerIterator
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php