]> granicus.if.org Git - php/commitdiff
MFB: Drop SKIPIF check for ext/spl.
authorSebastian Bergmann <sebastian@php.net>
Sat, 24 May 2008 14:12:00 +0000 (14:12 +0000)
committerSebastian Bergmann <sebastian@php.net>
Sat, 24 May 2008 14:12:00 +0000 (14:12 +0000)
158 files changed:
ext/spl/tests/array_001.phpt
ext/spl/tests/array_002.phpt
ext/spl/tests/array_003.phpt
ext/spl/tests/array_004.phpt
ext/spl/tests/array_005.phpt
ext/spl/tests/array_006.phpt
ext/spl/tests/array_007.phpt
ext/spl/tests/array_008.phpt
ext/spl/tests/array_009.phpt
ext/spl/tests/array_009a.phpt
ext/spl/tests/array_010.phpt
ext/spl/tests/array_011.phpt
ext/spl/tests/array_012.phpt
ext/spl/tests/array_013.phpt
ext/spl/tests/array_014.phpt
ext/spl/tests/array_015.phpt
ext/spl/tests/array_016.phpt
ext/spl/tests/array_017.phpt
ext/spl/tests/array_018.phpt
ext/spl/tests/array_019.phpt
ext/spl/tests/array_020.phpt
ext/spl/tests/array_021.phpt
ext/spl/tests/array_022.phpt
ext/spl/tests/bug28822.phpt
ext/spl/tests/bug31185.phpt
ext/spl/tests/bug31346.phpt
ext/spl/tests/bug31348.phpt
ext/spl/tests/bug31926.phpt
ext/spl/tests/bug32134.phpt
ext/spl/tests/bug32394.phpt
ext/spl/tests/bug33136.phpt
ext/spl/tests/bug34548.phpt
ext/spl/tests/bug36258.phpt
ext/spl/tests/bug36287.phpt
ext/spl/tests/bug36825.phpt
ext/spl/tests/bug36941.phpt
ext/spl/tests/bug37457.phpt
ext/spl/tests/bug38325.phpt
ext/spl/tests/bug40036.phpt
ext/spl/tests/bug40091.phpt
ext/spl/tests/bug40872.phpt
ext/spl/tests/bug41691.phpt
ext/spl/tests/bug41692.phpt
ext/spl/tests/bug42259.phpt
ext/spl/tests/bug42364.phpt
ext/spl/tests/dit_001.phpt
ext/spl/tests/dit_002.phpt
ext/spl/tests/dit_003.phpt
ext/spl/tests/dit_004.phpt
ext/spl/tests/dit_005.phpt
ext/spl/tests/dllist_001.phpt
ext/spl/tests/dllist_002.phpt
ext/spl/tests/dllist_003.phpt
ext/spl/tests/dllist_004.phpt
ext/spl/tests/dllist_005.phpt
ext/spl/tests/dllist_006.phpt
ext/spl/tests/dllist_007.phpt
ext/spl/tests/fileobject_001.phpt
ext/spl/tests/fileobject_002.phpt
ext/spl/tests/fileobject_003.phpt
ext/spl/tests/fileobject_004.phpt
ext/spl/tests/heap_001.phpt
ext/spl/tests/heap_002.phpt
ext/spl/tests/heap_003.phpt
ext/spl/tests/heap_004.phpt
ext/spl/tests/heap_005.phpt
ext/spl/tests/heap_006.phpt
ext/spl/tests/heap_007.phpt
ext/spl/tests/heap_008.phpt
ext/spl/tests/iterator_001.phpt
ext/spl/tests/iterator_002.phpt
ext/spl/tests/iterator_003.phpt
ext/spl/tests/iterator_004.phpt
ext/spl/tests/iterator_005.phpt
ext/spl/tests/iterator_006.phpt
ext/spl/tests/iterator_007.phpt
ext/spl/tests/iterator_008.phpt
ext/spl/tests/iterator_009.phpt
ext/spl/tests/iterator_010.phpt
ext/spl/tests/iterator_011.phpt
ext/spl/tests/iterator_012.phpt
ext/spl/tests/iterator_013.phpt
ext/spl/tests/iterator_014.phpt
ext/spl/tests/iterator_015.phpt
ext/spl/tests/iterator_016.phpt
ext/spl/tests/iterator_017.phpt
ext/spl/tests/iterator_018.phpt
ext/spl/tests/iterator_019.phpt
ext/spl/tests/iterator_020.phpt
ext/spl/tests/iterator_021.phpt
ext/spl/tests/iterator_022.phpt
ext/spl/tests/iterator_023.phpt
ext/spl/tests/iterator_024.phpt
ext/spl/tests/iterator_025.phpt
ext/spl/tests/iterator_026.phpt
ext/spl/tests/iterator_027.phpt
ext/spl/tests/iterator_028.phpt
ext/spl/tests/iterator_029.phpt
ext/spl/tests/iterator_030.phpt
ext/spl/tests/iterator_031.phpt
ext/spl/tests/iterator_032.phpt
ext/spl/tests/iterator_033.phpt
ext/spl/tests/iterator_034.phpt
ext/spl/tests/iterator_035.phpt
ext/spl/tests/iterator_036.phpt
ext/spl/tests/iterator_037.phpt
ext/spl/tests/iterator_038.phpt
ext/spl/tests/iterator_039.phpt
ext/spl/tests/iterator_040.phpt
ext/spl/tests/iterator_041.phpt
ext/spl/tests/iterator_041a.phpt
ext/spl/tests/iterator_041b.phpt
ext/spl/tests/iterator_042.phpt
ext/spl/tests/iterator_043.phpt
ext/spl/tests/iterator_044.phpt
ext/spl/tests/iterator_045.phpt
ext/spl/tests/iterator_046.phpt
ext/spl/tests/iterator_047.phpt
ext/spl/tests/iterator_048.phpt
ext/spl/tests/iterator_049.phpt
ext/spl/tests/iterator_049b.phpt
ext/spl/tests/iterator_050.phpt
ext/spl/tests/iterator_051.phpt
ext/spl/tests/iterator_052.phpt
ext/spl/tests/iterator_053.phpt
ext/spl/tests/iterator_054.phpt
ext/spl/tests/iterator_055.phpt
ext/spl/tests/observer_001.phpt
ext/spl/tests/observer_002.phpt
ext/spl/tests/observer_003.phpt
ext/spl/tests/observer_004.phpt
ext/spl/tests/observer_005.phpt
ext/spl/tests/observer_006.phpt
ext/spl/tests/pqueue_001.phpt
ext/spl/tests/pqueue_002.phpt
ext/spl/tests/pqueue_003.phpt
ext/spl/tests/pqueue_004.phpt
ext/spl/tests/spl_001.phpt
ext/spl/tests/spl_002.phpt
ext/spl/tests/spl_003.phpt
ext/spl/tests/spl_004.phpt
ext/spl/tests/spl_005.phpt
ext/spl/tests/spl_006.phpt
ext/spl/tests/spl_007.phpt
ext/spl/tests/spl_autoload_001.phpt
ext/spl/tests/spl_autoload_002.phpt
ext/spl/tests/spl_autoload_003.phpt
ext/spl/tests/spl_autoload_004.phpt
ext/spl/tests/spl_autoload_005.phpt
ext/spl/tests/spl_autoload_006.phpt
ext/spl/tests/spl_autoload_007.phpt
ext/spl/tests/spl_autoload_008.phpt
ext/spl/tests/spl_autoload_009.phpt
ext/spl/tests/sxe_001.phpt
ext/spl/tests/sxe_002.phpt
ext/spl/tests/sxe_003.phpt
ext/spl/tests/sxe_004.phpt
ext/spl/tests/sxe_005.phpt

index 3945b89b9cbd92fe9fd0b4ed85ef1129781874e9..3fbb56ef16a24336d841551653d22e3e60d12375 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index d581cb9f0b6caa73b03426c78d46a68ff2b5ed89..852e8d6910634c9c39afa35b12ed8e86d1a209ac 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject copy constructor
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index a7f44e1ca3769f289f37be509c331e7161c939ef..de4ce30f91f7161000ed37898bc39f8336b57254 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject from object
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 084cf849a53657565ca5ef1737bdc17937fcdcf8..d6afad6316019cd5163eae5829b6db6906f4fd00 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 error_reporting=2047
 --FILE--
index 9214a4c92bdc56b42567497907dae02f478f3e88..d7ef15db1ae23e9a285feee477e0fb545cdb5cae 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject/Iterator interaction
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 274007aea432da3f8d1dcf80a21d8a35dc7b9bb9..49f2838f777f29768dce5fd08322f48c78e371d0 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator without ArrayObject
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 error_reporting=2047
 --FILE--
index 269d71cb6ec15761f7b185730f4d8f30d9d4b12d..7d9bf6afc1c3ca51e49eb03d2b1fec1da9e52d21 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject/Iterator from IteratorAggregate
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 883a35873dbfec247bc28cedb8e88b50d0b043eb..ef93d00ed6d0fc5686bc41e3e594c96779a95068 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator and foreach reference
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 error_reporting=2047
 --FILE--
index 0431cca77ee39065dbdb82218fb6ce89791cd517..fc0d60baa9dea780c25a0da625a9ecaf31f72069 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator implementing RecursiveIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index aebac08ba64cd89bb5fdeb39b82ceed435e5e3dd..396aa9b9e9c5b12559dc8e5c2b0d72e3833293dc 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator implementing RecursiveIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 7a7cc54e18c8e45d8e87a6f3209b217a31902e45..ee55b9220bb18ced7c8419250218d3c6d67e1583 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator implements ArrayAccess
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index b648a3f8be8a1b7f2278edfcd257b1a8be5c7aab..9878f8213f0367887cc78940d5ab8ecec48c11fe 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator, LimitIterator and string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index a8889654a50cfa41ac473f8e583b0a4307770bfb..2ee9724d28570ae1afa361815ca689be59a0aa12 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::count
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 905b8339c9a3c025051329e7d4e26b89398e615a..3fda53884f1634b94962f91e42d39d1f50dd7146 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::append
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index ad9bc6c4ac26736bd5b180750294bec6793bb63f..1ac9d4f956a8c4a53abcb391fd74ddaa647a73be 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::seek()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index a21bab53448182ded148355663e69ae68e289490..f0bf9f4087a883f2fac341d9a6c45cd088fb4736 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator::next() with internal arrays
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index f5a2854200a4a07ae660223ec449a48ffd0b53e2..8637c5c886ad36c467befc9f22b9c7e3ebdd39ef 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator/Object and IteratorIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4ffe283d093844908a1f45b0ca16dd5fb6232fec..fda8489cdafe62b4a22a79c2fb9e29214e0c9056 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject::exchangeArray($this)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 501e740270a194966a8777d24be6b6357af99ee3..ae506b057bff15d6fe44d7cf005a076070e8b114 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject and \0
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 43d53b1273546a14f42ff10b520b2b7746827800..d128f4de7b679bd689b94b0d2aa5175e92b0a86d 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator and foreach by reference
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index cdeb4a216cc5c3a8c85f8ab0d4439ca1a526e73f..4c6fe0df251b16863bfee70196ad2e6612a22c6a 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator overloading
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index b38cedf0cd28a053a0effafc9ba73ac2d8e85bb1..f2ae0c87e5d44769e6253b5010901d6bcb05512a 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject::seek() and exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index f210c090d1657ed53793f81c2b08bd187aa48a2e..b9d2396ef5e72dc640af79597232bf9292f690c3 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject/Iterator and reference to self
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 ==ArrayObject===
 <?php
index 0cf5575367f6520ffc193bce1d6bee04c2a9f430..7114edac9fa62cfb75f665987dbc0f975ae16e03 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #28822 (ArrayObject::offsetExists() works inverted)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 5d93381d4e40bf051b9884854943461a8a7093ce..aa410ebaae23c97bfcffd263d0a073dd7c9cfb72 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31185 (Crash when exceptions thrown from ArrayAccess::offsetUnset())
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index ed1b50d685a45afb6049281eb23b11ad032782bd..9b5618ec0eeadbd8b6e005ceeffe6421df042fc5 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31486 (ArrayIterator::next segfaults)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $obj = new stdClass;
index dcb627af2297176c63455088b1b1f9e85634b597..047e4b223ac250970083bb3d09258eb7574fd2b0 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31348 (CachingIterator::rewind() leaks)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = Array("some","blah");
index 176370b877ab4de0adabeb36e5a577a0a8a83f13..bcc9ed3d2c9d421ae91d770a44280df5bc3c3f90 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #31926 (php in free() error with RecursiveArrayIterator)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 806f78aeedb2e51d0b429bb4d53f1e1a8caf9cd8..84001984ac198d26c617cc9a1f0d8ea2cf3a8a72 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #32134 (Overloading offsetGet/offsetSet)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
        
index ac72e0fa163ca46b4841eaeae5d7059f89e34063..8189b23f7a97d003df0a131e3c5eecd53ba9f14a 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #32394 (offsetUnset() segfaults in a foreach)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c2bdc2f55eda8b8ace6333656f92ef711acd1977..8429e75176be5abe3cffb702677081659f2f57eb 100755 (executable)
@@ -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
 
index 73262a8061809a4f4bb7d7f353b7ed548cea31db..27c3094902e8a61532afa95bfe07f0ca0cace71a 100644 (file)
@@ -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
 
index 586bd3a11f9ca3cfb4d9dd061a5a5dcc6b156b64..920b7dfba8b50c27100892e4cad36faeeb05f569 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36258 (SplFileObject::getPath() may lead to segfault)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 377a5fef52a8c4b854596dead3e4d216ed361a7f..94fdbe7eadae41d5d76057cb7fddf3a8419efdee 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36287 (Segfault with SplFileInfo conversion)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 503ec43a438fd4af147cd7357253406cd5ea03e9..35de013a8f0a750792b9f206c37eae11a98a4e59 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause segfault)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 2ae03b4481adf9a7e84cd58c13ad6704b326aa50..528ba4a46223bbbe41ef9a8859b368b3d9231cb9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36941 (ArrayIterator does not clone itself)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 ===ArrayObject===
 <?php
index bd756bb9c9944b1f2110a1ba3b9873d354c86d06..992958bd45e96369bd7a2d45b5d546cdbd614ee4 100755 (executable)
@@ -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
 
index 0e838640566ae945840196418ea187df872eacbb..f50f5cc675f31c770740e33f87f1e65f2ab26043 100644 (file)
@@ -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();
index 8569629d3647d9bbb328e1492aa36dbfef83930c..8180c038ce37c2a93996a56b46c8bdc13034a05a 100644 (file)
@@ -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
index 316e302ea9ddf84780ace44d78e1b0451b1167e8..eb157e72ae4bf67b9fc4c672fb7a60ae7873473c 100644 (file)
@@ -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 {
index 70472c44e99761c4f11957a8d633c8dda758ac40..a48fe74feb4e02ddcd220292f7c84ffe4075299c 100755 (executable)
@@ -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 {
index 3fc4e0d02700c150782b4ee233de4798aebd4086..81de4511f60672d76838f0307d02221263d35532 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #41691 (ArrayObject::exchangeArray hangs Apache)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 0369d8a48fb85a224b332b943e4981ecef2eea59..1729fd15d3247fc62001fcc9cf3daf235d371e4f 100644 (file)
@@ -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
 
index ceefe78e521857ad58e4c203d23bf83533241a67..19c02a577aab776c70f1aa805a3f7227080976b3 100644 (file)
@@ -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
index 3ca083e0791e2d759d6703ccf01b70ce471a2667..e02a3c5bb47516bbf36ff4ab46eae40a70d0d904 100644 (file)
@@ -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__));
index 5ab7f5ed2e6d263bcf8e4ce0232272d5e45f3b7d..00918dc9b5356b0cb6c1ec7fe98f97751bd43cd0 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Problem with casting to string
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $d = new DirectoryIterator('.');
index 02da159c4085d510b14cc96bbec549759952c129..c02dfd84ecdee213e5946938ffe3119b54e7a385 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DirectoryIterator defaults
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4232a7fbc4a3961e649a3156c39c703e81267e52..7a38e73805cab407cdb876e396a702f8d22cdd8d 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: FilesystemIterator and foreach
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $count = 0;
index 704487f155fdb8d7e70a961c4a19baa4a117058d..4ad0e4b772ca9e7ec28f39b0ac5ad256d0dd75fb 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DirectoryIterator and clone
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new DirectoryIterator(__DIR__);
index 76f1214f0e21375180c6cd53d69b324b3be7e841..52a335172fbb4bcaf2c290587b97add3c9d0cf22 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: FilesystemIterator and clone
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new FileSystemIterator(__DIR__);
index b3d1ef20af3fa48df5538da69d475ffb138001d0..6ea427163bfdc0268f6d2af09fe8c67fcba8484c 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: std operations
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $dll = new SplDoublyLinkedList();
index 38779b26dcb6e834cef80133c82824d50badf14a..e956de60fd7ae31fc2472d44b74a4a41bba63a63 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: iterators
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $dll = new SplDoublyLinkedList();
index 8e62046374e334d8c96cef14d83f682455d5e15e..9a9556840fa841986981b6ef1cb14844cd228557 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: iterator modes
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $dll = new SplDoublyLinkedList();
index bf28106bcdc9244085cf47a83c257dc10014ffb0..4971ff50ada933d90f377db7e5818d9a881a960e 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: Stacks
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $stack = new SplStack();
index 3883bbca13aacc6bf61d59d91f7cf76045913931..0c1f1534eda809e45166a1e9a9dd570e12e7dc17 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: Queues
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $queue = new SplQueue();
index a776ed67e651bfc24c0e4ba7b815767ba5e56d07..b4055dcb9caf1548f803695d5e97f9dd23b57ce7 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: ArrayAccess
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new SplDoublyLinkedList();
index 46dc7ad47e89b6aeaabd86f27f49c222abcd84d5..38f801fde7886082cad633e40c1d512dea2ad284 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: DoublyLinkedList: Iterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $a = new SplDoublyLinkedList();
index 255fc026f8bf26157944263de375f01cd616de21..298e58920a3a49da8213f73523185bbec99b4e96 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject::seek'ing
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index b6f72b61e9c5f1abb1a311668d9b220dbfb7d082..3017b38278c2f8ded377218bcbec2f641338ae74 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject::fgetc
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index f3574734281e6dbbd15600e733e16874cd9f8efb..d738d68345fc11634cc04e2d825a08c10d446ede 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileInfo cloning
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index f71fc871c2b8ea268d3c0c210b5dc8417490f74c..02e6725853c290981307d71f268e7cbf6674a0da 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplFileObject realpath and include_path
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 3b4316ffd898630e88bf7c1d9f5af08627407390..eb189d8f4ae73d4e1ad4ee5e576adf47c4ea2fdd 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplMaxHeap: std operations
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMaxHeap();
index 815f5fd90fb6006638fb8500776c62031c52e789..387510f766b55551fba06a3b0506412ec9b31177 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplMinHeap: std operations
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMinHeap();
index b81c043ca435e28156d2cce749a127322e90319d..87f95e9a2b1b866b65d81f589ae5c2afa1cb454d 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: comparison callback
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class myHeap extends SplHeap {
index 55aca4ccb3e1dbebb7fa80dd56fcb3b87f78d03c..7b00ebfbff8879136b173bdc13fbfc525238188c 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class myHeap extends SplHeap {
index 575ddba4ce40070c487efd9332ad9bcc09fdd959..73daaf454af5d5c5d82462b00b25b2e656b66077 100644 (file)
@@ -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);
index 08162ff35728165a86554bf479b63feaf771a4bb..4422727d04ad9100ccb212db89b1b526d7b50146 100644 (file)
@@ -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);
index 594ffc0180c2bac7f43626c5cb21ad2be0353862..784ac6e8b0b0ee853cb3950ac6b3c57cbc123c9c 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: iteration through methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMaxHeap();
index 3be94e686412a2a8048c22ab5d765bb202fd4013..521baf445db882d4f37d17247ec50606457fd954 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplHeap: var_dump
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplMaxHeap();
index 2239417778643752535689cf10ce9a0c492ec086..26df62e85b24d6a4520118556f1a7d290f6225f1 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Iterator aggregating inner iterator's methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index d56a551c3f98922ea7e64eb8cf02c7f2a24aa562..527fe6b77680167382ed762e53827acfcce067a4 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Iterator using getInnerIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c60776cb331a6ea4f0c5874031a9955c3e44c14a..11d37b303b009199ac3fa9b1fd4a4fd6d06820af 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4e6006621b2370e103fc9325e4cd116fe091f674..e07cd32c39477c5481493958f38d1607adeb0f98 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SeekableIterator and string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4aae600169776bf0d22d673a6164d9b5e6e76c78..640ca9f9c29f96e7105ac5698da6a33c3afc6e30 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: IteratorIterator and ArrayIterator/Object
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index aa8fd0e44d718b3a6998ed28fa59b2c407354e17..1a1be0561ad1a4090acf1d7e334dd2411a1b9f9f 100755 (executable)
@@ -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
 
index eb87977ac9bba2e076c10a750c74286d1f717ee6..d26c01ef793c3bcb8aa24e94c08cb0ff7c3843ad 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: NoRewindIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 5f3c7d89dfb878d6bafdfc724c27d3dc80f6f98f..04f8c003480c521d3ad10bfb27ade3a8e42ffe9d 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: InfiniteIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 27a3e0655f179e69f22ec02fbf73095dff13b651..0bfe74ef7fe803b2085f0e55e2a4a8545da824af 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index e7e1a519b636c7f6659a27cd7e9bbe3c39d39d8f..39d1000f62d6317533a38696906c3b622c06045e 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index aed1ed5e3e70131a7415136f9b2b83ce3af369fc..fca159a20f6359699c111ef5407e21a5f6e50fdd 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: InfiniteIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c6eb86eefb35892592996acbb7067c36bd27f0b8..81bc02f69c162c3cc749ed36f2946ad53758f79d 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: NoRewindIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 56aea98504dd1aedf23b95f5c715790a3547c365..119631c00038a07e7b31b61a97f02bbaf2af7dea 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 8f9020bf81b6eb7db22520bdebcf96dadb7769c2..119fad05fbad25bbfc73c4536554ffe6b5bda3d7 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and beginChildren/endChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 57b9899e6c2a6cd8765845a4a6aae95050f18e75..aa30f79e1f675514f01b7b9e17cca83ab593f64b 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and beginChildren/endChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4801835a1bb12fb6242857faaf8e63342f8bc972..f231c6eb347e2f9675877438a036bffdf8630ee9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and beginChildren/endChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index e7e1a519b636c7f6659a27cd7e9bbe3c39d39d8f..39d1000f62d6317533a38696906c3b622c06045e 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 3cb68eeea87253477633487e3671a15602fc290f..9c234bb11d2a1829814a1d412e1a0b928c7c75ad 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: InfiniteIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c6eb86eefb35892592996acbb7067c36bd27f0b8..81bc02f69c162c3cc749ed36f2946ad53758f79d 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: NoRewindIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 56aea98504dd1aedf23b95f5c715790a3547c365..119631c00038a07e7b31b61a97f02bbaf2af7dea 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 1dbd245bc8af8d41b262fb0a8a54c24fadf12177..4f2395a8e591681f61d5bec666bd638b57af3e7c 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and hasChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 1f1e6e951a5b9f4679e48700161cae69d56aefea..8d055313ace5c0af88d1990b58ce1e05f8943471 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and callHasChildren/callGetChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 00b831e11617355336d2a07c9681f4256db52fd6..1b6b4685ec112775bb6510dca808ffec45d5915c 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and catch getChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 414b1de552324fe538779b7f5cf50ce1de14ea56..cecf08e7a3e65d20d6fa7273aa7b917602717307 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator with custom iterator class
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 737b8f6664c02119603be0778dcdadca3257a49a..e582b1f39e8898e29bec7067bbc463df005b3b54 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and begin/endIteration()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 9f20998f3bcdbf2ff97c191215e5dda910b190df..d55c1217bbf84eaf7cc33f739e66d7ada88a57bc 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator::hasNext()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 633c8fb0ab384bc585efcf6a0f31f78f944d8be5..3c2f72238522f61fb86821f92846191899ec97d9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator::FULL_CACHE
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 13e483092e119b126c7265fcba29a4b22e70eb8a..7ec76d814410a9ee3c13b7f4c83438464872f5d7 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and setMaxDepth()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 3e836adef638155315455fb317021b3e1cf9ad74..e5bfde021944cf11ee94793dfbbe09fccbdcdbe9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 6ed8035ac1899389359a675386ca55773b889f2c..29d147f12b147350f46080c427c84d2e8b86f535 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: EmptyIterator access
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 00afa618509ceaae9aafbc64235ca09acd8dd894..458f071b76f8a46cadc3872aad981b4124972667 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator::append() rewinds when neccessary
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 86695d4af8e0107ac76b65d781b11d4da4c1a14d..8b1d97e18809f4f5fa7231956adff493a32374a6 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: LimitIterator::getPosition()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c1880cb2fbd97d43e617ce23ad86de7efa593b46..548759ccbb0e52922ae8d210e7d601bd3d99a31e 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ParentIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index b81c6d970ee05891bbc9edd14fe7e97f1074b58c..3329e744bdbde2b6da9d8e1e658cb1006da10810 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveIteratorIterator and break deep
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 9dfe35d5f4bfaa39c8a03fb1a485ee72229f6898..9ce098b69d7c11d510a874546fabd7261374fc25 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator and values assigned by reference
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
        
index 3eb0eefa6ba0f2469fc9e08555988c83dae9cf4c..9a9e66b3b3cec576c86f1700c9d8fb8495e72ad7 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString and flags = 0
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 00f0abba13988085ce7d0ce187a29960c82e8519..d66c3598c49d1f3a3e479bb881e43684360765e9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index bc39a83c8b4ac14acfa058b86da4035091f94d7a..dd276ddde5dfda25923ee583e9de458532939e41 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RoRewindIterator and string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 5dcaaa22654799d016722844ba74e1b3f9551c4c..17c9bc1ca59ce5664b3b2f3b04467a6cbe617fb7 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: LimitIterator and backward seeking
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index a162cac68fa21a0932f9ec1d9605e905e6d274d3..ae00c81df3cadc8efd9ddadce2d2866e1e3f122f 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveFilterIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index af42b1cdecad14006ab906958420fd2e31e022eb..e00ac6bc2b14dd4fd18777276eeeceb1b20ff349 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index d03cbba9dc7f8d596982abcaf57995425eaea73b..ec999a5dae67038955eb05976b9dab32e3c72bb0 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and exceptions from destruct
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 9afb93526677ea97b5e74648b2d4a6e323395041..f07164d08a898c25a7df1129a1d60755b602ab61 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and exceptions from delayed destruct
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4f470849af8d858c9664738efb17043558adeb32..95fea2f6b88a24fc33bce8810b1e8290a8b23804 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: AppendIterator and its ArrayIterator
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c49e334733eb7ae6b83db0d39b9f21ba70c068d3..301a593ba234da13de9fa3a7e111364fca972b72 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveCachingIterator and uninitialized getChildren()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 45499636c3ac6585555a3600419f8e286e9f0a8f..9f6d5e47fcb55b583c7c684c38674931571951cd 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and offsetGet/Exists using flag FULL_CACHE
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 34dcfa78d1ae07e4390bdb8aa4ee2670897b46ee..d9d9e0d7acccff8782aeae2ddc0c581987aff192 100755 (executable)
@@ -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
 
index 35736c4110acca485eb477502a4ce9dc033c0a55..0b7829c35209eff8fd1270106afa0c085ec82360 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: CachingIterator and __toString using bypassed string keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 727cbc32d990267984f519928b5dcebfe59d3485..2fb1c626836d65f78c3930cc7c4b41262d640669 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveCachingIterator and exception in has/getChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 5d69b5405a49ae5c11976c9e7fa4f317b06f08ea..d3dc84acaec36e4c432493f09fd847d452cf5bab 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RecursiveRegexIterator and exception in has/getChildren
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 756cdbcec6ddbb1e9a02a07110e81c8255696962..2812b8bf42a6b792a30f7f518956157330435ecd 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayIterator with NULL key
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 4395d9557292274392254049826f14aea23b313e..a94c99b9633a27f83657044508cdff3c55a79085 100755 (executable)
Binary files a/ext/spl/tests/iterator_049b.phpt and b/ext/spl/tests/iterator_049b.phpt differ
index 5d9d381618fc4f097e30b7c10bdfb547698b3180..63d8fbfa9a8f7292c549d029c29f013730a77992 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::GET_MATCH
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index db5438d04372318bd4625785e8b96568a7015f0a..770983b4946911e419aefc78f12f28f867223e2c 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::GET_MATCH, USE_KEY
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 28a55548cac30c96df230a2a0ea04432ef129feb..b4c8626ccd391d143376c9b4a7a1524362ca88a2 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::ALL_MATCHES
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index eda66867348d9e29df0c6cdd4f87d63688353369..0ca947a1e10695a725180c083dc31e4174bca6f9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::ALL_MATCHES
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index f7039f9b2b7f6965e4f99511474a5ae5fd759614..aeb8a5ce5963ac564e97136f0d3645d9d34b4a8f 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::SPLIT
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 32ebc8445dc1f7f772e83fdb9416d596a3046274..21212c0a868afb2a5d512accf355f7710bb14f44 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: RegexIterator::SPLIT, USE_KEY
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index d161a477674b467232ae663d0e6b1cdf7bda4d9e..e7d72b9e2409cca85088816e969f3cee2273fc9e 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObserver and SplSubject (empty notify)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 7bcd9dc2ebfecdb7a859ab00abe692af5e6b551c..5d006177f2e343dee638a371fb9d65f7ab47eb91 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index c9329c4c40506fb0ef58cdb55a8a9877dfe15b50..f5d022daf603adff90faaba350985d1986dcd674 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage serialization
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 70021bbc2148680d57ee7d0103421708b3b2b6e7..3f94f5ea2346b090cf2f7b7262f65988cfa29bd9 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage serialization & overloading
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 5fba62dbb27a27079df18c15fef146abb86b9a2b..3d906ca601c039bbcdaaa3ce518acf65e7cb6b75 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage serialization & visibility
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 6e830c939301d740a51b7eb68323b75779bc5151..e93965fa60f4dd5a40a7c7922868189c82fd95ba 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplObjectStorage with accociatied information
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 13841324123258fa2eb6cc3ad219e6b32535442a..600db8874e7fbdc332e6e112b723eb2c770e58fa 100644 (file)
@@ -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();
index c47a6fe5c8a4ac4a5dd9c0a97e7e0f7dbfb25277..eaab2cf809250d66732fc2142c49acfe65629076 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class myPQueue extends SplPriorityQueue {
index 87d9eda223840203e292680e906673ca0650a9d4..8abc72c4c77a2e06035e93db68b08f54812b2e08 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: iteration through methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $h = new SplPriorityQueue();
index b9d0d50e562cdec296d972b57fb9af315ac55128..4b51d204ba8d56030dd039bd4ab1d5410ed8f103 100644 (file)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: SplPriorityQueue: var_dump
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 $pq = new SplPriorityQueue();
index 8d637a1a66bb3f315b7a87159d397d3b1dddf656..e101272a84dad9e8e7945330e6503e41d08d96b8 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() and iterator_count()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index fbc33f0a9cc6b169cb54f7bf3c04fe1bff46e960..d8b71b20cfd08bf18a34cb529b18caa35acff8af 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: Countable
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 141138861290971920a872fdb9eb9fcd47896f0d..a05647eb8e54b1c006b0344b02abbc65d49a4e61 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: class_parents() and class_implements()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 class a{}
index dc630a19b1a236bd6689f5f82f636a9b39407783..1a2125de6c0ef933bda5d7987e18fd0f183a82f6 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_apply()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index bb297bb6bcf8189e79039b001d187a1dca12220c..219c791bbb9eead5cf86021ea0441d11fe030a2d 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_object_hash()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index 89859624db71685ae1bc36b37e6c7eb43515c78d..1f5f85fb6d44d4a8a6f5dbbf14ef02c4bb48badf 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_to_array() without keys
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index dcd63f9b5ad7fcef3a8b30982787c6c558d1a61b..6d4059d0b5fed7f2451080299488a540106aff51 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: iterator_apply() with callback using __call()
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
index ae7e5945f5f8e2f6525f82b267abadb121bb5f10..22e2e90f135e0f1ba00671e4b7ac4b55d661a169 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() and friends
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index e5197ba253087b121899e495afafc5fd4d687de1..d46cb26bb88154cce0611581e6fcb477f7a5e88b 100755 (executable)
@@ -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
index 1344b39204e14085fedc2ad79d713fd396d3a77d..00fdd2734f4b34d8a98cca003a96a8ebfe60cf16 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() and friends
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index 6afc88785714cd21ab38f760de58245fad50bc34..d995961d7a1abfb10447afd94b3beca0fa21d00a 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with static methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index 8ba7965f804dbc5018f0f6429421a63b11bd8ecd..f4db521d52d7a02b5def693f916b47d74e77ca69 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index 007235843abb4131f20cddc60dcf571d04b31748..7cd576f352a47f5b318bae2f5a203bb849bec0ab 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with static methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index dbbedd2d386a3b36082ffe3309cc1dd9dcd12b25..06b1a8060fc9b360c45c7fc66727f2e729c43e77 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with inaccessible methods
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index 369b8303e0b3cf4cb4ed95a58eadb4ace1366375..a5156d365422480271e738ad8c79ab3413e75507 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() with exceptions
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index c282bf44520dea5ca2c6b75cdaae1ffda1b30ebb..d5e54137eb86ca5e2165a7bffa77d1151d9785d6 100755 (executable)
@@ -1,7 +1,5 @@
 --TEST--
 SPL: spl_autoload() and friends
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
 include_path=.
 --FILE--
index 48747992d749ce2e67f8dfece0a57d47ccd6cd47..db9b786c03dac5cfce3a5af83866eab3da196815 100755 (executable)
@@ -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";
 ?>
index e8f694a8e1a551717ac7844fa883539104e9eb7c..94179d1d6beef6d6e80ac1ff9b65c01fd4660e01 100755 (executable)
@@ -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 
index 823213ff941be653b4836e439005b3ab6184a465..402658c2e29df7b401b948479e6c589939f6e27b 100755 (executable)
@@ -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 
index 34957ccd26f0e35cb35762dcdae4cc20fdc61cb3..f5ba0c3ecd2e5706d44efe28758868b239733029 100755 (executable)
@@ -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 
index dbef1dd99b6f4559518758a1af1fa3b7afa7e1ff..c5508140fe83f8e47002f4a58e0208608863a66c 100755 (executable)
@@ -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