diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-11-16 13:25:37 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-11-16 13:25:37 +0100 |
| commit | 0b82e05fe264306004119e30119e665365331e17 (patch) | |
| tree | b6ee689804e9ca3946a644a80760d821a032d42f /ext/spl | |
| parent | b57a2691d5b72c3894e2d4e0f945cecc6b3a1953 (diff) | |
| download | php-0b82e05fe264306004119e30119e665365331e17.tar.gz | |
Imported Upstream version 5.5.0~alpha1upstream/5.5.0_alpha1
Diffstat (limited to 'ext/spl')
200 files changed, 114 insertions, 3 deletions
diff --git a/ext/spl/doxygen.cfg b/ext/spl/doxygen.cfg index 4b7178723..5c7025a9a 100755 --- a/ext/spl/doxygen.cfg +++ b/ext/spl/doxygen.cfg @@ -111,7 +111,7 @@ HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = YES CHM_FILE = ../spl.chm -HHC_LOCATION = hhc.exe +#HHC_LOCATION = hhc.exe GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO @@ -210,7 +210,7 @@ MAX_DOT_GRAPH_WIDTH = 1200 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 0 GENERATE_LEGEND = YES -DOT_CLEANUP = YES +DOT_CLEANUP = NO #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc index 5871e7d63..5871e7d63 100755..100644 --- a/ext/spl/examples/autoload.inc +++ b/ext/spl/examples/autoload.inc diff --git a/ext/spl/examples/callbackfilteriterator.inc b/ext/spl/examples/callbackfilteriterator.inc index 51757012e..51757012e 100755..100644 --- a/ext/spl/examples/callbackfilteriterator.inc +++ b/ext/spl/examples/callbackfilteriterator.inc diff --git a/ext/spl/examples/dbaarray.inc b/ext/spl/examples/dbaarray.inc index d448ad729..d448ad729 100755..100644 --- a/ext/spl/examples/dbaarray.inc +++ b/ext/spl/examples/dbaarray.inc diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc index b09791239..b09791239 100755..100644 --- a/ext/spl/examples/dbareader.inc +++ b/ext/spl/examples/dbareader.inc diff --git a/ext/spl/examples/directoryfilterdots.inc b/ext/spl/examples/directoryfilterdots.inc index 37f14b710..37f14b710 100755..100644 --- a/ext/spl/examples/directoryfilterdots.inc +++ b/ext/spl/examples/directoryfilterdots.inc diff --git a/ext/spl/examples/directorytree.inc b/ext/spl/examples/directorytree.inc index 7bd9c2c59..7bd9c2c59 100755..100644 --- a/ext/spl/examples/directorytree.inc +++ b/ext/spl/examples/directorytree.inc diff --git a/ext/spl/examples/dualiterator.inc b/ext/spl/examples/dualiterator.inc index 4cee20343..4cee20343 100755..100644 --- a/ext/spl/examples/dualiterator.inc +++ b/ext/spl/examples/dualiterator.inc diff --git a/ext/spl/examples/findfile.inc b/ext/spl/examples/findfile.inc index 02ab79243..02ab79243 100755..100644 --- a/ext/spl/examples/findfile.inc +++ b/ext/spl/examples/findfile.inc diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc index 62cfa3e02..62cfa3e02 100755..100644 --- a/ext/spl/examples/inigroups.inc +++ b/ext/spl/examples/inigroups.inc diff --git a/ext/spl/examples/keyfilter.inc b/ext/spl/examples/keyfilter.inc index eaf6b7736..eaf6b7736 100755..100644 --- a/ext/spl/examples/keyfilter.inc +++ b/ext/spl/examples/keyfilter.inc diff --git a/ext/spl/examples/recursivecomparedualiterator.inc b/ext/spl/examples/recursivecomparedualiterator.inc index 75265c1d5..75265c1d5 100755..100644 --- a/ext/spl/examples/recursivecomparedualiterator.inc +++ b/ext/spl/examples/recursivecomparedualiterator.inc diff --git a/ext/spl/examples/recursivedualiterator.inc b/ext/spl/examples/recursivedualiterator.inc index cfa3bccbb..cfa3bccbb 100755..100644 --- a/ext/spl/examples/recursivedualiterator.inc +++ b/ext/spl/examples/recursivedualiterator.inc diff --git a/ext/spl/examples/regexfindfile.inc b/ext/spl/examples/regexfindfile.inc index d5dd72253..d5dd72253 100755..100644 --- a/ext/spl/examples/regexfindfile.inc +++ b/ext/spl/examples/regexfindfile.inc diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc index 944a4ac5a..944a4ac5a 100755..100644 --- a/ext/spl/examples/searchiterator.inc +++ b/ext/spl/examples/searchiterator.inc diff --git a/ext/spl/examples/tests/dualiterator_001.phpt b/ext/spl/examples/tests/dualiterator_001.phpt index 53c11537a..53c11537a 100755..100644 --- a/ext/spl/examples/tests/dualiterator_001.phpt +++ b/ext/spl/examples/tests/dualiterator_001.phpt diff --git a/ext/spl/examples/tests/examples.inc b/ext/spl/examples/tests/examples.inc index feeba7db2..feeba7db2 100755..100644 --- a/ext/spl/examples/tests/examples.inc +++ b/ext/spl/examples/tests/examples.inc diff --git a/ext/spl/internal/appenditerator.inc b/ext/spl/internal/appenditerator.inc index 28e32b15f..28e32b15f 100755..100644 --- a/ext/spl/internal/appenditerator.inc +++ b/ext/spl/internal/appenditerator.inc diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc index 33258ab95..33258ab95 100755..100644 --- a/ext/spl/internal/cachingiterator.inc +++ b/ext/spl/internal/cachingiterator.inc diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc index ac80e7958..ac80e7958 100755..100644 --- a/ext/spl/internal/emptyiterator.inc +++ b/ext/spl/internal/emptyiterator.inc diff --git a/ext/spl/internal/filteriterator.inc b/ext/spl/internal/filteriterator.inc index 3330cc9e4..3330cc9e4 100755..100644 --- a/ext/spl/internal/filteriterator.inc +++ b/ext/spl/internal/filteriterator.inc diff --git a/ext/spl/internal/infiniteiterator.inc b/ext/spl/internal/infiniteiterator.inc index 04d782718..04d782718 100755..100644 --- a/ext/spl/internal/infiniteiterator.inc +++ b/ext/spl/internal/infiniteiterator.inc diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc index 37676e053..37676e053 100755..100644 --- a/ext/spl/internal/iteratoriterator.inc +++ b/ext/spl/internal/iteratoriterator.inc diff --git a/ext/spl/internal/limititerator.inc b/ext/spl/internal/limititerator.inc index c5bddead7..c5bddead7 100755..100644 --- a/ext/spl/internal/limititerator.inc +++ b/ext/spl/internal/limititerator.inc diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc index 2ed71d53a..2ed71d53a 100755..100644 --- a/ext/spl/internal/multipleiterator.inc +++ b/ext/spl/internal/multipleiterator.inc diff --git a/ext/spl/internal/norewinditerator.inc b/ext/spl/internal/norewinditerator.inc index 8747a6116..8747a6116 100755..100644 --- a/ext/spl/internal/norewinditerator.inc +++ b/ext/spl/internal/norewinditerator.inc diff --git a/ext/spl/internal/outeriterator.inc b/ext/spl/internal/outeriterator.inc index f26d29da5..f26d29da5 100755..100644 --- a/ext/spl/internal/outeriterator.inc +++ b/ext/spl/internal/outeriterator.inc diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc index cc377fcc6..cc377fcc6 100755..100644 --- a/ext/spl/internal/parentiterator.inc +++ b/ext/spl/internal/parentiterator.inc diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc index a9450e12a..a9450e12a 100755..100644 --- a/ext/spl/internal/recursivearrayiterator.inc +++ b/ext/spl/internal/recursivearrayiterator.inc diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc index 0676d435f..0676d435f 100755..100644 --- a/ext/spl/internal/recursivecachingiterator.inc +++ b/ext/spl/internal/recursivecachingiterator.inc diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc index b089919a3..b089919a3 100755..100644 --- a/ext/spl/internal/recursivefilteriterator.inc +++ b/ext/spl/internal/recursivefilteriterator.inc diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc index 1eab3d69b..1eab3d69b 100755..100644 --- a/ext/spl/internal/recursiveiterator.inc +++ b/ext/spl/internal/recursiveiterator.inc diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index 35fa801e7..35fa801e7 100755..100644 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc index ffcff0ce4..ffcff0ce4 100755..100644 --- a/ext/spl/internal/recursiveregexiterator.inc +++ b/ext/spl/internal/recursiveregexiterator.inc diff --git a/ext/spl/internal/recursivetreeiterator.inc b/ext/spl/internal/recursivetreeiterator.inc index dfcdc0599..dfcdc0599 100755..100644 --- a/ext/spl/internal/recursivetreeiterator.inc +++ b/ext/spl/internal/recursivetreeiterator.inc diff --git a/ext/spl/internal/regexiterator.inc b/ext/spl/internal/regexiterator.inc index c6addb93d..c6addb93d 100755..100644 --- a/ext/spl/internal/regexiterator.inc +++ b/ext/spl/internal/regexiterator.inc diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc index b4f66bde4..b4f66bde4 100755..100644 --- a/ext/spl/internal/seekableiterator.inc +++ b/ext/spl/internal/seekableiterator.inc diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc index 46b941f69..46b941f69 100755..100644 --- a/ext/spl/internal/splfileobject.inc +++ b/ext/spl/internal/splfileobject.inc diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc index fa164066c..fa164066c 100755..100644 --- a/ext/spl/internal/splobjectstorage.inc +++ b/ext/spl/internal/splobjectstorage.inc diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index cd0086626..cd0086626 100755..100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 855a78c40..855a78c40 100755..100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 3c6b41edb..3c6b41edb 100755..100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c diff --git a/ext/spl/spl_array.h b/ext/spl/spl_array.h index 909f4c97d..909f4c97d 100755..100644 --- a/ext/spl/spl_array.h +++ b/ext/spl/spl_array.h diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index b86e68659..b86e68659 100755..100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h index 96f5dd6cb..96f5dd6cb 100755..100644 --- a/ext/spl/spl_directory.h +++ b/ext/spl/spl_directory.h diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c index d501f3143..d501f3143 100755..100644 --- a/ext/spl/spl_engine.c +++ b/ext/spl/spl_engine.c diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h index db7affef8..db7affef8 100755..100644 --- a/ext/spl/spl_engine.h +++ b/ext/spl/spl_engine.h diff --git a/ext/spl/spl_exceptions.c b/ext/spl/spl_exceptions.c index 570299a2a..570299a2a 100755..100644 --- a/ext/spl/spl_exceptions.c +++ b/ext/spl/spl_exceptions.c diff --git a/ext/spl/spl_exceptions.h b/ext/spl/spl_exceptions.h index 8d3a58a30..8d3a58a30 100755..100644 --- a/ext/spl/spl_exceptions.h +++ b/ext/spl/spl_exceptions.h diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 244bd3e0d..8bf61e868 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -583,6 +583,38 @@ SPL_METHOD(SplFixedArray, __construct) } /* }}} */ +/* {{{ proto void SplFixedArray::__wakeup() +*/ +SPL_METHOD(SplFixedArray, __wakeup) +{ + spl_fixedarray_object *intern = (spl_fixedarray_object *) zend_object_store_get_object(getThis() TSRMLS_CC); + HashPosition ptr; + HashTable *intern_ht = zend_std_get_properties(getThis() TSRMLS_CC); + zval **data; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) { + return; + } + + if (!intern->array) { + int index = 0; + int size = zend_hash_num_elements(intern_ht); + + intern->array = emalloc(sizeof(spl_fixedarray)); + spl_fixedarray_init(intern->array, size TSRMLS_CC); + + for (zend_hash_internal_pointer_reset_ex(intern_ht, &ptr); zend_hash_get_current_data_ex(intern_ht, (void **) &data, &ptr) == SUCCESS; zend_hash_move_forward_ex(intern_ht, &ptr)) { + Z_ADDREF_PP(data); + intern->array->elements[index++] = *data; + } + + /* Remove the unserialised properties, since we now have the elements + * within the spl_fixedarray_object structure. */ + zend_hash_clean(intern_ht); + } +} +/* }}} */ + /* {{{ proto int SplFixedArray::count(void) */ SPL_METHOD(SplFixedArray, count) @@ -1060,6 +1092,7 @@ ZEND_END_ARG_INFO() static zend_function_entry spl_funcs_SplFixedArray[] = { /* {{{ */ SPL_ME(SplFixedArray, __construct, arginfo_splfixedarray_construct,ZEND_ACC_PUBLIC) + SPL_ME(SplFixedArray, __wakeup, arginfo_splfixedarray_void, ZEND_ACC_PUBLIC) SPL_ME(SplFixedArray, count, arginfo_splfixedarray_void, ZEND_ACC_PUBLIC) SPL_ME(SplFixedArray, toArray, arginfo_splfixedarray_void, ZEND_ACC_PUBLIC) SPL_ME(SplFixedArray, fromArray, arginfo_fixedarray_fromArray, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c index b9fd5dc8b..b9fd5dc8b 100755..100644 --- a/ext/spl/spl_functions.c +++ b/ext/spl/spl_functions.c diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h index 394de6ae9..394de6ae9 100755..100644 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 098d7dc1e..7b77cf5bb 100755..100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -230,7 +230,7 @@ next_step: if (iterator->funcs->valid(iterator TSRMLS_CC) == FAILURE) { break; } - object->iterators[object->level].state = RS_TEST; + object->iterators[object->level].state = RS_TEST; /* break; */ case RS_TEST: ce = object->iterators[object->level].ce; diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h index 4a2c999c3..4a2c999c3 100755..100644 --- a/ext/spl/spl_iterators.h +++ b/ext/spl/spl_iterators.h diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 4b8be82ee..4b8be82ee 100755..100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c diff --git a/ext/spl/spl_observer.h b/ext/spl/spl_observer.h index bfee74f30..bfee74f30 100755..100644 --- a/ext/spl/spl_observer.h +++ b/ext/spl/spl_observer.h diff --git a/ext/spl/tests/SplFixedArray_serialize.phpt b/ext/spl/tests/SplFixedArray_serialize.phpt new file mode 100644 index 000000000..f99812ecc --- /dev/null +++ b/ext/spl/tests/SplFixedArray_serialize.phpt @@ -0,0 +1,52 @@ +--TEST-- +SplFixedArray serialisation +--FILE-- +<?php + +$array = new SplFixedArray(5); + +$obj = new stdClass; +$obj->prop = 'value'; + +$array[0] = 'foo'; +$array[2] = 42; +$array[3] = $obj; +$array[4] = range(1, 5); + +$ser = serialize($array); +echo "$ser\n"; +$unser = unserialize($ser); + +printf("count: %d\n", count($unser)); +printf("getSize(): %d\n", $unser->getSize()); + +var_dump($unser[0], $unser[1], $unser[2], $unser[3], $unser[4]); + +$unser[4] = 'quux'; +var_dump($unser[4]); + +?> +--EXPECT-- +O:13:"SplFixedArray":5:{i:0;s:3:"foo";i:1;N;i:2;i:42;i:3;O:8:"stdClass":1:{s:4:"prop";s:5:"value";}i:4;a:5:{i:0;i:1;i:1;i:2;i:2;i:3;i:3;i:4;i:4;i:5;}} +count: 5 +getSize(): 5 +string(3) "foo" +NULL +int(42) +object(stdClass)#4 (1) { + ["prop"]=> + string(5) "value" +} +array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} +string(4) "quux" diff --git a/ext/spl/tests/array_001.phpt b/ext/spl/tests/array_001.phpt index b55fcba1f..b55fcba1f 100755..100644 --- a/ext/spl/tests/array_001.phpt +++ b/ext/spl/tests/array_001.phpt diff --git a/ext/spl/tests/array_002.phpt b/ext/spl/tests/array_002.phpt index 55935882f..55935882f 100755..100644 --- a/ext/spl/tests/array_002.phpt +++ b/ext/spl/tests/array_002.phpt diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt index de4ce30f9..de4ce30f9 100755..100644 --- a/ext/spl/tests/array_003.phpt +++ b/ext/spl/tests/array_003.phpt diff --git a/ext/spl/tests/array_004.phpt b/ext/spl/tests/array_004.phpt index 0b80e5c89..0b80e5c89 100755..100644 --- a/ext/spl/tests/array_004.phpt +++ b/ext/spl/tests/array_004.phpt diff --git a/ext/spl/tests/array_005.phpt b/ext/spl/tests/array_005.phpt index d7ef15db1..d7ef15db1 100755..100644 --- a/ext/spl/tests/array_005.phpt +++ b/ext/spl/tests/array_005.phpt diff --git a/ext/spl/tests/array_006.phpt b/ext/spl/tests/array_006.phpt index 49f2838f7..49f2838f7 100755..100644 --- a/ext/spl/tests/array_006.phpt +++ b/ext/spl/tests/array_006.phpt diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt index 7d9bf6afc..7d9bf6afc 100755..100644 --- a/ext/spl/tests/array_007.phpt +++ b/ext/spl/tests/array_007.phpt diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt index e7a618dda..e7a618dda 100755..100644 --- a/ext/spl/tests/array_008.phpt +++ b/ext/spl/tests/array_008.phpt diff --git a/ext/spl/tests/array_009.phpt b/ext/spl/tests/array_009.phpt index fc0d60baa..fc0d60baa 100755..100644 --- a/ext/spl/tests/array_009.phpt +++ b/ext/spl/tests/array_009.phpt diff --git a/ext/spl/tests/array_009a.phpt b/ext/spl/tests/array_009a.phpt index 396aa9b9e..396aa9b9e 100755..100644 --- a/ext/spl/tests/array_009a.phpt +++ b/ext/spl/tests/array_009a.phpt diff --git a/ext/spl/tests/array_010.phpt b/ext/spl/tests/array_010.phpt index d2f3de7f6..d2f3de7f6 100755..100644 --- a/ext/spl/tests/array_010.phpt +++ b/ext/spl/tests/array_010.phpt diff --git a/ext/spl/tests/array_011.phpt b/ext/spl/tests/array_011.phpt index 0c5ad55d6..0c5ad55d6 100755..100644 --- a/ext/spl/tests/array_011.phpt +++ b/ext/spl/tests/array_011.phpt diff --git a/ext/spl/tests/array_012.phpt b/ext/spl/tests/array_012.phpt index 2ee9724d2..2ee9724d2 100755..100644 --- a/ext/spl/tests/array_012.phpt +++ b/ext/spl/tests/array_012.phpt diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt index 3fda53884..3fda53884 100755..100644 --- a/ext/spl/tests/array_013.phpt +++ b/ext/spl/tests/array_013.phpt diff --git a/ext/spl/tests/array_014.phpt b/ext/spl/tests/array_014.phpt index 1ac9d4f95..1ac9d4f95 100755..100644 --- a/ext/spl/tests/array_014.phpt +++ b/ext/spl/tests/array_014.phpt diff --git a/ext/spl/tests/array_015.phpt b/ext/spl/tests/array_015.phpt index f0bf9f408..f0bf9f408 100755..100644 --- a/ext/spl/tests/array_015.phpt +++ b/ext/spl/tests/array_015.phpt diff --git a/ext/spl/tests/array_016.phpt b/ext/spl/tests/array_016.phpt index 8637c5c88..8637c5c88 100755..100644 --- a/ext/spl/tests/array_016.phpt +++ b/ext/spl/tests/array_016.phpt diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt index 8f3d34543..8f3d34543 100755..100644 --- a/ext/spl/tests/array_017.phpt +++ b/ext/spl/tests/array_017.phpt diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt Binary files differindex 7c68a6280..7c68a6280 100755..100644 --- a/ext/spl/tests/array_018.phpt +++ b/ext/spl/tests/array_018.phpt diff --git a/ext/spl/tests/array_019.phpt b/ext/spl/tests/array_019.phpt index d128f4de7..d128f4de7 100755..100644 --- a/ext/spl/tests/array_019.phpt +++ b/ext/spl/tests/array_019.phpt diff --git a/ext/spl/tests/array_020.phpt b/ext/spl/tests/array_020.phpt index 4c6fe0df2..4c6fe0df2 100755..100644 --- a/ext/spl/tests/array_020.phpt +++ b/ext/spl/tests/array_020.phpt diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt index f2ae0c87e..f2ae0c87e 100755..100644 --- a/ext/spl/tests/array_021.phpt +++ b/ext/spl/tests/array_021.phpt diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt index 82da3bbfe..82da3bbfe 100755..100644 --- a/ext/spl/tests/array_022.phpt +++ b/ext/spl/tests/array_022.phpt diff --git a/ext/spl/tests/bug28822.phpt b/ext/spl/tests/bug28822.phpt index 7114edac9..7114edac9 100755..100644 --- a/ext/spl/tests/bug28822.phpt +++ b/ext/spl/tests/bug28822.phpt diff --git a/ext/spl/tests/bug31185.phpt b/ext/spl/tests/bug31185.phpt index aa410ebaa..aa410ebaa 100755..100644 --- a/ext/spl/tests/bug31185.phpt +++ b/ext/spl/tests/bug31185.phpt diff --git a/ext/spl/tests/bug31346.phpt b/ext/spl/tests/bug31346.phpt index 9b5618ec0..9b5618ec0 100755..100644 --- a/ext/spl/tests/bug31346.phpt +++ b/ext/spl/tests/bug31346.phpt diff --git a/ext/spl/tests/bug31348.phpt b/ext/spl/tests/bug31348.phpt index 047e4b223..047e4b223 100755..100644 --- a/ext/spl/tests/bug31348.phpt +++ b/ext/spl/tests/bug31348.phpt diff --git a/ext/spl/tests/bug31926.phpt b/ext/spl/tests/bug31926.phpt index 2d72df421..2d72df421 100755..100644 --- a/ext/spl/tests/bug31926.phpt +++ b/ext/spl/tests/bug31926.phpt diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt index 5a880b321..5a880b321 100755..100644 --- a/ext/spl/tests/bug32134.phpt +++ b/ext/spl/tests/bug32134.phpt diff --git a/ext/spl/tests/bug32394.phpt b/ext/spl/tests/bug32394.phpt index 8189b23f7..8189b23f7 100755..100644 --- a/ext/spl/tests/bug32394.phpt +++ b/ext/spl/tests/bug32394.phpt diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt index 121ff58ad..121ff58ad 100755..100644 --- a/ext/spl/tests/bug33136.phpt +++ b/ext/spl/tests/bug33136.phpt diff --git a/ext/spl/tests/bug36287.phpt b/ext/spl/tests/bug36287.phpt index 0c3f287d4..0c3f287d4 100755..100644 --- a/ext/spl/tests/bug36287.phpt +++ b/ext/spl/tests/bug36287.phpt diff --git a/ext/spl/tests/bug36941.phpt b/ext/spl/tests/bug36941.phpt index 528ba4a46..528ba4a46 100755..100644 --- a/ext/spl/tests/bug36941.phpt +++ b/ext/spl/tests/bug36941.phpt diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt index e66fa4d6e..e66fa4d6e 100755..100644 --- a/ext/spl/tests/bug37457.phpt +++ b/ext/spl/tests/bug37457.phpt diff --git a/ext/spl/tests/bug40442.phpt b/ext/spl/tests/bug40442.phpt index fbeb22d2b..fbeb22d2b 100755..100644 --- a/ext/spl/tests/bug40442.phpt +++ b/ext/spl/tests/bug40442.phpt diff --git a/ext/spl/tests/bug40872.phpt b/ext/spl/tests/bug40872.phpt index a48fe74fe..a48fe74fe 100755..100644 --- a/ext/spl/tests/bug40872.phpt +++ b/ext/spl/tests/bug40872.phpt diff --git a/ext/spl/tests/bug42654.phpt b/ext/spl/tests/bug42654.phpt index 20aad74b7..20aad74b7 100755..100644 --- a/ext/spl/tests/bug42654.phpt +++ b/ext/spl/tests/bug42654.phpt diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt index 5c52763cd..5c52763cd 100755..100644 --- a/ext/spl/tests/bug42703.phpt +++ b/ext/spl/tests/bug42703.phpt diff --git a/ext/spl/tests/bug49972.phpt b/ext/spl/tests/bug49972.phpt index 843c2519b..843c2519b 100755..100644 --- a/ext/spl/tests/bug49972.phpt +++ b/ext/spl/tests/bug49972.phpt diff --git a/ext/spl/tests/bug61697.phpt b/ext/spl/tests/bug61697.phpt new file mode 100644 index 000000000..d95caef97 --- /dev/null +++ b/ext/spl/tests/bug61697.phpt @@ -0,0 +1,26 @@ +--TEST-- +Bug #61697 (spl_autoload_functions returns lambda functions incorrectly) +--XFAIL-- +Bug #61697 not fixed yet +--FILE-- +<?php + +function f1($class) { echo "f1: [[$class]]\n"; } +function f2($class) { echo "f2: [[$class]]\n"; } + +spl_autoload_register('f1'); +spl_autoload_register('f2'); +spl_autoload_register(create_function('$class', 'echo "cf1: [[$class]]\n";')); +spl_autoload_register(create_function('$class', 'echo "cf2: [[$class]]\n";')); + +foreach (spl_autoload_functions() AS $func) +{ + spl_autoload_unregister($func); +} + +print_r(spl_autoload_functions()); +?> +--EXPECTF-- +Array +( +) diff --git a/ext/spl/tests/dit_001.phpt b/ext/spl/tests/dit_001.phpt index a56166def..a56166def 100755..100644 --- a/ext/spl/tests/dit_001.phpt +++ b/ext/spl/tests/dit_001.phpt diff --git a/ext/spl/tests/dit_002.phpt b/ext/spl/tests/dit_002.phpt index a2665421e..a2665421e 100755..100644 --- a/ext/spl/tests/dit_002.phpt +++ b/ext/spl/tests/dit_002.phpt diff --git a/ext/spl/tests/dit_003.phpt b/ext/spl/tests/dit_003.phpt index 4ffc2921e..4ffc2921e 100755..100644 --- a/ext/spl/tests/dit_003.phpt +++ b/ext/spl/tests/dit_003.phpt diff --git a/ext/spl/tests/fileobject_001.phpt b/ext/spl/tests/fileobject_001.phpt index 61f688d79..61f688d79 100755..100644 --- a/ext/spl/tests/fileobject_001.phpt +++ b/ext/spl/tests/fileobject_001.phpt diff --git a/ext/spl/tests/fileobject_002.phpt b/ext/spl/tests/fileobject_002.phpt index 8031e98fd..8031e98fd 100755..100644 --- a/ext/spl/tests/fileobject_002.phpt +++ b/ext/spl/tests/fileobject_002.phpt diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt index 6cc650b7b..6cc650b7b 100755..100644 --- a/ext/spl/tests/fileobject_003.phpt +++ b/ext/spl/tests/fileobject_003.phpt diff --git a/ext/spl/tests/iterator_001.phpt b/ext/spl/tests/iterator_001.phpt index 26df62e85..26df62e85 100755..100644 --- a/ext/spl/tests/iterator_001.phpt +++ b/ext/spl/tests/iterator_001.phpt diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt index 527fe6b77..527fe6b77 100755..100644 --- a/ext/spl/tests/iterator_002.phpt +++ b/ext/spl/tests/iterator_002.phpt diff --git a/ext/spl/tests/iterator_003.phpt b/ext/spl/tests/iterator_003.phpt index 11d37b303..11d37b303 100755..100644 --- a/ext/spl/tests/iterator_003.phpt +++ b/ext/spl/tests/iterator_003.phpt diff --git a/ext/spl/tests/iterator_004.phpt b/ext/spl/tests/iterator_004.phpt index e07cd32c3..e07cd32c3 100755..100644 --- a/ext/spl/tests/iterator_004.phpt +++ b/ext/spl/tests/iterator_004.phpt diff --git a/ext/spl/tests/iterator_005.phpt b/ext/spl/tests/iterator_005.phpt index 640ca9f9c..640ca9f9c 100755..100644 --- a/ext/spl/tests/iterator_005.phpt +++ b/ext/spl/tests/iterator_005.phpt diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt index 54da89cbd..54da89cbd 100755..100644 --- a/ext/spl/tests/iterator_006.phpt +++ b/ext/spl/tests/iterator_006.phpt diff --git a/ext/spl/tests/iterator_007.phpt b/ext/spl/tests/iterator_007.phpt index d26c01ef7..d26c01ef7 100755..100644 --- a/ext/spl/tests/iterator_007.phpt +++ b/ext/spl/tests/iterator_007.phpt diff --git a/ext/spl/tests/iterator_008.phpt b/ext/spl/tests/iterator_008.phpt index 04f8c0034..04f8c0034 100755..100644 --- a/ext/spl/tests/iterator_008.phpt +++ b/ext/spl/tests/iterator_008.phpt diff --git a/ext/spl/tests/iterator_009.phpt b/ext/spl/tests/iterator_009.phpt index 0bfe74ef7..0bfe74ef7 100755..100644 --- a/ext/spl/tests/iterator_009.phpt +++ b/ext/spl/tests/iterator_009.phpt diff --git a/ext/spl/tests/iterator_010.phpt b/ext/spl/tests/iterator_010.phpt index 39d1000f6..39d1000f6 100755..100644 --- a/ext/spl/tests/iterator_010.phpt +++ b/ext/spl/tests/iterator_010.phpt diff --git a/ext/spl/tests/iterator_011.phpt b/ext/spl/tests/iterator_011.phpt index fca159a20..fca159a20 100755..100644 --- a/ext/spl/tests/iterator_011.phpt +++ b/ext/spl/tests/iterator_011.phpt diff --git a/ext/spl/tests/iterator_012.phpt b/ext/spl/tests/iterator_012.phpt index 81bc02f69..81bc02f69 100755..100644 --- a/ext/spl/tests/iterator_012.phpt +++ b/ext/spl/tests/iterator_012.phpt diff --git a/ext/spl/tests/iterator_013.phpt b/ext/spl/tests/iterator_013.phpt index 119631c00..119631c00 100755..100644 --- a/ext/spl/tests/iterator_013.phpt +++ b/ext/spl/tests/iterator_013.phpt diff --git a/ext/spl/tests/iterator_014.phpt b/ext/spl/tests/iterator_014.phpt index 119fad05f..119fad05f 100755..100644 --- a/ext/spl/tests/iterator_014.phpt +++ b/ext/spl/tests/iterator_014.phpt diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt index aa30f79e1..aa30f79e1 100755..100644 --- a/ext/spl/tests/iterator_015.phpt +++ b/ext/spl/tests/iterator_015.phpt diff --git a/ext/spl/tests/iterator_016.phpt b/ext/spl/tests/iterator_016.phpt index f231c6eb3..f231c6eb3 100755..100644 --- a/ext/spl/tests/iterator_016.phpt +++ b/ext/spl/tests/iterator_016.phpt diff --git a/ext/spl/tests/iterator_017.phpt b/ext/spl/tests/iterator_017.phpt index 39d1000f6..39d1000f6 100755..100644 --- a/ext/spl/tests/iterator_017.phpt +++ b/ext/spl/tests/iterator_017.phpt diff --git a/ext/spl/tests/iterator_018.phpt b/ext/spl/tests/iterator_018.phpt index 9c234bb11..9c234bb11 100755..100644 --- a/ext/spl/tests/iterator_018.phpt +++ b/ext/spl/tests/iterator_018.phpt diff --git a/ext/spl/tests/iterator_019.phpt b/ext/spl/tests/iterator_019.phpt index 81bc02f69..81bc02f69 100755..100644 --- a/ext/spl/tests/iterator_019.phpt +++ b/ext/spl/tests/iterator_019.phpt diff --git a/ext/spl/tests/iterator_020.phpt b/ext/spl/tests/iterator_020.phpt index 119631c00..119631c00 100755..100644 --- a/ext/spl/tests/iterator_020.phpt +++ b/ext/spl/tests/iterator_020.phpt diff --git a/ext/spl/tests/iterator_021.phpt b/ext/spl/tests/iterator_021.phpt index 4f2395a8e..4f2395a8e 100755..100644 --- a/ext/spl/tests/iterator_021.phpt +++ b/ext/spl/tests/iterator_021.phpt diff --git a/ext/spl/tests/iterator_022.phpt b/ext/spl/tests/iterator_022.phpt index 8d055313a..8d055313a 100755..100644 --- a/ext/spl/tests/iterator_022.phpt +++ b/ext/spl/tests/iterator_022.phpt diff --git a/ext/spl/tests/iterator_023.phpt b/ext/spl/tests/iterator_023.phpt index 1b6b4685e..1b6b4685e 100755..100644 --- a/ext/spl/tests/iterator_023.phpt +++ b/ext/spl/tests/iterator_023.phpt diff --git a/ext/spl/tests/iterator_024.phpt b/ext/spl/tests/iterator_024.phpt index 0c7dea15b..0c7dea15b 100755..100644 --- a/ext/spl/tests/iterator_024.phpt +++ b/ext/spl/tests/iterator_024.phpt diff --git a/ext/spl/tests/iterator_025.phpt b/ext/spl/tests/iterator_025.phpt index e582b1f39..e582b1f39 100755..100644 --- a/ext/spl/tests/iterator_025.phpt +++ b/ext/spl/tests/iterator_025.phpt diff --git a/ext/spl/tests/iterator_026.phpt b/ext/spl/tests/iterator_026.phpt index 8eb77a7ba..8eb77a7ba 100755..100644 --- a/ext/spl/tests/iterator_026.phpt +++ b/ext/spl/tests/iterator_026.phpt diff --git a/ext/spl/tests/iterator_027.phpt b/ext/spl/tests/iterator_027.phpt index fd9ba70c0..fd9ba70c0 100755..100644 --- a/ext/spl/tests/iterator_027.phpt +++ b/ext/spl/tests/iterator_027.phpt diff --git a/ext/spl/tests/iterator_028.phpt b/ext/spl/tests/iterator_028.phpt index 8b53b2123..8b53b2123 100755..100644 --- a/ext/spl/tests/iterator_028.phpt +++ b/ext/spl/tests/iterator_028.phpt diff --git a/ext/spl/tests/iterator_029.phpt b/ext/spl/tests/iterator_029.phpt index e5bfde021..e5bfde021 100755..100644 --- a/ext/spl/tests/iterator_029.phpt +++ b/ext/spl/tests/iterator_029.phpt diff --git a/ext/spl/tests/iterator_030.phpt b/ext/spl/tests/iterator_030.phpt index 29d147f12..29d147f12 100755..100644 --- a/ext/spl/tests/iterator_030.phpt +++ b/ext/spl/tests/iterator_030.phpt diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt index 40342f4bb..40342f4bb 100755..100644 --- a/ext/spl/tests/iterator_031.phpt +++ b/ext/spl/tests/iterator_031.phpt diff --git a/ext/spl/tests/iterator_032.phpt b/ext/spl/tests/iterator_032.phpt index 84eb8e61f..84eb8e61f 100755..100644 --- a/ext/spl/tests/iterator_032.phpt +++ b/ext/spl/tests/iterator_032.phpt diff --git a/ext/spl/tests/iterator_033.phpt b/ext/spl/tests/iterator_033.phpt index 548759ccb..548759ccb 100755..100644 --- a/ext/spl/tests/iterator_033.phpt +++ b/ext/spl/tests/iterator_033.phpt diff --git a/ext/spl/tests/iterator_034.phpt b/ext/spl/tests/iterator_034.phpt index 3329e744b..3329e744b 100755..100644 --- a/ext/spl/tests/iterator_034.phpt +++ b/ext/spl/tests/iterator_034.phpt diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt index 9a9e66b3b..9a9e66b3b 100755..100644 --- a/ext/spl/tests/iterator_036.phpt +++ b/ext/spl/tests/iterator_036.phpt diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt index 2aa61bb03..2aa61bb03 100755..100644 --- a/ext/spl/tests/iterator_037.phpt +++ b/ext/spl/tests/iterator_037.phpt diff --git a/ext/spl/tests/iterator_038.phpt b/ext/spl/tests/iterator_038.phpt index 9b890e266..9b890e266 100755..100644 --- a/ext/spl/tests/iterator_038.phpt +++ b/ext/spl/tests/iterator_038.phpt diff --git a/ext/spl/tests/iterator_039.phpt b/ext/spl/tests/iterator_039.phpt index 17c9bc1ca..17c9bc1ca 100755..100644 --- a/ext/spl/tests/iterator_039.phpt +++ b/ext/spl/tests/iterator_039.phpt diff --git a/ext/spl/tests/iterator_040.phpt b/ext/spl/tests/iterator_040.phpt index ae00c81df..ae00c81df 100755..100644 --- a/ext/spl/tests/iterator_040.phpt +++ b/ext/spl/tests/iterator_040.phpt diff --git a/ext/spl/tests/iterator_041.phpt b/ext/spl/tests/iterator_041.phpt index e00ac6bc2..e00ac6bc2 100755..100644 --- a/ext/spl/tests/iterator_041.phpt +++ b/ext/spl/tests/iterator_041.phpt diff --git a/ext/spl/tests/iterator_041a.phpt b/ext/spl/tests/iterator_041a.phpt index ec999a5da..ec999a5da 100755..100644 --- a/ext/spl/tests/iterator_041a.phpt +++ b/ext/spl/tests/iterator_041a.phpt diff --git a/ext/spl/tests/iterator_041b.phpt b/ext/spl/tests/iterator_041b.phpt index e7ea8b800..e7ea8b800 100755..100644 --- a/ext/spl/tests/iterator_041b.phpt +++ b/ext/spl/tests/iterator_041b.phpt diff --git a/ext/spl/tests/iterator_042.phpt b/ext/spl/tests/iterator_042.phpt index 95fea2f6b..95fea2f6b 100755..100644 --- a/ext/spl/tests/iterator_042.phpt +++ b/ext/spl/tests/iterator_042.phpt diff --git a/ext/spl/tests/iterator_043.phpt b/ext/spl/tests/iterator_043.phpt index 301a593ba..301a593ba 100755..100644 --- a/ext/spl/tests/iterator_043.phpt +++ b/ext/spl/tests/iterator_043.phpt diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt index 1271ccaa6..1271ccaa6 100755..100644 --- a/ext/spl/tests/iterator_044.phpt +++ b/ext/spl/tests/iterator_044.phpt diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt index d76b2d93c..d76b2d93c 100755..100644 --- a/ext/spl/tests/iterator_045.phpt +++ b/ext/spl/tests/iterator_045.phpt diff --git a/ext/spl/tests/iterator_046.phpt b/ext/spl/tests/iterator_046.phpt index f57415a3b..f57415a3b 100755..100644 --- a/ext/spl/tests/iterator_046.phpt +++ b/ext/spl/tests/iterator_046.phpt diff --git a/ext/spl/tests/iterator_047.phpt b/ext/spl/tests/iterator_047.phpt index 548f48652..548f48652 100755..100644 --- a/ext/spl/tests/iterator_047.phpt +++ b/ext/spl/tests/iterator_047.phpt diff --git a/ext/spl/tests/iterator_048.phpt b/ext/spl/tests/iterator_048.phpt index bad4e7888..bad4e7888 100755..100644 --- a/ext/spl/tests/iterator_048.phpt +++ b/ext/spl/tests/iterator_048.phpt diff --git a/ext/spl/tests/iterator_049.phpt b/ext/spl/tests/iterator_049.phpt index b9ab2c30a..b9ab2c30a 100755..100644 --- a/ext/spl/tests/iterator_049.phpt +++ b/ext/spl/tests/iterator_049.phpt diff --git a/ext/spl/tests/iterator_049b.phpt b/ext/spl/tests/iterator_049b.phpt Binary files differindex 03c7350fa..03c7350fa 100755..100644 --- a/ext/spl/tests/iterator_049b.phpt +++ b/ext/spl/tests/iterator_049b.phpt diff --git a/ext/spl/tests/iterator_050.phpt b/ext/spl/tests/iterator_050.phpt index fed4a3b2e..fed4a3b2e 100755..100644 --- a/ext/spl/tests/iterator_050.phpt +++ b/ext/spl/tests/iterator_050.phpt diff --git a/ext/spl/tests/iterator_051.phpt b/ext/spl/tests/iterator_051.phpt index 2d198db52..2d198db52 100755..100644 --- a/ext/spl/tests/iterator_051.phpt +++ b/ext/spl/tests/iterator_051.phpt diff --git a/ext/spl/tests/iterator_052.phpt b/ext/spl/tests/iterator_052.phpt index c68bd5234..c68bd5234 100755..100644 --- a/ext/spl/tests/iterator_052.phpt +++ b/ext/spl/tests/iterator_052.phpt diff --git a/ext/spl/tests/iterator_053.phpt b/ext/spl/tests/iterator_053.phpt index 5d9c740c3..5d9c740c3 100755..100644 --- a/ext/spl/tests/iterator_053.phpt +++ b/ext/spl/tests/iterator_053.phpt diff --git a/ext/spl/tests/iterator_054.phpt b/ext/spl/tests/iterator_054.phpt index 1f1cd580c..1f1cd580c 100755..100644 --- a/ext/spl/tests/iterator_054.phpt +++ b/ext/spl/tests/iterator_054.phpt diff --git a/ext/spl/tests/iterator_055.phpt b/ext/spl/tests/iterator_055.phpt index dec68a463..dec68a463 100755..100644 --- a/ext/spl/tests/iterator_055.phpt +++ b/ext/spl/tests/iterator_055.phpt diff --git a/ext/spl/tests/iterator_068.phpt b/ext/spl/tests/iterator_068.phpt index 4845708d4..4845708d4 100755..100644 --- a/ext/spl/tests/iterator_068.phpt +++ b/ext/spl/tests/iterator_068.phpt diff --git a/ext/spl/tests/multiple_iterator_001.phpt b/ext/spl/tests/multiple_iterator_001.phpt index edd03f504..edd03f504 100755..100644 --- a/ext/spl/tests/multiple_iterator_001.phpt +++ b/ext/spl/tests/multiple_iterator_001.phpt diff --git a/ext/spl/tests/observer_001.phpt b/ext/spl/tests/observer_001.phpt index e7d72b9e2..e7d72b9e2 100755..100644 --- a/ext/spl/tests/observer_001.phpt +++ b/ext/spl/tests/observer_001.phpt diff --git a/ext/spl/tests/observer_002.phpt b/ext/spl/tests/observer_002.phpt index 5d006177f..5d006177f 100755..100644 --- a/ext/spl/tests/observer_002.phpt +++ b/ext/spl/tests/observer_002.phpt diff --git a/ext/spl/tests/observer_003.phpt b/ext/spl/tests/observer_003.phpt index 5e5da22e3..5e5da22e3 100755..100644 --- a/ext/spl/tests/observer_003.phpt +++ b/ext/spl/tests/observer_003.phpt diff --git a/ext/spl/tests/observer_004.phpt b/ext/spl/tests/observer_004.phpt index 0bc2512d8..0bc2512d8 100755..100644 --- a/ext/spl/tests/observer_004.phpt +++ b/ext/spl/tests/observer_004.phpt diff --git a/ext/spl/tests/observer_005.phpt b/ext/spl/tests/observer_005.phpt index 883602f51..883602f51 100755..100644 --- a/ext/spl/tests/observer_005.phpt +++ b/ext/spl/tests/observer_005.phpt diff --git a/ext/spl/tests/observer_006.phpt b/ext/spl/tests/observer_006.phpt index 3cd84a742..3cd84a742 100755..100644 --- a/ext/spl/tests/observer_006.phpt +++ b/ext/spl/tests/observer_006.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_001.phpt b/ext/spl/tests/recursive_tree_iterator_001.phpt index f70186cdd..f70186cdd 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_001.phpt +++ b/ext/spl/tests/recursive_tree_iterator_001.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_002.phpt b/ext/spl/tests/recursive_tree_iterator_002.phpt index 1aae288e6..1aae288e6 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_002.phpt +++ b/ext/spl/tests/recursive_tree_iterator_002.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_003.phpt b/ext/spl/tests/recursive_tree_iterator_003.phpt index 83c855394..83c855394 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_003.phpt +++ b/ext/spl/tests/recursive_tree_iterator_003.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_004.phpt b/ext/spl/tests/recursive_tree_iterator_004.phpt index ad3ba6cd0..ad3ba6cd0 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_004.phpt +++ b/ext/spl/tests/recursive_tree_iterator_004.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_005.phpt b/ext/spl/tests/recursive_tree_iterator_005.phpt index b14811fbe..b14811fbe 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_005.phpt +++ b/ext/spl/tests/recursive_tree_iterator_005.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_006.phpt b/ext/spl/tests/recursive_tree_iterator_006.phpt index 17f51b6d0..17f51b6d0 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_006.phpt +++ b/ext/spl/tests/recursive_tree_iterator_006.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_007.phpt b/ext/spl/tests/recursive_tree_iterator_007.phpt index 6a8ff8425..6a8ff8425 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_007.phpt +++ b/ext/spl/tests/recursive_tree_iterator_007.phpt diff --git a/ext/spl/tests/recursive_tree_iterator_008.phpt b/ext/spl/tests/recursive_tree_iterator_008.phpt index a0349800f..a0349800f 100755..100644 --- a/ext/spl/tests/recursive_tree_iterator_008.phpt +++ b/ext/spl/tests/recursive_tree_iterator_008.phpt diff --git a/ext/spl/tests/spl_001.phpt b/ext/spl/tests/spl_001.phpt index e101272a8..e101272a8 100755..100644 --- a/ext/spl/tests/spl_001.phpt +++ b/ext/spl/tests/spl_001.phpt diff --git a/ext/spl/tests/spl_002.phpt b/ext/spl/tests/spl_002.phpt index d8b71b20c..d8b71b20c 100755..100644 --- a/ext/spl/tests/spl_002.phpt +++ b/ext/spl/tests/spl_002.phpt diff --git a/ext/spl/tests/spl_003.phpt b/ext/spl/tests/spl_003.phpt index e92a41ae4..e92a41ae4 100755..100644 --- a/ext/spl/tests/spl_003.phpt +++ b/ext/spl/tests/spl_003.phpt diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt index 97896f815..97896f815 100755..100644 --- a/ext/spl/tests/spl_004.phpt +++ b/ext/spl/tests/spl_004.phpt diff --git a/ext/spl/tests/spl_005.phpt b/ext/spl/tests/spl_005.phpt index 219c791bb..219c791bb 100755..100644 --- a/ext/spl/tests/spl_005.phpt +++ b/ext/spl/tests/spl_005.phpt diff --git a/ext/spl/tests/spl_006.phpt b/ext/spl/tests/spl_006.phpt index 1f5f85fb6..1f5f85fb6 100755..100644 --- a/ext/spl/tests/spl_006.phpt +++ b/ext/spl/tests/spl_006.phpt diff --git a/ext/spl/tests/spl_007.phpt b/ext/spl/tests/spl_007.phpt index 6d4059d0b..6d4059d0b 100755..100644 --- a/ext/spl/tests/spl_007.phpt +++ b/ext/spl/tests/spl_007.phpt diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt index ff9d1e97d..ff9d1e97d 100755..100644 --- a/ext/spl/tests/spl_autoload_001.phpt +++ b/ext/spl/tests/spl_autoload_001.phpt diff --git a/ext/spl/tests/spl_autoload_002.phpt b/ext/spl/tests/spl_autoload_002.phpt index 2373d6dbb..2373d6dbb 100755..100644 --- a/ext/spl/tests/spl_autoload_002.phpt +++ b/ext/spl/tests/spl_autoload_002.phpt diff --git a/ext/spl/tests/spl_autoload_003.phpt b/ext/spl/tests/spl_autoload_003.phpt index 7c0bd1a02..7c0bd1a02 100755..100644 --- a/ext/spl/tests/spl_autoload_003.phpt +++ b/ext/spl/tests/spl_autoload_003.phpt diff --git a/ext/spl/tests/spl_autoload_004.phpt b/ext/spl/tests/spl_autoload_004.phpt index 1f26521b9..1f26521b9 100755..100644 --- a/ext/spl/tests/spl_autoload_004.phpt +++ b/ext/spl/tests/spl_autoload_004.phpt diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt index f4db521d5..f4db521d5 100755..100644 --- a/ext/spl/tests/spl_autoload_005.phpt +++ b/ext/spl/tests/spl_autoload_005.phpt diff --git a/ext/spl/tests/spl_autoload_006.phpt b/ext/spl/tests/spl_autoload_006.phpt index 21a6084eb..21a6084eb 100755..100644 --- a/ext/spl/tests/spl_autoload_006.phpt +++ b/ext/spl/tests/spl_autoload_006.phpt diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt index 1a81f191c..1a81f191c 100755..100644 --- a/ext/spl/tests/spl_autoload_007.phpt +++ b/ext/spl/tests/spl_autoload_007.phpt diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt index 4b1035186..4b1035186 100755..100644 --- a/ext/spl/tests/spl_autoload_008.phpt +++ b/ext/spl/tests/spl_autoload_008.phpt diff --git a/ext/spl/tests/spl_autoload_009.phpt b/ext/spl/tests/spl_autoload_009.phpt index d5e54137e..d5e54137e 100755..100644 --- a/ext/spl/tests/spl_autoload_009.phpt +++ b/ext/spl/tests/spl_autoload_009.phpt diff --git a/ext/spl/tests/spl_autoload_012.phpt b/ext/spl/tests/spl_autoload_012.phpt index e07f0e4fe..e07f0e4fe 100755..100644 --- a/ext/spl/tests/spl_autoload_012.phpt +++ b/ext/spl/tests/spl_autoload_012.phpt diff --git a/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt b/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt index cee557e33..cee557e33 100755..100644 --- a/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt +++ b/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt diff --git a/ext/spl/tests/spl_iterator_apply_error.phpt b/ext/spl/tests/spl_iterator_apply_error.phpt index 8e7cba483..8e7cba483 100755..100644 --- a/ext/spl/tests/spl_iterator_apply_error.phpt +++ b/ext/spl/tests/spl_iterator_apply_error.phpt diff --git a/ext/spl/tests/spl_iterator_apply_error_001.phpt b/ext/spl/tests/spl_iterator_apply_error_001.phpt index 54663c0da..54663c0da 100755..100644 --- a/ext/spl/tests/spl_iterator_apply_error_001.phpt +++ b/ext/spl/tests/spl_iterator_apply_error_001.phpt diff --git a/ext/spl/tests/spl_iterator_to_array_error.phpt b/ext/spl/tests/spl_iterator_to_array_error.phpt index 755ef7b99..755ef7b99 100755..100644 --- a/ext/spl/tests/spl_iterator_to_array_error.phpt +++ b/ext/spl/tests/spl_iterator_to_array_error.phpt diff --git a/ext/spl/tests/testclass.class.inc b/ext/spl/tests/testclass.class.inc index f5fe7411f..f5fe7411f 100755..100644 --- a/ext/spl/tests/testclass.class.inc +++ b/ext/spl/tests/testclass.class.inc diff --git a/ext/spl/tests/testclass.inc b/ext/spl/tests/testclass.inc index ceb24c877..ceb24c877 100755..100644 --- a/ext/spl/tests/testclass.inc +++ b/ext/spl/tests/testclass.inc diff --git a/ext/spl/tests/testclass.php.inc b/ext/spl/tests/testclass.php.inc index ceb24c877..ceb24c877 100755..100644 --- a/ext/spl/tests/testclass.php.inc +++ b/ext/spl/tests/testclass.php.inc |