Remove superfluous SKIPIF sections in more tests

90 files changed, 64 insertions, 170 deletions

diff --git a/ext/com_dotnet/tests/bug45280.phpt b/ext/com_dotnet/tests/bug45280.phpt
index a1f7e18f73..b530083cca 100644
--- a/ext/com_dotnet/tests/bug45280.phpt
+++ b/ext/com_dotnet/tests/bug45280.phpt
@@ -2,7 +2,6 @@
 Bug #45280 (Reflection of instantiated COM classes causes PHP to crash)
 --SKIPIF--
 <?php
-if (!extension_loaded("reflection")){ echo "skip, no reflection support present"; }
 if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; }
 ?>
 --FILE--
diff --git a/ext/dom/tests/bug74416.phpt b/ext/dom/tests/bug74416.phpt
index d441c0a7ab..c96a927c2e 100644
--- a/ext/dom/tests/bug74416.phpt
+++ b/ext/dom/tests/bug74416.phpt
@@ -3,7 +3,6 @@ Bug #74416 Wrong reflection on DOMNode::cloneNode
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-if (!extension_loaded('reflection')) die('skip reflection extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug75437.phpt b/ext/gd/tests/bug75437.phpt
index bef00bb0f0..1dbbae6478 100644
--- a/ext/gd/tests/bug75437.phpt
+++ b/ext/gd/tests/bug75437.phpt
@@ -2,7 +2,6 @@
 Bug #75437 Wrong reflection on imagewebp
 --SKIPIF--
 <?php
-if (!extension_loaded('reflection')) die('skip reflection not available');
 if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) die("skip test requires GD 2.2.0 or higher");
 if (!function_exists('imagewebp')) die('skip WebP support not available');
diff --git a/ext/mysqli/tests/bug74737.phpt b/ext/mysqli/tests/bug74737.phpt
index b45f843830..3651ac23cd 100644
--- a/ext/mysqli/tests/bug74737.phpt
+++ b/ext/mysqli/tests/bug74737.phpt
@@ -3,7 +3,6 @@ Bug #74737: Incorrect ReflectionFunction information for mysqli_get_client_info
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-if (!extension_loaded('reflection')) { die("skip"); }
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/bug75434.phpt b/ext/mysqli/tests/bug75434.phpt
index 788aa2cf4f..751ad4eb8f 100644
--- a/ext/mysqli/tests/bug75434.phpt
+++ b/ext/mysqli/tests/bug75434.phpt
@@ -3,7 +3,6 @@ Bug #75434 Wrong reflection for mysqli_fetch_all function
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-if (!extension_loaded("reflection")) die("skip reflection extension not available");
 if (!stristr(mysqli_get_client_info(), 'mysqlnd')) die("skip: only available in mysqlnd");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug75307.phpt b/ext/openssl/tests/bug75307.phpt
index 606f7a523b..2b0cae3a97 100644
--- a/ext/openssl/tests/bug75307.phpt
+++ b/ext/openssl/tests/bug75307.phpt
@@ -3,7 +3,6 @@ Bug #75307 Wrong reflection for openssl_open function
 --SKIPIF--
 <?php
 if (!extension_loaded("openssl")) die("skip openssl not available");
-if (!extension_loaded("reflection")) die("skip reflection not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 7b93fb83a8..46841512a9 100644
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -3,8 +3,6 @@ PDO Common: PDOStatement SPL iterator
 --SKIPIF--
 <?php # vim:ft=php
 if (!extension_loaded('pdo')) die('skip');
-if (!extension_loaded('SPL')) die('skip SPL not available');
-if (!class_exists('IteratorIterator', false)) die('skip IteratorIterator class not present');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
@@ -17,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); 
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
 $SELECT = 'SELECT val, grp FROM test';
 
 class Test
@@ -49,7 +47,7 @@ class PDOStatementAggregate extends PDOStatement implements IteratorAggregate
 	private function __construct()
 	{
 		echo __METHOD__ . "\n";
-		$this->setFetchMode(PDO::FETCH_NUM);   
+		$this->setFetchMode(PDO::FETCH_NUM);
 		/* default fetch mode is BOTH, so we see if the ctor can overwrite that */
 	}
 
diff --git a/ext/pdo/tests/pdo_031.phpt b/ext/pdo/tests/pdo_031.phpt
index 9065ce9719..11894e9708 100644
--- a/ext/pdo/tests/pdo_031.phpt
+++ b/ext/pdo/tests/pdo_031.phpt
@@ -3,19 +3,15 @@ PDO Common: PDOStatement SPL iterator
 --SKIPIF--
 <?php # vim:ft=php
 if (!extension_loaded('pdo')) die('skip');
-if (!extension_loaded('SPL')) die('skip SPL not available');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
-if (!class_exists('RecursiveArrayIterator', false)) die('skip Class RecursiveArrayIterator missing');
-if (!class_exists('RecursiveTreeIterator', false) && !file_exists(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc')) die('skip Class RecursiveTreeIterator missing');
 PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
-if (!class_exists('RecursiveTreeIterator', false)) require_once(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc'); 
 
 $data = array(
     array('10', 'Abc', 'zxy'),
diff --git a/ext/phar/tests/bug74383.phpt b/ext/phar/tests/bug74383.phpt
index 4257629ff5..abe50831fc 100644
--- a/ext/phar/tests/bug74383.phpt
+++ b/ext/phar/tests/bug74383.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #74383: Wrong reflection on Phar::running
 --SKIPIF--
-<?php if (!extension_loaded("phar") || !extension_loaded('reflection')) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE--
 <?php
 $rc = new ReflectionClass(Phar::class);
diff --git a/ext/phar/tests/bug74386.phpt b/ext/phar/tests/bug74386.phpt
index 1cf86cae3e..0e60e00009 100644
--- a/ext/phar/tests/bug74386.phpt
+++ b/ext/phar/tests/bug74386.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #74386: Phar::__construct(): wrong number of parameters by reflection
 --SKIPIF--
-<?php if (!extension_loaded("phar") || !extension_loaded('reflection')) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE--
 <?php
 $r = new ReflectionMethod(Phar::class, '__construct');
diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt
index 940e3e9776..029ea7a53f 100644
--- a/ext/phar/tests/create_new_and_modify.phpt
+++ b/ext/phar/tests/create_new_and_modify.phpt
@@ -2,7 +2,6 @@
 Phar: create and modify phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt
index 6beaa2eb61..d32f758f93 100644
--- a/ext/phar/tests/create_new_phar_c.phpt
+++ b/ext/phar/tests/create_new_phar_c.phpt
@@ -2,7 +2,6 @@
 Phar: create a completely new phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt
index 3449b07fc6..fd200d8613 100644
--- a/ext/phar/tests/create_path_error.phpt
+++ b/ext/phar/tests/create_path_error.phpt
@@ -2,7 +2,6 @@
 Phar: create with illegal path
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
@@ -29,7 +28,7 @@ set_error_handler('error_handler');
 
 $count = 0;
 $checks = array(
-    '/', '.', '../', 'a/..', 'a/', 'b//a.php', 
+    '/', '.', '../', 'a/..', 'a/', 'b//a.php',
     "Font\xE5\x84\xB7\xE9\xBB\x91pro.ttf", //two valid multi-byte characters
     "\xF0\x9F\x98\x8D.ttf", // valid 4 byte char - smiling face with heart-shaped eyes
     "Font\xE9\xBBpro.ttf", //Invalid multi-byte character - missing last byte
@@ -81,4 +80,3 @@ string(5) "query"
 12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character
 13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character
 Error: Phar::offsetSet() expects parameter 1 to be a valid path, string given===DONE===
-
diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index 556123a853..7328ba510b 100644
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -3,7 +3,6 @@ Phar: bzipped phar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
 --INI--
@@ -62,4 +61,4 @@ bool(true)
 
 Warning: Phar::isFileFormat() expects parameter 1 to be integer, array given in %sphar_bz2.php on line %d
 Unknown file format specified
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt
index 382b7f0754..8b270302ef 100644
--- a/ext/phar/tests/phar_copy.phpt
+++ b/ext/phar/tests/phar_copy.phpt
@@ -2,7 +2,6 @@
 Phar: copy()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
@@ -81,4 +80,4 @@ file "a" cannot be copied to file "b", file must not already exist in phar %spha
 hi
 file "d" cannot be copied to file ".phar/stub.php", cannot copy to Phar meta-file in %sphar_copy2.phar.php
 file ".phar/stub.php" cannot be copied to file "d", cannot copy Phar meta-file in %sphar_copy2.phar.php
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt
index 04968f28b5..6c04571d86 100644
--- a/ext/phar/tests/phar_dir_iterate.phpt
+++ b/ext/phar/tests/phar_dir_iterate.phpt
@@ -2,7 +2,6 @@
 Phar object: iterate test with sub-directories and RecursiveIteratorIterator
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
@@ -21,7 +20,7 @@ foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt
index d32e12c0ab..fecb806f2e 100644
--- a/ext/phar/tests/phar_get_supportedcomp1.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp1.phpt
@@ -2,7 +2,6 @@
 Phar::getSupportedCompression() (bz2 and zlib)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
@@ -19,4 +18,4 @@ array(2) {
   [1]=>
   string(5) "BZIP2"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt
index c607724918..aa941d0e4b 100644
--- a/ext/phar/tests/phar_get_supportedcomp2.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp2.phpt
@@ -2,7 +2,6 @@
 Phar::getSupportedCompression() (bz2 only)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 <?php if (extension_loaded("zlib")) die("skip zlib is available"); ?>
 --INI--
@@ -17,4 +16,4 @@ array(1) {
   [0]=>
   string(5) "BZIP2"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt
index c300407f3f..fadb482042 100644
--- a/ext/phar/tests/phar_get_supportedcomp3.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp3.phpt
@@ -2,7 +2,6 @@
 Phar::getSupportedCompression() (zlib only)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (extension_loaded("bz2")) die("skip bz2 is available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
@@ -17,4 +16,4 @@ array(1) {
   [0]=>
   string(2) "GZ"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_get_supportedcomp4.phpt b/ext/phar/tests/phar_get_supportedcomp4.phpt
index fba2c71bfc..1d953e2e38 100644
--- a/ext/phar/tests/phar_get_supportedcomp4.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp4.phpt
@@ -2,7 +2,6 @@
 Phar::getSupportedCompression() (none)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (extension_loaded("bz2")) die("skip bz2 is available"); ?>
 <?php if (extension_loaded("zlib")) die("skip zlib is available"); ?>
 --FILE--
diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt
index f7cf7f0964..3308424fa9 100644
--- a/ext/phar/tests/phar_gzip.phpt
+++ b/ext/phar/tests/phar_gzip.phpt
@@ -3,7 +3,6 @@ Phar: gzipped phar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt
index 7609f2051f..469dce6c11 100644
--- a/ext/phar/tests/phar_offset_check.phpt
+++ b/ext/phar/tests/phar_offset_check.phpt
@@ -2,7 +2,6 @@
 Phar: disallow stub and alias setting via offset*() methods
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt
index dade4726d9..8e96246eef 100644
--- a/ext/phar/tests/phar_offset_get_error.phpt
+++ b/ext/phar/tests/phar_offset_get_error.phpt
@@ -2,7 +2,6 @@
 Phar: ignore filenames starting with / on offsetSet
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index f40e678d95..7ee7ca6fa5 100644
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -3,7 +3,6 @@ Phar object: basics
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--
 phar.require_hash=0
@@ -44,7 +43,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_001.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 269d9e5b0c..f62c9a509a 100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -3,7 +3,6 @@ Phar object: iterator & entries
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--
 phar.readonly=1
@@ -48,7 +47,7 @@ foreach(new RecursiveIteratorIterator($phar) as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_002.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index 4395792632..01ca493a2f 100644
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
@@ -2,7 +2,6 @@
 Phar object: entry & openFile()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
@@ -26,7 +25,7 @@ foreach($phar as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_003.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index 3fc18dc65c..12492e2eef 100644
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -3,7 +3,6 @@ Phar and DirectoryIterator
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--
 phar.require_hash=0
@@ -76,7 +75,7 @@ foreach($it as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_004.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 7bc1db61d1..62887655b1 100644
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -3,7 +3,6 @@ Phar and RecursiveDirectoryIterator
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--
 phar.require_hash=0
@@ -29,7 +28,7 @@ foreach($it as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_005.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 5d1d705206..de9b499a83 100644
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -2,7 +2,6 @@
 Phar object: array access
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
@@ -37,7 +36,7 @@ echo $phar['b.php']->getFilename() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_006.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt
index d0b5aa5eca..ff9c721150 100644
--- a/ext/phar/tests/phar_oo_007.phpt
+++ b/ext/phar/tests/phar_oo_007.phpt
@@ -2,7 +2,6 @@
 Phar object: access through SplFileObject
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
@@ -58,7 +57,7 @@ var_dump($f->eof());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_007.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index d95af571b3..dc9ab7f9ca 100644
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
@@ -2,7 +2,6 @@
 Phar object: iterating via SplFileObject
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
@@ -82,7 +81,7 @@ foreach($v as $k => $d)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_008.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index 331d300a8c..ca3abddfce 100644
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
@@ -2,7 +2,6 @@
 Phar object: ArrayAccess and isset
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
@@ -35,7 +34,7 @@ var_dump(isset($phar['b']));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_010.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
index 01fa9f01e6..5b929363db 100644
--- a/ext/phar/tests/phar_oo_011.phpt
+++ b/ext/phar/tests/phar_oo_011.phpt
@@ -2,7 +2,6 @@
 Phar object: add file
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
@@ -25,7 +24,7 @@ echo "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_011.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index 34cae0e760..d36c083dff 100644
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -2,7 +2,6 @@
 Phar object: add file
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
@@ -12,11 +11,11 @@ phar.require_hash=0
 try
 {
 	$pharconfig = 0;
-	
+
 	require_once 'files/phar_oo_test.inc';
-	
+
 	$phar = new Phar($fname);
-	
+
 	$phar['f.php'] = 'hi';
 	var_dump(isset($phar['f.php']));
 	echo $phar['f.php'];
@@ -30,7 +29,7 @@ catch (BadMethodCallException $e)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_011b.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt
index b6f9f44b1e..f5566807fb 100644
--- a/ext/phar/tests/phar_oo_012.phpt
+++ b/ext/phar/tests/phar_oo_012.phpt
@@ -2,7 +2,6 @@
 Phar object: unset file
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
@@ -26,7 +25,7 @@ var_dump(isset($phar['f.php']));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_012.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt
index ce5a58f212..d2798c3dd4 100644
--- a/ext/phar/tests/phar_oo_012_confirm.phpt
+++ b/ext/phar/tests/phar_oo_012_confirm.phpt
@@ -2,7 +2,6 @@
 Phar object: unset file (confirm disk file is changed)
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
@@ -29,7 +28,7 @@ var_dump(isset($phar['f.php']));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_012_confirm.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index 066d3bc068..c650a3ceff 100644
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -2,7 +2,6 @@
 Phar object: unset file
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
@@ -14,10 +13,10 @@ try
 	$pharconfig = 0;
 
 	require_once 'files/phar_oo_test.inc';
-	
+
 	$phar = new Phar($fname);
 	$phar->setInfoClass('SplFileObject');
-	
+
 	$phar['f.php'] = 'hi';
 	var_dump(isset($phar['f.php']));
 	echo $phar['f.php'];
@@ -33,7 +32,7 @@ catch (BadMethodCallException $e)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_012b.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt
index e42bca46fc..e3a0c2dea7 100644
--- a/ext/phar/tests/phar_oo_getcontents.phpt
+++ b/ext/phar/tests/phar_oo_getcontents.phpt
@@ -2,7 +2,6 @@
 Phar object: getContent()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 --FILE--
@@ -27,7 +26,7 @@ echo $e->getMessage(), "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __halt_compiler();
 ?>
@@ -36,4 +35,4 @@ file contents
 this works
 Phar error: Cannot retrieve contents, "a" in phar "%sphar_oo_getcontents.phar.php" is a directory
 Phar error: Cannot retrieve contents, "hi" in phar "%sphar_oo_getcontents.phar.php" is a directory
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt
index a480a69637..e77b5cad1a 100644
--- a/ext/phar/tests/phar_oo_getcontentsgz.phpt
+++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt
@@ -2,7 +2,6 @@
 Phar object: getContent() (verify it works with compression)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
@@ -22,7 +21,7 @@ echo $phar2['a']->getContent() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php');
 __halt_compiler();
@@ -31,4 +30,4 @@ __halt_compiler();
 bool(true)
 file contents
 this works
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt
index d99222e12c..5710f4fca5 100644
--- a/ext/phar/tests/phar_oo_nosig.phpt
+++ b/ext/phar/tests/phar_oo_nosig.phpt
@@ -2,7 +2,6 @@
 Phar::getSignature() no signature
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
@@ -15,7 +14,7 @@ var_dump($phar->getSignature());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt
index 3c717eb37d..e2cb3b8cff 100644
--- a/ext/phar/tests/refcount1.phpt
+++ b/ext/phar/tests/refcount1.phpt
@@ -2,7 +2,6 @@
 Phar: test that refcounting avoids problems with deleting a file
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt
index 9f693ff6aa..848f50502d 100644
--- a/ext/phar/tests/tar/all.phpt
+++ b/ext/phar/tests/tar/all.phpt
@@ -3,7 +3,6 @@ Phar: test that creation of tar-based phar generates valid tar with all bells/wh
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
diff --git a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt
index bcbccab1c8..b8004138bc 100644
--- a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt
+++ b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt
@@ -2,7 +2,6 @@
 Bug #71317: regression in opening tar based phar files
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/tar/bug71504.phpt b/ext/phar/tests/tar/bug71504.phpt
index e85078810e..178d4ed750 100644
--- a/ext/phar/tests/tar/bug71504.phpt
+++ b/ext/phar/tests/tar/bug71504.phpt
@@ -2,7 +2,6 @@
 Bug #71504: Parsing of tar file with duplicate filenames causes memory leak
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt
index 7d8bcb17da..e8f0ecf061 100644
--- a/ext/phar/tests/tar/create_new_and_modify.phpt
+++ b/ext/phar/tests/tar/create_new_and_modify.phpt
@@ -2,7 +2,6 @@
 Phar: create and modify tar-based phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt
index ed5cdac8bc..782bb4fb5d 100644
--- a/ext/phar/tests/tar/phar_copy.phpt
+++ b/ext/phar/tests/tar/phar_copy.phpt
@@ -2,7 +2,6 @@
 Phar: copy() tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
@@ -53,4 +52,4 @@ hihibool(true)
 file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s
 bool(true)
 
-a: hib: hic: hi===DONE===
\ No newline at end of file
+a: hib: hic: hi===DONE===
diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt
index 9d1cb5e415..7b4f05417a 100644
--- a/ext/phar/tests/tar/refcount1.phpt
+++ b/ext/phar/tests/tar/refcount1.phpt
@@ -2,7 +2,6 @@
 Phar: test that refcounting avoids problems with deleting a file tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt
index 638534be1c..3841d1dce3 100644
--- a/ext/phar/tests/tar/require_hash.phpt
+++ b/ext/phar/tests/tar/require_hash.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar, require_hash=1, no signature
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt
index 500058b70d..a2c4f36fa3 100644
--- a/ext/phar/tests/tar/tar_001.phpt
+++ b/ext/phar/tests/tar/tar_001.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar corrupted
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/make_invalid_tar.php.inc';
diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt
index 75fc220b40..7fc09c806f 100644
--- a/ext/phar/tests/tar/tar_002.phpt
+++ b/ext/phar/tests/tar/tar_002.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar corrupted 2
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt
index 3dec341784..fe7e1d854e 100644
--- a/ext/phar/tests/tar/tar_003.phpt
+++ b/ext/phar/tests/tar/tar_003.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar, valid 1
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt
index 3b28f47cec..d142857388 100644
--- a/ext/phar/tests/tar/tar_004.phpt
+++ b/ext/phar/tests/tar/tar_004.phpt
@@ -3,7 +3,6 @@ Phar: tar-based phar, tar phar with stub, mapPhar()
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt
index 61914f52c6..d7e6dc0e26 100644
--- a/ext/phar/tests/tar/tar_bz2.phpt
+++ b/ext/phar/tests/tar/tar_bz2.phpt
@@ -3,7 +3,6 @@ Phar: tar-based phar, bzipped tar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt
index 840e30ce6a..f64962c8c8 100644
--- a/ext/phar/tests/tar/tar_gzip.phpt
+++ b/ext/phar/tests/tar/tar_gzip.phpt
@@ -3,7 +3,6 @@ Phar: tar-based phar, gzipped tar
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt
index f703b46924..ed614d894b 100644
--- a/ext/phar/tests/tar/tar_makebz2.phpt
+++ b/ext/phar/tests/tar/tar_makebz2.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar, make new bzipped tar
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt
index 46fe177611..7d6ea89fd0 100644
--- a/ext/phar/tests/tar/tar_makegz.phpt
+++ b/ext/phar/tests/tar/tar_makegz.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar, make new gzipped tar
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
@@ -38,4 +37,4 @@ var_dump($phar2->isCompressed() == Phar::GZ);
 bool(true)
 bool(true)
 bool(true)
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt
index dae2bb92a8..3d1d0010a0 100644
--- a/ext/phar/tests/tar/tar_nohash.phpt
+++ b/ext/phar/tests/tar/tar_nohash.phpt
@@ -2,7 +2,6 @@
 Phar: tar archive, require_hash=1, should not error out
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index 0036662c38..210f8815ec 100644
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -2,7 +2,6 @@
 Phar: tar-based phar, third-party tar with no stub, Phar->getStub()
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/tar_openssl_hash.phpt b/ext/phar/tests/tar/tar_openssl_hash.phpt
index 49ef77a44b..075136f687 100644
--- a/ext/phar/tests/tar/tar_openssl_hash.phpt
+++ b/ext/phar/tests/tar/tar_openssl_hash.phpt
@@ -2,7 +2,6 @@
 Phar: tar archive, require_hash=1, OpenSSL hash
 --SKIPIF--
 <?php if (!extension_loaded('phar')) die('skip'); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 <?php if (!extension_loaded("openssl")) die("skip openssl not available"); ?>
 --INI--
diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt
index 82769345ce..1b9f832fb5 100644
--- a/ext/phar/tests/zip/all.phpt
+++ b/ext/phar/tests/zip/all.phpt
@@ -3,7 +3,6 @@ Phar: test that creation of zip-based phar generates valid zip with all bells/wh
 --SKIPIF--
 <?php
 if (!extension_loaded("phar")) die("skip");
-if (!extension_loaded("spl")) die("skip SPL not available");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt
index 45c527188b..5ad1344bd7 100644
--- a/ext/phar/tests/zip/bug48791.phpt
+++ b/ext/phar/tests/zip/bug48791.phpt
@@ -2,7 +2,6 @@
 Phar: Bug #48791: open office documents always reported as corrupted by phar extension
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/zip/bzip2.phpt b/ext/phar/tests/zip/bzip2.phpt
index a703ce6033..551e419b87 100644
--- a/ext/phar/tests/zip/bzip2.phpt
+++ b/ext/phar/tests/zip/bzip2.phpt
@@ -2,7 +2,6 @@
 Phar: process bzip2-compressed zip entry
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/zip/corrupt_001.phpt b/ext/phar/tests/zip/corrupt_001.phpt
index 0b019c6d83..000018aab6 100644
--- a/ext/phar/tests/zip/corrupt_001.phpt
+++ b/ext/phar/tests/zip/corrupt_001.phpt
@@ -2,7 +2,6 @@
 Phar: corrupted zip (count mismatch)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_002.phpt b/ext/phar/tests/zip/corrupt_002.phpt
index 86a271231d..345d1d81db 100644
--- a/ext/phar/tests/zip/corrupt_002.phpt
+++ b/ext/phar/tests/zip/corrupt_002.phpt
@@ -2,7 +2,6 @@
 Phar: corrupted zip (no end of zip record)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_003.phpt b/ext/phar/tests/zip/corrupt_003.phpt
index c41e0153d8..40c5ff1877 100644
--- a/ext/phar/tests/zip/corrupt_003.phpt
+++ b/ext/phar/tests/zip/corrupt_003.phpt
@@ -2,7 +2,6 @@
 Phar: corrupted zip (truncated file comment)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_004.phpt b/ext/phar/tests/zip/corrupt_004.phpt
index 3760e8f9ae..a36281151d 100644
--- a/ext/phar/tests/zip/corrupt_004.phpt
+++ b/ext/phar/tests/zip/corrupt_004.phpt
@@ -2,7 +2,6 @@
 Phar: corrupted zip (central directory offset incorrect)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_005.phpt b/ext/phar/tests/zip/corrupt_005.phpt
index 6b5d31d967..e3e0d88849 100644
--- a/ext/phar/tests/zip/corrupt_005.phpt
+++ b/ext/phar/tests/zip/corrupt_005.phpt
@@ -2,7 +2,6 @@
 Phar: encrypted zip
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_006.phpt b/ext/phar/tests/zip/corrupt_006.phpt
index 9c83617a9a..dd7937850f 100644
--- a/ext/phar/tests/zip/corrupt_006.phpt
+++ b/ext/phar/tests/zip/corrupt_006.phpt
@@ -2,7 +2,6 @@
 Phar: zip with file created from stdin
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_007.phpt b/ext/phar/tests/zip/corrupt_007.phpt
index 80c9139025..52a6c1e792 100644
--- a/ext/phar/tests/zip/corrupt_007.phpt
+++ b/ext/phar/tests/zip/corrupt_007.phpt
@@ -2,7 +2,6 @@
 Phar: corrupted zip (truncated filename record)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_008.phpt b/ext/phar/tests/zip/corrupt_008.phpt
index 5a20f4d2ec..eb706b7e55 100644
--- a/ext/phar/tests/zip/corrupt_008.phpt
+++ b/ext/phar/tests/zip/corrupt_008.phpt
@@ -2,7 +2,6 @@
 Phar: unsupported compression methods
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_009.phpt b/ext/phar/tests/zip/corrupt_009.phpt
index 91f142da7b..0ca80c00c1 100644
--- a/ext/phar/tests/zip/corrupt_009.phpt
+++ b/ext/phar/tests/zip/corrupt_009.phpt
@@ -2,7 +2,6 @@
 Phar: corrupted zip (extra field way too long)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_010.phpt b/ext/phar/tests/zip/corrupt_010.phpt
index ead723c825..b95a03272a 100644
--- a/ext/phar/tests/zip/corrupt_010.phpt
+++ b/ext/phar/tests/zip/corrupt_010.phpt
@@ -2,7 +2,6 @@
 Phar: unable to process zip (zip spanning multiple archives)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt
index c49ec513ff..0941bb6e61 100644
--- a/ext/phar/tests/zip/create_new_and_modify.phpt
+++ b/ext/phar/tests/zip/create_new_and_modify.phpt
@@ -2,7 +2,6 @@
 Phar: create and modify zip-based phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt
index b007d447a8..20f9f112df 100644
--- a/ext/phar/tests/zip/odt.phpt
+++ b/ext/phar/tests/zip/odt.phpt
@@ -2,7 +2,6 @@
 Phar: test a zip archive created by openoffice
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/zip/phar_copy.phpt b/ext/phar/tests/zip/phar_copy.phpt
index 14034c92c0..d4d00a1259 100644
--- a/ext/phar/tests/zip/phar_copy.phpt
+++ b/ext/phar/tests/zip/phar_copy.phpt
@@ -2,7 +2,6 @@
 Phar: copy() zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
@@ -52,4 +51,4 @@ hihibool(true)
 file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s
 bool(true)
 
-a: hib: hic: hi===DONE===
\ No newline at end of file
+a: hib: hic: hi===DONE===
diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt
index 5b8085bdbc..82a6f5218f 100644
--- a/ext/phar/tests/zip/refcount1.phpt
+++ b/ext/phar/tests/zip/refcount1.phpt
@@ -2,7 +2,6 @@
 Phar: test that refcounting avoids problems with deleting a file zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt
index e2b95be93c..d6cbe47898 100644
--- a/ext/phar/tests/zip/unixzip.phpt
+++ b/ext/phar/tests/zip/unixzip.phpt
@@ -2,7 +2,6 @@
 Phar: test a zip archive created by unix "zip" command
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 --FILE--
 <?php
 $a = new PharData(dirname(__FILE__) . '/files/zip.zip');
diff --git a/ext/phar/tests/zip/zlib.phpt b/ext/phar/tests/zip/zlib.phpt
index c7494e2c61..bb3e012be2 100644
--- a/ext/phar/tests/zip/zlib.phpt
+++ b/ext/phar/tests/zip/zlib.phpt
@@ -2,7 +2,6 @@
 Phar: process zlib-compressed zip alias
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/session/tests/bug74541.phpt b/ext/session/tests/bug74541.phpt
index 8c70ebe126..dec2f25b5d 100644
--- a/ext/session/tests/bug74541.phpt
+++ b/ext/session/tests/bug74541.phpt
@@ -3,7 +3,6 @@ Bug #74541 Wrong reflection on session_start()
 --SKIPIF--
 <?php
 include('skipif.inc');
-if (!extension_loaded('reflection')) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt
index 7d9675e3fd..24500d09b1 100644
--- a/ext/simplexml/tests/bug37565.phpt
+++ b/ext/simplexml/tests/bug37565.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37565 (Using reflection::export with simplexml causing a crash)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml") || !extension_loaded('reflection')) print "skip"; ?>
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/examples/tests/dualiterator_001.phpt b/ext/spl/examples/tests/dualiterator_001.phpt
index 53c11537af..eb92347d51 100644
--- a/ext/spl/examples/tests/dualiterator_001.phpt
+++ b/ext/spl/examples/tests/dualiterator_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DualIterator
---SKIPIF--
-<?php if (!extension_loaded("spl") || !extension_loaded("reflection")) print "skip"; ?>
 --FILE--
 <?php
 
@@ -15,8 +13,8 @@ spl_autoload_register('spl_examples_autoload');
 function test($a, $b, $identical = false)
 {
 	var_dump(DualIterator::compareIterators(
-					new RecursiveArrayIterator($a), 
-					new RecursiveArrayIterator($b), 
+					new RecursiveArrayIterator($a),
+					new RecursiveArrayIterator($b),
 					$identical));
 }
 
diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt
index 244ce787af..f5e439821d 100644
--- a/ext/standard/tests/array/bug40191.phpt
+++ b/ext/standard/tests/array/bug40191.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #40191 (use of array_unique() with objects triggers segfault)
---SKIPIF--
-<?php if (!extension_loaded('spl')) die("skip SPL is not available"); ?>
 --FILE--
 <?php
 
@@ -15,7 +13,7 @@ var_dump($arr);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_unique() expects parameter 1 to be array, object given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/bug43505.phpt b/ext/standard/tests/array/bug43505.phpt
index 219bbfe292..802534dfec 100644
--- a/ext/standard/tests/array/bug43505.phpt
+++ b/ext/standard/tests/array/bug43505.phpt
@@ -2,8 +2,6 @@
 Bug #43505 (Assign by reference bug)
 --INI--
 error_reporting=0
---SKIPIF--
-<?php if (!extension_loaded('spl')) die("skip SPL is not available"); ?>
 --FILE--
 <?php
 class Test implements Countable {
@@ -33,4 +31,3 @@ array(1) {
   ["test"]=>
   &NULL
 }
-
diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index b903d8b189..dcef3bd47b 100644
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test count() function 
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip no SPL extension"); ?>
 --FILE--
 <?php
 /* Prototype: int count ( mixed $var [, int $mode] );
@@ -48,9 +46,9 @@ $count_array = array(
   array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
   array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,
          1 => -2.344, array()),
-  array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", 
+  array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ",
 	 NULL => NULL, "\x000" => "\x000", "\000" => "\000"),
-  array( NULL, 1.23 => "Hi", "string" => "hello", 
+  array( NULL, 1.23 => "Hi", "string" => "hello",
          array("" => "World", "-2.34" => "a", "0" => "b"))
 );
 
@@ -58,14 +56,14 @@ $i = 0;
 foreach ($count_array as $count_value) {
   echo "\n-- Iteration $i --\n";
   print "COUNT_NORMAL is ".count($count_value, COUNT_NORMAL)."\n";
-  print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n";  
+  print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n";
   $i++;
 }
 
 
 /* Testing count() by passing constant with no second argument */
 print "\n-- Testing count() on constants with no second argument --\n";
-print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; 
+print "COUNT_NORMAL: should be 1, is ".count(100)."\n";
 print "COUNT_NORMAL: should be 1, is ".count(-23.45)."\n";
 
 print "\n-- Testing count() on NULL and Unset variables --\n";
@@ -106,13 +104,13 @@ echo "\n-- Testing count() on arrays containing references --\n";
 $arr = array(1, array("a", "b", "c"));
 $arr[2] = &$arr[1];
 
-$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, 
+$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE,
                    FALSE, NULL);
 for( $i =0; $i < count( $mode_arr ); $i++) {
   echo "For mode '$mode_arr[$i]' count is => ";
   var_dump(count($arr, $mode_arr[$i]));
 }
-  
+
 
 echo "\n-- Testing error conditions --";
 var_dump( count() );  // No. of args = 0
diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt
index 4705996054..e040585585 100644
--- a/ext/standard/tests/array/sizeof_object1.phpt
+++ b/ext/standard/tests/array/sizeof_object1.phpt
@@ -1,17 +1,9 @@
 --TEST--
 Test sizeof() function : object functionality - object with Countable interface
---SKIPIF--
-<?php 
-// Skip the test case if Standard PHP Library(spl) is not installed
-  if( !extension_loaded('spl'))
-  {
-     die('skip spl is not installed');
-  }
-?>
 --FILE--
 <?php
 /* Prototype  : int sizeof($mixed var[, int $mode])
- * Description: Counts an elements in an array. If Standard PHP library is installed, 
+ * Description: Counts an elements in an array. If Standard PHP library is installed,
  * it will return the properties of an object.
  * Source code: ext/standard/basic_functions.c
  * Alias to functions: count()
@@ -20,12 +12,12 @@ Test sizeof() function : object functionality - object with Countable interface
 echo "*** Testing sizeof() : object functionality ***\n";
 
 echo "-- Testing sizeof() with an object which implements Countable interface --\n";
-class sizeof_class implements Countable 
+class sizeof_class implements Countable
 {
   public $member1;
   private $member2;
   protected $member3;
- 
+
   public function count()
   {
     return 3; // return the count of member variables in the object
diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt
index 005bbb5b4e..a90a6e83d2 100644
--- a/ext/standard/tests/general_functions/ini_get_all.phpt
+++ b/ext/standard/tests/general_functions/ini_get_all.phpt
@@ -4,7 +4,6 @@ ini_get_all() tests
 pcre.backtrack_limit=1000000
 pcre.recursion_limit=100000
 --SKIPIF--
-<?php if (!extension_loaded("reflection")) die("skip"); ?>
 <?php if (!PCRE_JIT_SUPPORT) die("skip no pcre jit support"); ?>
 --FILE--
 <?php
@@ -21,7 +20,7 @@ var_dump(ini_get_all("", ""));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "array"
 
 Warning: ini_get_all(): Unable to find extension '' in %s on line %d
diff --git a/ext/zlib/tests/bug75299.phpt b/ext/zlib/tests/bug75299.phpt
index 1886b3ecaf..b9a9439f2e 100644
--- a/ext/zlib/tests/bug75299.phpt
+++ b/ext/zlib/tests/bug75299.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75299 Wrong reflection on inflate_init and inflate_add
 --SKIPIF--
-<?php if (!extension_loaded("zlib") || !extension_loaded('reflection')) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip"); ?>
 --FILE--
 <?php
 $r = new ReflectionFunction('inflate_init');
diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt
index 378515d464..0248525dab 100644
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@ -1,11 +1,8 @@
 --TEST--
 show information about function
 --SKIPIF--
-<?php 
+<?php
 include "skipif.inc"; 
-if (!extension_loaded("reflection")) {
-	die("skip reflection extension required");
-}
 ?>
 --FILE--
 <?php
@@ -18,7 +15,7 @@ var_dump(`$php -n --rf phpinfo`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(45) "Exception: Function unknown() does not exist
 "
 string(42) "Exception: Function echo() does not exist
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
index 5a1e8b8fb1..0790904f8c 100644
--- a/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@ -1,11 +1,8 @@
 --TEST--
 show information about class
 --SKIPIF--
-<?php 
+<?php
 include "skipif.inc"; 
-if (!extension_loaded("reflection")) {
-    die("skip reflection extension required");
-}
 ?>
 --FILE--
 <?php
@@ -18,7 +15,7 @@ var_dump(`"$php" -n --rc exception`);
 
 echo "Done\n";
 ?>
---EXPECTF-- 
+--EXPECTF--
 string(40) "Exception: Class unknown does not exist
 "
 string(183) "Class [ <internal:Core> class stdClass ] {
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 72f0c5dfa5..fc3032602f 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -1,10 +1,10 @@
 --TEST--
 show information about extension
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
-if (!extension_loaded("reflection") || !extension_loaded("session")) {
-	die("skip reflection and session extensions required");
+<?php
+include "skipif.inc";
+if (!extension_loaded("session")) {
+	die("skip session extension required");
 }
 if (PCRE_JIT_SUPPORT == false) {
 	die ("skip not pcre jit support builtin");
@@ -23,7 +23,7 @@ var_dump(`$php -n --re pcre`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(44) "Exception: Extension unknown does not exist
 "
 string(37) "Exception: Extension  does not exist