From b00c9f4501967d7f536b4c89cdc58d3631125046 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Wed, 29 Sep 2004 20:16:03 +0000
Subject: [PATCH] MFH

---
 ext/spl/tests/array_009.phpt    |  2 ++
 ext/spl/tests/array_010.phpt    |  4 +---
 ext/spl/tests/array_014.phpt    |  2 ++
 ext/spl/tests/bug28822.phpt     |  2 ++
 ext/spl/tests/dit_001.phpt      | 10 +++++++++-
 ext/spl/tests/iterator_002.phpt |  2 ++
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ext/spl/tests/array_009.phpt b/ext/spl/tests/array_009.phpt
index f9c5fe1c73..5499caad69 100755
--- 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 2c59b3be18..dae6b93d6d 100755
--- 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 2bd3fc8808..6cd560fe30 100755
--- 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 c3da4607f5..28c22c5ed2 100755
--- 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 62aae99c8b..f02291c77b 100755
--- 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 25a9ce218d..b481a0e00f 100755
--- 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
 
-- 
2.40.0