From: Sebastian Bergmann <sebastian@php.net>
Date: Sat, 24 May 2008 14:10:44 +0000 (+0000)
Subject: Drop SKIPIF check for ext/spl.
X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a4eb3e4a6d9212f2510d6dccb0b54730198967e;p=php

Drop SKIPIF check for ext/spl.
---

diff --git a/ext/spl/tests/array_001.phpt b/ext/spl/tests/array_001.phpt
index 79dfc424e7..9f4f35057f 100755
--- a/ext/spl/tests/array_001.phpt
+++ b/ext/spl/tests/array_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_002.phpt b/ext/spl/tests/array_002.phpt
index 315f1e6913..55935882f8 100755
--- a/ext/spl/tests/array_002.phpt
+++ b/ext/spl/tests/array_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject copy constructor
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt
index a7f44e1ca3..de4ce30f91 100755
--- a/ext/spl/tests/array_003.phpt
+++ b/ext/spl/tests/array_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject from object
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_004.phpt b/ext/spl/tests/array_004.phpt
index e7abf2b1dc..dd07f29820 100755
--- a/ext/spl/tests/array_004.phpt
+++ b/ext/spl/tests/array_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 allow_call_time_pass_reference=1
 --FILE--
diff --git a/ext/spl/tests/array_005.phpt b/ext/spl/tests/array_005.phpt
index 9214a4c92b..d7ef15db1a 100755
--- a/ext/spl/tests/array_005.phpt
+++ b/ext/spl/tests/array_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject/Iterator interaction
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_006.phpt b/ext/spl/tests/array_006.phpt
index 274007aea4..49f2838f77 100755
--- a/ext/spl/tests/array_006.phpt
+++ b/ext/spl/tests/array_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator without ArrayObject
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 error_reporting=2047
 --FILE--
diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt
index 269d71cb6e..7d9bf6afc1 100755
--- a/ext/spl/tests/array_007.phpt
+++ b/ext/spl/tests/array_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject/Iterator from IteratorAggregate
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt
index 613e324776..61c7abd7c6 100755
--- a/ext/spl/tests/array_008.phpt
+++ b/ext/spl/tests/array_008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator and foreach reference
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 allow_call_time_pass_reference=1
 --FILE--
diff --git a/ext/spl/tests/array_009.phpt b/ext/spl/tests/array_009.phpt
index 0431cca77e..fc0d60baa9 100755
--- a/ext/spl/tests/array_009.phpt
+++ b/ext/spl/tests/array_009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator implementing RecursiveIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_009a.phpt b/ext/spl/tests/array_009a.phpt
index aebac08ba6..396aa9b9e9 100755
--- a/ext/spl/tests/array_009a.phpt
+++ b/ext/spl/tests/array_009a.phpt
@@ -1,7 +1,5 @@
 --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 dae6b93d6d..6b331e4b51 100755
--- a/ext/spl/tests/array_010.phpt
+++ b/ext/spl/tests/array_010.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator implements ArrayAccess
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_011.phpt b/ext/spl/tests/array_011.phpt
index 09b132cfef..0c5ad55d68 100755
--- a/ext/spl/tests/array_011.phpt
+++ b/ext/spl/tests/array_011.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator, LimitIterator and string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_012.phpt b/ext/spl/tests/array_012.phpt
index a8889654a5..2ee9724d28 100755
--- a/ext/spl/tests/array_012.phpt
+++ b/ext/spl/tests/array_012.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::count
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt
index 905b8339c9..3fda53884f 100755
--- a/ext/spl/tests/array_013.phpt
+++ b/ext/spl/tests/array_013.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::append
---SKIPIF--
-<?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 ad9bc6c4ac..1ac9d4f956 100755
--- a/ext/spl/tests/array_014.phpt
+++ b/ext/spl/tests/array_014.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::seek()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_015.phpt b/ext/spl/tests/array_015.phpt
index a21bab5344..f0bf9f4087 100755
--- a/ext/spl/tests/array_015.phpt
+++ b/ext/spl/tests/array_015.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::next() with internal arrays
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_016.phpt b/ext/spl/tests/array_016.phpt
index f5a2854200..8637c5c886 100755
--- a/ext/spl/tests/array_016.phpt
+++ b/ext/spl/tests/array_016.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator/Object and IteratorIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt
index 51563d1f6a..8f3d345438 100755
--- a/ext/spl/tests/array_017.phpt
+++ b/ext/spl/tests/array_017.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject::exchangeArray($this)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt
index bb19e7d526..996d276e04 100755
--- a/ext/spl/tests/array_018.phpt
+++ b/ext/spl/tests/array_018.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject and \0
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_019.phpt b/ext/spl/tests/array_019.phpt
index 43d53b1273..d128f4de7b 100755
--- a/ext/spl/tests/array_019.phpt
+++ b/ext/spl/tests/array_019.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator and foreach by reference
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_020.phpt b/ext/spl/tests/array_020.phpt
index cdeb4a216c..4c6fe0df25 100755
--- a/ext/spl/tests/array_020.phpt
+++ b/ext/spl/tests/array_020.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator overloading
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt
index b38cedf0cd..f2ae0c87e5 100755
--- a/ext/spl/tests/array_021.phpt
+++ b/ext/spl/tests/array_021.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject::seek() and exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt
index 5f5549c8cd..82da3bbfe3 100755
--- a/ext/spl/tests/array_022.phpt
+++ b/ext/spl/tests/array_022.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject/Iterator and reference to self
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 ==ArrayObject===
 <?php
diff --git a/ext/spl/tests/bug28822.phpt b/ext/spl/tests/bug28822.phpt
index 0cf5575367..7114edac9f 100755
--- a/ext/spl/tests/bug28822.phpt
+++ b/ext/spl/tests/bug28822.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #28822 (ArrayObject::offsetExists() works inverted)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug31185.phpt b/ext/spl/tests/bug31185.phpt
index 5d93381d4e..aa410ebaae 100755
--- a/ext/spl/tests/bug31185.phpt
+++ b/ext/spl/tests/bug31185.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31185 (Crash when exceptions thrown from ArrayAccess::offsetUnset())
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug31346.phpt b/ext/spl/tests/bug31346.phpt
index ed1b50d685..9b5618ec0e 100755
--- a/ext/spl/tests/bug31346.phpt
+++ b/ext/spl/tests/bug31346.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31486 (ArrayIterator::next segfaults)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $obj = new stdClass;
diff --git a/ext/spl/tests/bug31348.phpt b/ext/spl/tests/bug31348.phpt
index dcb627af22..047e4b223a 100755
--- a/ext/spl/tests/bug31348.phpt
+++ b/ext/spl/tests/bug31348.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31348 (CachingIterator::rewind() leaks)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = Array("some","blah");
diff --git a/ext/spl/tests/bug31926.phpt b/ext/spl/tests/bug31926.phpt
index 50246b35ca..2d72df421d 100755
--- a/ext/spl/tests/bug31926.phpt
+++ b/ext/spl/tests/bug31926.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31926 (php in free() error with RecursiveArrayIterator)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt
index e8527cd15a..5a880b321d 100755
--- a/ext/spl/tests/bug32134.phpt
+++ b/ext/spl/tests/bug32134.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #32134 (Overloading offsetGet/offsetSet)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 	
diff --git a/ext/spl/tests/bug32394.phpt b/ext/spl/tests/bug32394.phpt
index ac72e0fa16..8189b23f7a 100755
--- a/ext/spl/tests/bug32394.phpt
+++ b/ext/spl/tests/bug32394.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #32394 (offsetUnset() segfaults in a foreach)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt
index 5d9a75dba9..121ff58ad7 100755
--- a/ext/spl/tests/bug33136.phpt
+++ b/ext/spl/tests/bug33136.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #33136 (method offsetSet in class extended from ArrayObject crash PHP)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug34548.phpt b/ext/spl/tests/bug34548.phpt
index 73262a8061..27c3094902 100644
--- a/ext/spl/tests/bug34548.phpt
+++ b/ext/spl/tests/bug34548.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #34548 (Method append() in class extended from ArrayObject crashes PHP)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/bug36258.phpt
index c112670efa..60817d06ba 100644
--- a/ext/spl/tests/bug36258.phpt
+++ b/ext/spl/tests/bug36258.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36258 (SplFileObject::getPath() may lead to segfault)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug36287.phpt b/ext/spl/tests/bug36287.phpt
index 69ecf2bf58..0c3f287d4f 100755
--- a/ext/spl/tests/bug36287.phpt
+++ b/ext/spl/tests/bug36287.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36287 (Segfault with SplFileInfo conversion)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug36825.phpt b/ext/spl/tests/bug36825.phpt
index 503ec43a43..35de013a8f 100644
--- a/ext/spl/tests/bug36825.phpt
+++ b/ext/spl/tests/bug36825.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause segfault)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug36941.phpt b/ext/spl/tests/bug36941.phpt
index 2ae03b4481..528ba4a462 100755
--- a/ext/spl/tests/bug36941.phpt
+++ b/ext/spl/tests/bug36941.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36941 (ArrayIterator does not clone itself)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 ===ArrayObject===
 <?php
diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt
index 4395287bcd..e66fa4d6ed 100755
--- a/ext/spl/tests/bug37457.phpt
+++ b/ext/spl/tests/bug37457.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterator)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug38325.phpt b/ext/spl/tests/bug38325.phpt
index 126e1f3c02..959a451d22 100644
--- a/ext/spl/tests/bug38325.phpt
+++ b/ext/spl/tests/bug38325.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #38325 (spl_autoload_register() gaves wrong line for "class not found")
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 spl_autoload_register();
diff --git a/ext/spl/tests/bug40036.phpt b/ext/spl/tests/bug40036.phpt
index 8569629d36..8180c038ce 100644
--- a/ext/spl/tests/bug40036.phpt
+++ b/ext/spl/tests/bug40036.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #40036 (empty() does not work correctly with ArrayObject when using ARRAY_AS_PROPS)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class View extends ArrayObject
diff --git a/ext/spl/tests/bug40091.phpt b/ext/spl/tests/bug40091.phpt
index 316e302ea9..eb157e72ae 100644
--- a/ext/spl/tests/bug40091.phpt
+++ b/ext/spl/tests/bug40091.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #40091 (issue with spl_autoload_register() and 2 instances of the same class)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class MyAutoloader {
diff --git a/ext/spl/tests/bug40872.phpt b/ext/spl/tests/bug40872.phpt
index 70472c44e9..a48fe74feb 100755
--- a/ext/spl/tests/bug40872.phpt
+++ b/ext/spl/tests/bug40872.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #40872 (inconsistency in offsetSet, offsetExists treatment of string enclosed integers)
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip"); ?>
 --FILE--
 <?php
 	class Project {
diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt
index 1527ca3bde..3cf3d8780c 100644
--- a/ext/spl/tests/bug41691.phpt
+++ b/ext/spl/tests/bug41691.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #41691 (ArrayObject::exchangeArray hangs Apache)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug41692.phpt b/ext/spl/tests/bug41692.phpt
index b2ede4ec5d..c9b7d8d60f 100644
--- a/ext/spl/tests/bug41692.phpt
+++ b/ext/spl/tests/bug41692.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #41692 (ArrayObject shows weird behaviour in respect to inheritance)
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip"); ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug42259.phpt b/ext/spl/tests/bug42259.phpt
index ceefe78e52..19c02a577a 100644
--- a/ext/spl/tests/bug42259.phpt
+++ b/ext/spl/tests/bug42259.phpt
@@ -2,10 +2,8 @@
 Bug #42259 (SimpleXMLIterator loses ancestry)
 --SKIPIF--
 <?php
-if (!extension_loaded("spl")) print "skip";
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
-if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php
diff --git a/ext/spl/tests/bug42364.phpt b/ext/spl/tests/bug42364.phpt
index 3ca083e079..e02a3c5bb4 100644
--- a/ext/spl/tests/bug42364.phpt
+++ b/ext/spl/tests/bug42364.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #42364 (Crash when using getRealPath with DirectoryIterator)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $it = new DirectoryIterator(dirname(__FILE__));
diff --git a/ext/spl/tests/dit_001.phpt b/ext/spl/tests/dit_001.phpt
index 5ab7f5ed2e..00918dc9b5 100755
--- a/ext/spl/tests/dit_001.phpt
+++ b/ext/spl/tests/dit_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Problem with casting to string
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $d = new DirectoryIterator('.');
diff --git a/ext/spl/tests/dit_002.phpt b/ext/spl/tests/dit_002.phpt
index 6f59417cdb..565a12e95d 100755
--- a/ext/spl/tests/dit_002.phpt
+++ b/ext/spl/tests/dit_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DirectoryIterator defaults
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/dit_003.phpt b/ext/spl/tests/dit_003.phpt
index 4232a7fbc4..7a38e73805 100755
--- a/ext/spl/tests/dit_003.phpt
+++ b/ext/spl/tests/dit_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: FilesystemIterator and foreach
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $count = 0;
diff --git a/ext/spl/tests/dit_004.phpt b/ext/spl/tests/dit_004.phpt
index 704487f155..4ad0e4b772 100644
--- a/ext/spl/tests/dit_004.phpt
+++ b/ext/spl/tests/dit_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DirectoryIterator and clone
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new DirectoryIterator(__DIR__);
diff --git a/ext/spl/tests/dit_005.phpt b/ext/spl/tests/dit_005.phpt
index 76f1214f0e..52a335172f 100644
--- a/ext/spl/tests/dit_005.phpt
+++ b/ext/spl/tests/dit_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: FilesystemIterator and clone
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new FileSystemIterator(__DIR__);
diff --git a/ext/spl/tests/dllist_001.phpt b/ext/spl/tests/dllist_001.phpt
index e2e162d079..2a21561883 100644
--- a/ext/spl/tests/dllist_001.phpt
+++ b/ext/spl/tests/dllist_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: std operations
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 allow_call_time_pass_reference=1
 --FILE--
diff --git a/ext/spl/tests/dllist_002.phpt b/ext/spl/tests/dllist_002.phpt
index 38779b26dc..e956de60fd 100644
--- a/ext/spl/tests/dllist_002.phpt
+++ b/ext/spl/tests/dllist_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: iterators
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $dll = new SplDoublyLinkedList();
diff --git a/ext/spl/tests/dllist_003.phpt b/ext/spl/tests/dllist_003.phpt
index 8e62046374..9a9556840f 100644
--- a/ext/spl/tests/dllist_003.phpt
+++ b/ext/spl/tests/dllist_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: iterator modes
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $dll = new SplDoublyLinkedList();
diff --git a/ext/spl/tests/dllist_004.phpt b/ext/spl/tests/dllist_004.phpt
index 9df4a41be0..0b20f6eb6a 100644
--- a/ext/spl/tests/dllist_004.phpt
+++ b/ext/spl/tests/dllist_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: Stacks
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 allow_call_time_pass_reference=1
 --FILE--
diff --git a/ext/spl/tests/dllist_005.phpt b/ext/spl/tests/dllist_005.phpt
index 9fd13ecd8a..f95cedd1fa 100644
--- a/ext/spl/tests/dllist_005.phpt
+++ b/ext/spl/tests/dllist_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: Queues
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 allow_call_time_pass_reference=1
 --FILE--
diff --git a/ext/spl/tests/dllist_006.phpt b/ext/spl/tests/dllist_006.phpt
index a776ed67e6..b4055dcb9c 100644
--- a/ext/spl/tests/dllist_006.phpt
+++ b/ext/spl/tests/dllist_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: ArrayAccess
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new SplDoublyLinkedList();
diff --git a/ext/spl/tests/dllist_007.phpt b/ext/spl/tests/dllist_007.phpt
index 46dc7ad47e..38f801fde7 100644
--- a/ext/spl/tests/dllist_007.phpt
+++ b/ext/spl/tests/dllist_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: Iterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new SplDoublyLinkedList();
diff --git a/ext/spl/tests/fileobject_001.phpt b/ext/spl/tests/fileobject_001.phpt
index 957223b169..61f688d79f 100755
--- a/ext/spl/tests/fileobject_001.phpt
+++ b/ext/spl/tests/fileobject_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject::seek'ing
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/fileobject_002.phpt b/ext/spl/tests/fileobject_002.phpt
index 0b944f2a7c..8031e98fdc 100755
--- a/ext/spl/tests/fileobject_002.phpt
+++ b/ext/spl/tests/fileobject_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject::fgetc
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt
index de11f6f356..96fb9b4544 100755
--- a/ext/spl/tests/fileobject_003.phpt
+++ b/ext/spl/tests/fileobject_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileInfo cloning
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/fileobject_004.phpt b/ext/spl/tests/fileobject_004.phpt
index f71fc871c2..02e6725853 100644
--- a/ext/spl/tests/fileobject_004.phpt
+++ b/ext/spl/tests/fileobject_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject realpath and include_path
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/heap_001.phpt b/ext/spl/tests/heap_001.phpt
index 3b4316ffd8..eb189d8f4a 100644
--- a/ext/spl/tests/heap_001.phpt
+++ b/ext/spl/tests/heap_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplMaxHeap: std operations
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMaxHeap();
diff --git a/ext/spl/tests/heap_002.phpt b/ext/spl/tests/heap_002.phpt
index 815f5fd90f..387510f766 100644
--- a/ext/spl/tests/heap_002.phpt
+++ b/ext/spl/tests/heap_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplMinHeap: std operations
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMinHeap();
diff --git a/ext/spl/tests/heap_003.phpt b/ext/spl/tests/heap_003.phpt
index b81c043ca4..87f95e9a2b 100644
--- a/ext/spl/tests/heap_003.phpt
+++ b/ext/spl/tests/heap_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: comparison callback
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class myHeap extends SplHeap {
diff --git a/ext/spl/tests/heap_004.phpt b/ext/spl/tests/heap_004.phpt
index 55aca4ccb3..7b00ebfbff 100644
--- a/ext/spl/tests/heap_004.phpt
+++ b/ext/spl/tests/heap_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class myHeap extends SplHeap {
diff --git a/ext/spl/tests/heap_005.phpt b/ext/spl/tests/heap_005.phpt
index 575ddba4ce..73daaf454a 100644
--- a/ext/spl/tests/heap_005.phpt
+++ b/ext/spl/tests/heap_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplMinHeap: large unordered input iterated
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $input = range(1,100);
diff --git a/ext/spl/tests/heap_006.phpt b/ext/spl/tests/heap_006.phpt
index 08162ff357..4422727d04 100644
--- a/ext/spl/tests/heap_006.phpt
+++ b/ext/spl/tests/heap_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplMaxHeap: large unordered input iterated
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $input = range(1,100);
diff --git a/ext/spl/tests/heap_007.phpt b/ext/spl/tests/heap_007.phpt
index 594ffc0180..784ac6e8b0 100644
--- a/ext/spl/tests/heap_007.phpt
+++ b/ext/spl/tests/heap_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: iteration through methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMaxHeap();
diff --git a/ext/spl/tests/heap_008.phpt b/ext/spl/tests/heap_008.phpt
index 2b3c9a4a3c..178f5462e4 100644
--- a/ext/spl/tests/heap_008.phpt
+++ b/ext/spl/tests/heap_008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: var_dump
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMaxHeap();
diff --git a/ext/spl/tests/iterator_001.phpt b/ext/spl/tests/iterator_001.phpt
index 2239417778..26df62e85b 100755
--- a/ext/spl/tests/iterator_001.phpt
+++ b/ext/spl/tests/iterator_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Iterator aggregating inner iterator's methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt
index d56a551c3f..527fe6b776 100755
--- a/ext/spl/tests/iterator_002.phpt
+++ b/ext/spl/tests/iterator_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Iterator using getInnerIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_003.phpt b/ext/spl/tests/iterator_003.phpt
index c60776cb33..11d37b303b 100755
--- a/ext/spl/tests/iterator_003.phpt
+++ b/ext/spl/tests/iterator_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_004.phpt b/ext/spl/tests/iterator_004.phpt
index 4e6006621b..e07cd32c39 100755
--- a/ext/spl/tests/iterator_004.phpt
+++ b/ext/spl/tests/iterator_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SeekableIterator and string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_005.phpt b/ext/spl/tests/iterator_005.phpt
index 4aae600169..640ca9f9c2 100755
--- a/ext/spl/tests/iterator_005.phpt
+++ b/ext/spl/tests/iterator_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: IteratorIterator and ArrayIterator/Object
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt
index aa8fd0e44d..1a1be0561a 100755
--- a/ext/spl/tests/iterator_006.phpt
+++ b/ext/spl/tests/iterator_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: IteratorIterator and SimpleXMlElement
 --SKIPIF--
-<?php if (!extension_loaded("spl") || !extension_loaded('simplexml')) print "skip"; ?>
+<?php if (!extension_loaded('simplexml')) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_007.phpt b/ext/spl/tests/iterator_007.phpt
index eb87977ac9..d26c01ef79 100755
--- a/ext/spl/tests/iterator_007.phpt
+++ b/ext/spl/tests/iterator_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: NoRewindIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_008.phpt b/ext/spl/tests/iterator_008.phpt
index 5f3c7d89df..04f8c00348 100755
--- a/ext/spl/tests/iterator_008.phpt
+++ b/ext/spl/tests/iterator_008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: InfiniteIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_009.phpt b/ext/spl/tests/iterator_009.phpt
index 27a3e0655f..0bfe74ef7f 100755
--- a/ext/spl/tests/iterator_009.phpt
+++ b/ext/spl/tests/iterator_009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_010.phpt b/ext/spl/tests/iterator_010.phpt
index e7e1a519b6..39d1000f62 100755
--- a/ext/spl/tests/iterator_010.phpt
+++ b/ext/spl/tests/iterator_010.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_011.phpt b/ext/spl/tests/iterator_011.phpt
index aed1ed5e3e..fca159a20f 100755
--- a/ext/spl/tests/iterator_011.phpt
+++ b/ext/spl/tests/iterator_011.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: InfiniteIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_012.phpt b/ext/spl/tests/iterator_012.phpt
index c6eb86eefb..81bc02f69c 100755
--- a/ext/spl/tests/iterator_012.phpt
+++ b/ext/spl/tests/iterator_012.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: NoRewindIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_013.phpt b/ext/spl/tests/iterator_013.phpt
index 56aea98504..119631c000 100755
--- a/ext/spl/tests/iterator_013.phpt
+++ b/ext/spl/tests/iterator_013.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_014.phpt b/ext/spl/tests/iterator_014.phpt
index 8f9020bf81..119fad05fb 100755
--- a/ext/spl/tests/iterator_014.phpt
+++ b/ext/spl/tests/iterator_014.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and beginChildren/endChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt
index 57b9899e6c..aa30f79e1f 100755
--- a/ext/spl/tests/iterator_015.phpt
+++ b/ext/spl/tests/iterator_015.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and beginChildren/endChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_016.phpt b/ext/spl/tests/iterator_016.phpt
index 4801835a1b..f231c6eb34 100755
--- a/ext/spl/tests/iterator_016.phpt
+++ b/ext/spl/tests/iterator_016.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and beginChildren/endChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_017.phpt b/ext/spl/tests/iterator_017.phpt
index e7e1a519b6..39d1000f62 100755
--- a/ext/spl/tests/iterator_017.phpt
+++ b/ext/spl/tests/iterator_017.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_018.phpt b/ext/spl/tests/iterator_018.phpt
index 3cb68eeea8..9c234bb11d 100755
--- a/ext/spl/tests/iterator_018.phpt
+++ b/ext/spl/tests/iterator_018.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: InfiniteIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_019.phpt b/ext/spl/tests/iterator_019.phpt
index c6eb86eefb..81bc02f69c 100755
--- a/ext/spl/tests/iterator_019.phpt
+++ b/ext/spl/tests/iterator_019.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: NoRewindIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_020.phpt b/ext/spl/tests/iterator_020.phpt
index 56aea98504..119631c000 100755
--- a/ext/spl/tests/iterator_020.phpt
+++ b/ext/spl/tests/iterator_020.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_021.phpt b/ext/spl/tests/iterator_021.phpt
index 1dbd245bc8..4f2395a8e5 100755
--- a/ext/spl/tests/iterator_021.phpt
+++ b/ext/spl/tests/iterator_021.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and hasChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_022.phpt b/ext/spl/tests/iterator_022.phpt
index 1f1e6e951a..8d055313ac 100755
--- a/ext/spl/tests/iterator_022.phpt
+++ b/ext/spl/tests/iterator_022.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and callHasChildren/callGetChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_023.phpt b/ext/spl/tests/iterator_023.phpt
index 00b831e116..1b6b4685ec 100755
--- a/ext/spl/tests/iterator_023.phpt
+++ b/ext/spl/tests/iterator_023.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and catch getChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_024.phpt b/ext/spl/tests/iterator_024.phpt
index 8a6fe210cc..0c7dea15bc 100755
--- a/ext/spl/tests/iterator_024.phpt
+++ b/ext/spl/tests/iterator_024.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator with custom iterator class
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_025.phpt b/ext/spl/tests/iterator_025.phpt
index 737b8f6664..e582b1f39e 100755
--- a/ext/spl/tests/iterator_025.phpt
+++ b/ext/spl/tests/iterator_025.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and begin/endIteration()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_026.phpt b/ext/spl/tests/iterator_026.phpt
index 4866de5c6b..1e6058246b 100755
--- a/ext/spl/tests/iterator_026.phpt
+++ b/ext/spl/tests/iterator_026.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator::hasNext()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_027.phpt b/ext/spl/tests/iterator_027.phpt
index 601515e8fd..fd9ba70c0f 100755
--- a/ext/spl/tests/iterator_027.phpt
+++ b/ext/spl/tests/iterator_027.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator::FULL_CACHE
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_028.phpt b/ext/spl/tests/iterator_028.phpt
index 8fef74d776..8b53b2123a 100755
--- a/ext/spl/tests/iterator_028.phpt
+++ b/ext/spl/tests/iterator_028.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and setMaxDepth()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_029.phpt b/ext/spl/tests/iterator_029.phpt
index 3e836adef6..e5bfde0219 100755
--- a/ext/spl/tests/iterator_029.phpt
+++ b/ext/spl/tests/iterator_029.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_030.phpt b/ext/spl/tests/iterator_030.phpt
index 6ed8035ac1..29d147f12b 100755
--- a/ext/spl/tests/iterator_030.phpt
+++ b/ext/spl/tests/iterator_030.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator access
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt
index 00afa61850..458f071b76 100755
--- a/ext/spl/tests/iterator_031.phpt
+++ b/ext/spl/tests/iterator_031.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator::append() rewinds when neccessary
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_032.phpt b/ext/spl/tests/iterator_032.phpt
index 86695d4af8..8b1d97e188 100755
--- a/ext/spl/tests/iterator_032.phpt
+++ b/ext/spl/tests/iterator_032.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: LimitIterator::getPosition()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_033.phpt b/ext/spl/tests/iterator_033.phpt
index c1880cb2fb..548759ccbb 100755
--- a/ext/spl/tests/iterator_033.phpt
+++ b/ext/spl/tests/iterator_033.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ParentIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_034.phpt b/ext/spl/tests/iterator_034.phpt
index b81c6d970e..3329e744bd 100755
--- a/ext/spl/tests/iterator_034.phpt
+++ b/ext/spl/tests/iterator_034.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and break deep
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index 9dfe35d5f4..9ce098b69d 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator and values assigned by reference
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 	
diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt
index 3eb0eefa6b..9a9e66b3b3 100755
--- a/ext/spl/tests/iterator_036.phpt
+++ b/ext/spl/tests/iterator_036.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString and flags = 0
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt
index be79468f3a..2aa61bb03f 100755
--- a/ext/spl/tests/iterator_037.phpt
+++ b/ext/spl/tests/iterator_037.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_038.phpt b/ext/spl/tests/iterator_038.phpt
index 71f911c57a..9b890e2662 100755
--- a/ext/spl/tests/iterator_038.phpt
+++ b/ext/spl/tests/iterator_038.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RoRewindIterator and string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_039.phpt b/ext/spl/tests/iterator_039.phpt
index 5dcaaa2265..17c9bc1ca5 100755
--- a/ext/spl/tests/iterator_039.phpt
+++ b/ext/spl/tests/iterator_039.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: LimitIterator and backward seeking
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_040.phpt b/ext/spl/tests/iterator_040.phpt
index a162cac68f..ae00c81df3 100755
--- a/ext/spl/tests/iterator_040.phpt
+++ b/ext/spl/tests/iterator_040.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveFilterIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_041.phpt b/ext/spl/tests/iterator_041.phpt
index af42b1cdec..e00ac6bc2b 100755
--- a/ext/spl/tests/iterator_041.phpt
+++ b/ext/spl/tests/iterator_041.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_041a.phpt b/ext/spl/tests/iterator_041a.phpt
index d03cbba9dc..ec999a5dae 100755
--- a/ext/spl/tests/iterator_041a.phpt
+++ b/ext/spl/tests/iterator_041a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and exceptions from destruct
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_041b.phpt b/ext/spl/tests/iterator_041b.phpt
index 9afb935266..f07164d08a 100755
--- a/ext/spl/tests/iterator_041b.phpt
+++ b/ext/spl/tests/iterator_041b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and exceptions from delayed destruct
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_042.phpt b/ext/spl/tests/iterator_042.phpt
index 4f470849af..95fea2f6b8 100755
--- a/ext/spl/tests/iterator_042.phpt
+++ b/ext/spl/tests/iterator_042.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator and its ArrayIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_043.phpt b/ext/spl/tests/iterator_043.phpt
index c49e334733..301a593ba2 100755
--- a/ext/spl/tests/iterator_043.phpt
+++ b/ext/spl/tests/iterator_043.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveCachingIterator and uninitialized getChildren()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt
index d3c625314f..3b47e693e2 100755
--- a/ext/spl/tests/iterator_044.phpt
+++ b/ext/spl/tests/iterator_044.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and offsetGet/Exists using flag FULL_CACHE
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt
index ce29349cfb..d76b2d93ce 100755
--- a/ext/spl/tests/iterator_045.phpt
+++ b/ext/spl/tests/iterator_045.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and offsetSet/Unset, getCache using flag FULL_CACHE
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_046.phpt b/ext/spl/tests/iterator_046.phpt
index 34d9c027b6..f57415a3b2 100755
--- a/ext/spl/tests/iterator_046.phpt
+++ b/ext/spl/tests/iterator_046.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString using bypassed string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_047.phpt b/ext/spl/tests/iterator_047.phpt
index 9a49a7e0d2..e5fec4f585 100755
--- a/ext/spl/tests/iterator_047.phpt
+++ b/ext/spl/tests/iterator_047.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveCachingIterator and exception in has/getChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_048.phpt b/ext/spl/tests/iterator_048.phpt
index 5e141d9c7f..bad4e7888a 100755
--- a/ext/spl/tests/iterator_048.phpt
+++ b/ext/spl/tests/iterator_048.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveRegexIterator and exception in has/getChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_049.phpt b/ext/spl/tests/iterator_049.phpt
index e868cfb23c..b9ab2c30ac 100755
--- a/ext/spl/tests/iterator_049.phpt
+++ b/ext/spl/tests/iterator_049.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator with NULL key
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_049b.phpt b/ext/spl/tests/iterator_049b.phpt
index d39d9ef418..03c7350fa2 100755
Binary files a/ext/spl/tests/iterator_049b.phpt and b/ext/spl/tests/iterator_049b.phpt differ
diff --git a/ext/spl/tests/iterator_050.phpt b/ext/spl/tests/iterator_050.phpt
index 5d9d381618..63d8fbfa9a 100755
--- a/ext/spl/tests/iterator_050.phpt
+++ b/ext/spl/tests/iterator_050.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::GET_MATCH
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_051.phpt b/ext/spl/tests/iterator_051.phpt
index 44d5ed252b..2d198db520 100755
--- a/ext/spl/tests/iterator_051.phpt
+++ b/ext/spl/tests/iterator_051.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::GET_MATCH, USE_KEY
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_052.phpt b/ext/spl/tests/iterator_052.phpt
index 3601683a3f..a0cbdd8f73 100755
--- a/ext/spl/tests/iterator_052.phpt
+++ b/ext/spl/tests/iterator_052.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::ALL_MATCHES
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_053.phpt b/ext/spl/tests/iterator_053.phpt
index 584849b341..5d9c740c31 100755
--- a/ext/spl/tests/iterator_053.phpt
+++ b/ext/spl/tests/iterator_053.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::ALL_MATCHES
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_054.phpt b/ext/spl/tests/iterator_054.phpt
index cdf108417f..91266c9571 100755
--- a/ext/spl/tests/iterator_054.phpt
+++ b/ext/spl/tests/iterator_054.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::SPLIT
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_055.phpt b/ext/spl/tests/iterator_055.phpt
index 851d6ed666..dec68a463b 100755
--- a/ext/spl/tests/iterator_055.phpt
+++ b/ext/spl/tests/iterator_055.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::SPLIT, USE_KEY
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/observer_001.phpt b/ext/spl/tests/observer_001.phpt
index d161a47767..e7d72b9e24 100755
--- a/ext/spl/tests/observer_001.phpt
+++ b/ext/spl/tests/observer_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObserver and SplSubject (empty notify)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/observer_002.phpt b/ext/spl/tests/observer_002.phpt
index 7bcd9dc2eb..5d006177f2 100755
--- a/ext/spl/tests/observer_002.phpt
+++ b/ext/spl/tests/observer_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/observer_003.phpt b/ext/spl/tests/observer_003.phpt
index 79df8cf963..5e5da22e38 100755
--- a/ext/spl/tests/observer_003.phpt
+++ b/ext/spl/tests/observer_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage serialization
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/observer_004.phpt b/ext/spl/tests/observer_004.phpt
index cfc207395d..0bc2512d80 100755
--- a/ext/spl/tests/observer_004.phpt
+++ b/ext/spl/tests/observer_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage serialization & overloading
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/observer_005.phpt b/ext/spl/tests/observer_005.phpt
index 4d4d717842..883602f51d 100755
--- a/ext/spl/tests/observer_005.phpt
+++ b/ext/spl/tests/observer_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage serialization & visibility
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/observer_006.phpt b/ext/spl/tests/observer_006.phpt
index fc4a907b42..3cd84a742f 100755
--- a/ext/spl/tests/observer_006.phpt
+++ b/ext/spl/tests/observer_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage with accociatied information
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/pqueue_001.phpt b/ext/spl/tests/pqueue_001.phpt
index 8dae2ef510..9c299808f2 100644
--- a/ext/spl/tests/pqueue_001.phpt
+++ b/ext/spl/tests/pqueue_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: std operations and extract flags
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $pq = new SplPriorityQueue();
diff --git a/ext/spl/tests/pqueue_002.phpt b/ext/spl/tests/pqueue_002.phpt
index c47a6fe5c8..eaab2cf809 100644
--- a/ext/spl/tests/pqueue_002.phpt
+++ b/ext/spl/tests/pqueue_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class myPQueue extends SplPriorityQueue {
diff --git a/ext/spl/tests/pqueue_003.phpt b/ext/spl/tests/pqueue_003.phpt
index 87d9eda223..8abc72c4c7 100644
--- a/ext/spl/tests/pqueue_003.phpt
+++ b/ext/spl/tests/pqueue_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: iteration through methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplPriorityQueue();
diff --git a/ext/spl/tests/pqueue_004.phpt b/ext/spl/tests/pqueue_004.phpt
index 3e781ddc14..3a86f9e4a3 100644
--- a/ext/spl/tests/pqueue_004.phpt
+++ b/ext/spl/tests/pqueue_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: var_dump
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $pq = new SplPriorityQueue();
diff --git a/ext/spl/tests/spl_001.phpt b/ext/spl/tests/spl_001.phpt
index 8d637a1a66..e101272a84 100755
--- a/ext/spl/tests/spl_001.phpt
+++ b/ext/spl/tests/spl_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and iterator_count()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_002.phpt b/ext/spl/tests/spl_002.phpt
index fbc33f0a9c..d8b71b20cf 100755
--- a/ext/spl/tests/spl_002.phpt
+++ b/ext/spl/tests/spl_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Countable
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_003.phpt b/ext/spl/tests/spl_003.phpt
index b9daa67cd7..e92a41ae46 100755
--- a/ext/spl/tests/spl_003.phpt
+++ b/ext/spl/tests/spl_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: class_parents() and class_implements()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class a{}
diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index dc630a19b1..1a2125de6c 100755
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_apply()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_005.phpt b/ext/spl/tests/spl_005.phpt
index bb297bb6bc..219c791bbb 100755
--- a/ext/spl/tests/spl_005.phpt
+++ b/ext/spl/tests/spl_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_object_hash()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_006.phpt b/ext/spl/tests/spl_006.phpt
index 89859624db..1f5f85fb6d 100755
--- a/ext/spl/tests/spl_006.phpt
+++ b/ext/spl/tests/spl_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() without keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_007.phpt b/ext/spl/tests/spl_007.phpt
index dcd63f9b5a..6d4059d0b5 100755
--- a/ext/spl/tests/spl_007.phpt
+++ b/ext/spl/tests/spl_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_apply() with callback using __call()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt
index 542ba744d7..ff9d1e97d9 100755
--- a/ext/spl/tests/spl_autoload_001.phpt
+++ b/ext/spl/tests/spl_autoload_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() and friends
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_002.phpt b/ext/spl/tests/spl_autoload_002.phpt
index 82fe82e67a..2373d6dbbc 100755
--- a/ext/spl/tests/spl_autoload_002.phpt
+++ b/ext/spl/tests/spl_autoload_002.phpt
@@ -2,8 +2,7 @@
 SPL: spl_autoload_functions()
 --SKIPIF--
 <?php 
-	if (!extension_loaded("spl")) die("skip");
-	if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini'); 
+if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini'); 
 ?>
 --FILE--
 <?php
diff --git a/ext/spl/tests/spl_autoload_003.phpt b/ext/spl/tests/spl_autoload_003.phpt
index 1344b39204..00fdd2734f 100755
--- a/ext/spl/tests/spl_autoload_003.phpt
+++ b/ext/spl/tests/spl_autoload_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() and friends
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_004.phpt b/ext/spl/tests/spl_autoload_004.phpt
index ec80d38337..1f26521b90 100755
--- a/ext/spl/tests/spl_autoload_004.phpt
+++ b/ext/spl/tests/spl_autoload_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with static methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt
index 8ba7965f80..f4db521d52 100755
--- a/ext/spl/tests/spl_autoload_005.phpt
+++ b/ext/spl/tests/spl_autoload_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_006.phpt b/ext/spl/tests/spl_autoload_006.phpt
index 4931c9f27f..21a6084eb4 100755
--- a/ext/spl/tests/spl_autoload_006.phpt
+++ b/ext/spl/tests/spl_autoload_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with static methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt
index 4018a74788..c0a06a952e 100755
--- a/ext/spl/tests/spl_autoload_007.phpt
+++ b/ext/spl/tests/spl_autoload_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with inaccessible methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt
index 4a5090e08b..4b10351866 100755
--- a/ext/spl/tests/spl_autoload_008.phpt
+++ b/ext/spl/tests/spl_autoload_008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/spl_autoload_009.phpt b/ext/spl/tests/spl_autoload_009.phpt
index c282bf4452..d5e54137eb 100755
--- a/ext/spl/tests/spl_autoload_009.phpt
+++ b/ext/spl/tests/spl_autoload_009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() and friends
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
diff --git a/ext/spl/tests/sxe_001.phpt b/ext/spl/tests/sxe_001.phpt
index 8ab37d4310..bb93eea076 100755
--- a/ext/spl/tests/sxe_001.phpt
+++ b/ext/spl/tests/sxe_001.phpt
@@ -2,7 +2,6 @@
 SPL: SimpleXMLIterator
 --SKIPIF--
 <?php
-if (!extension_loaded("spl")) print "skip";
 if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
diff --git a/ext/spl/tests/sxe_002.phpt b/ext/spl/tests/sxe_002.phpt
index d8a939e5a6..b937b011d0 100755
--- a/ext/spl/tests/sxe_002.phpt
+++ b/ext/spl/tests/sxe_002.phpt
@@ -2,10 +2,8 @@
 SPL: SimpleXMLIterator and recursion
 --SKIPIF--
 <?php 
-if (!extension_loaded("spl")) print "skip";
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
-if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php 
diff --git a/ext/spl/tests/sxe_003.phpt b/ext/spl/tests/sxe_003.phpt
index e0d09d1549..58c7523160 100755
--- a/ext/spl/tests/sxe_003.phpt
+++ b/ext/spl/tests/sxe_003.phpt
@@ -2,10 +2,8 @@
 SPL: SimpleXMLIterator and getChildren()
 --SKIPIF--
 <?php 
-if (!extension_loaded("spl")) print "skip";
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
-if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php 
diff --git a/ext/spl/tests/sxe_004.phpt b/ext/spl/tests/sxe_004.phpt
index f57b10c132..db55757bee 100755
--- a/ext/spl/tests/sxe_004.phpt
+++ b/ext/spl/tests/sxe_004.phpt
@@ -2,10 +2,8 @@
 SPL: SimpleXMLIterator and getChildren()
 --SKIPIF--
 <?php 
-if (!extension_loaded("spl")) print "skip";
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
-if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php 
diff --git a/ext/spl/tests/sxe_005.phpt b/ext/spl/tests/sxe_005.phpt
index dbef1dd99b..c5508140fe 100755
--- a/ext/spl/tests/sxe_005.phpt
+++ b/ext/spl/tests/sxe_005.phpt
@@ -2,10 +2,8 @@
 SPL: SimpleXMLIterator and getChildren()
 --SKIPIF--
 <?php 
-if (!extension_loaded("spl")) print "skip";
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
-if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php