diff options
Diffstat (limited to 'ext/spl')
200 files changed, 115 insertions, 37 deletions
diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc index 5871e7d63b..5871e7d63b 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 51757012ec..51757012ec 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 fcd6bb378a..fcd6bb378a 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 b09791239b..b09791239b 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 37f14b7106..37f14b7106 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 7bd9c2c597..7bd9c2c597 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 4cee203436..4cee203436 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 02ab792433..02ab792433 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 62cfa3e029..62cfa3e029 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 eaf6b77364..eaf6b77364 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 75265c1d58..75265c1d58 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 cfa3bccbbc..cfa3bccbbc 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 d5dd722536..d5dd722536 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 944a4ac5a5..944a4ac5a5 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 53c11537af..53c11537af 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 feeba7db24..feeba7db24 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 28e32b15f6..28e32b15f6 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 33258ab954..33258ab954 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 ac80e79581..ac80e79581 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 3330cc9e47..3330cc9e47 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 04d7827182..04d7827182 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 37676e0537..37676e0537 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 c5bddead78..c5bddead78 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 2ed71d53a7..2ed71d53a7 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 8747a6116e..8747a6116e 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 f26d29da56..f26d29da56 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 cc377fcc6b..cc377fcc6b 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 a9450e12a5..a9450e12a5 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 0676d435f2..0676d435f2 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 b089919a30..b089919a30 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 1eab3d69b2..1eab3d69b2 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 35fa801e78..35fa801e78 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 ffcff0ce47..ffcff0ce47 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 dfcdc05995..dfcdc05995 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 96b8f81126..96b8f81126 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 b4f66bde4d..b4f66bde4d 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 46b941f696..46b941f696 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 fa164066c7..fa164066c7 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 e2bd7cf281..e2bd7cf281 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 fb0765a81b..fb0765a81b 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 80ca5be612..11540decd9 100755..100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -312,38 +312,41 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval *object, long index; HashTable *ht = spl_array_get_hash_table(intern, 0 TSRMLS_CC); -/* We cannot get the pointer pointer so we don't allow it here for now - if (check_inherited && intern->fptr_offset_get) { - return zend_call_method_with_1_params(&object, Z_OBJCE_P(object), &intern->fptr_offset_get, "offsetGet", NULL, offset); - }*/ - if (!offset) { return &EG(uninitialized_zval_ptr); } if ((type == BP_VAR_W || type == BP_VAR_RW) && (ht->nApplyCount > 0)) { zend_error(E_WARNING, "Modification of ArrayObject during sorting is prohibited"); - return &EG(uninitialized_zval_ptr);; + return &EG(error_zval_ptr);; } switch(Z_TYPE_P(offset)) { + case IS_NULL: + Z_STRVAL_P(offset) = ""; + Z_STRLEN_P(offset) = 0; case IS_STRING: if (zend_symtable_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &retval) == FAILURE) { - if (type == BP_VAR_W || type == BP_VAR_RW) { - zval *value; - ALLOC_INIT_ZVAL(value); - zend_symtable_update(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void**)&value, sizeof(void*), NULL); - zend_symtable_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &retval); - return retval; - } else { - zend_error(E_NOTICE, "Undefined index: %s", Z_STRVAL_P(offset)); - return &EG(uninitialized_zval_ptr); + switch (type) { + case BP_VAR_R: + zend_error(E_NOTICE, "Undefined index: %s", Z_STRVAL_P(offset)); + case BP_VAR_UNSET: + case BP_VAR_IS: + retval = &EG(uninitialized_zval_ptr); + break; + case BP_VAR_RW: + zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset)); + case BP_VAR_W: { + zval *value; + ALLOC_INIT_ZVAL(value); + zend_symtable_update(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void**)&value, sizeof(void*), (void **)&retval); + } } - } else { - return retval; } - case IS_DOUBLE: + return retval; case IS_RESOURCE: + zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(offset), Z_LVAL_P(offset)); + case IS_DOUBLE: case IS_BOOL: case IS_LONG: if (offset->type == IS_DOUBLE) { @@ -352,23 +355,27 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval *object, index = Z_LVAL_P(offset); } if (zend_hash_index_find(ht, index, (void **) &retval) == FAILURE) { - if (type == BP_VAR_W || type == BP_VAR_RW) { - zval *value; - ALLOC_INIT_ZVAL(value); - zend_hash_index_update(ht, index, (void**)&value, sizeof(void*), NULL); - zend_hash_index_find(ht, index, (void **) &retval); - return retval; - } else { - zend_error(E_NOTICE, "Undefined offset: %ld", index); - return &EG(uninitialized_zval_ptr); + switch (type) { + case BP_VAR_R: + zend_error(E_NOTICE, "Undefined offset: %ld", index); + case BP_VAR_UNSET: + case BP_VAR_IS: + retval = &EG(uninitialized_zval_ptr); + break; + case BP_VAR_RW: + zend_error(E_NOTICE, "Undefined offset: %ld", index); + case BP_VAR_W: { + zval *value; + ALLOC_INIT_ZVAL(value); + zend_hash_index_update(ht, index, (void**)&value, sizeof(void*), (void **)&retval); + } } - } else { - return retval; } - break; + return retval; default: zend_error(E_WARNING, "Illegal offset type"); - return &EG(uninitialized_zval_ptr); + return (type == BP_VAR_W || type == BP_VAR_RW) ? + &EG(error_zval_ptr) : &EG(uninitialized_zval_ptr); } } /* }}} */ @@ -664,7 +671,6 @@ SPL_METHOD(Array, offsetSet) spl_array_write_dimension_ex(0, getThis(), index, value TSRMLS_CC); } /* }}} */ - void spl_array_iterator_append(zval *object, zval *append_value TSRMLS_DC) /* {{{ */ { spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); diff --git a/ext/spl/spl_array.h b/ext/spl/spl_array.h index 909f4c97dc..909f4c97dc 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 4f8edb5211..8c1810ef71 100755..100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -434,7 +434,6 @@ static spl_filesystem_object * spl_filesystem_object_create_info(spl_filesystem_ if (file_path && !use_copy) { efree(file_path); } - use_copy = 1; file_path_len = 1; file_path = "/"; #endif diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h index 96f5dd6cb7..96f5dd6cb7 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 d501f31435..d501f31435 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 db7affef80..db7affef80 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 570299a2a8..570299a2a8 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 8d3a58a30c..8d3a58a30c 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 ee8f51eb33..0aac6d3f30 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -223,10 +223,14 @@ static zend_object_value spl_fixedarray_object_new_ex(zend_class_entry *class_ty if (orig && clone_orig) { spl_fixedarray_object *other = (spl_fixedarray_object*)zend_object_store_get_object(orig TSRMLS_CC); intern->ce_get_iterator = other->ce_get_iterator; - - intern->array = emalloc(sizeof(spl_fixedarray)); - spl_fixedarray_init(intern->array, other->array->size TSRMLS_CC); - spl_fixedarray_copy(intern->array, other->array TSRMLS_CC); + if (!other->array) { + /* leave a empty object, will be dtor later by CLONE handler */ + zend_throw_exception(spl_ce_RuntimeException, "The instance wasn't initialized properly", 0 TSRMLS_CC); + } else { + intern->array = emalloc(sizeof(spl_fixedarray)); + spl_fixedarray_init(intern->array, other->array->size TSRMLS_CC); + spl_fixedarray_copy(intern->array, other->array TSRMLS_CC); + } } while (parent) { diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c index 3a3cdcc708..3a3cdcc708 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 8cf98e55b3..8cf98e55b3 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 a46b7d4e48..a46b7d4e48 100755..100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h index 525a25cc9e..525a25cc9e 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 85bbeec731..85bbeec731 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 bfee74f300..bfee74f300 100755..100644 --- a/ext/spl/spl_observer.h +++ b/ext/spl/spl_observer.h diff --git a/ext/spl/tests/array_001.phpt b/ext/spl/tests/array_001.phpt index d9fb57c4ce..d9fb57c4ce 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 55935882f8..55935882f8 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 de4ce30f91..de4ce30f91 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 dd07f29820..dd07f29820 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 d7ef15db1a..d7ef15db1a 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 49f2838f77..49f2838f77 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 7d9bf6afc1..7d9bf6afc1 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 61c7abd7c6..61c7abd7c6 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 fc0d60baa9..fc0d60baa9 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 396aa9b9e9..396aa9b9e9 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 6b331e4b51..6b331e4b51 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 0c5ad55d68..0c5ad55d68 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 2ee9724d28..2ee9724d28 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 3fda53884f..3fda53884f 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 1ac9d4f956..1ac9d4f956 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 f0bf9f4087..f0bf9f4087 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 8637c5c886..8637c5c886 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 8f3d345438..8f3d345438 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 7c68a6280e..7c68a6280e 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 d128f4de7b..d128f4de7b 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 4c6fe0df25..4c6fe0df25 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 f2ae0c87e5..f2ae0c87e5 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 82da3bbfe3..82da3bbfe3 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 7114edac9f..7114edac9f 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 aa410ebaae..aa410ebaae 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 9b5618ec0e..9b5618ec0e 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 047e4b223a..047e4b223a 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 2d72df421d..2d72df421d 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 5a880b321d..5a880b321d 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 8189b23f7a..8189b23f7a 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 121ff58ad7..121ff58ad7 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 0c3f287d4f..0c3f287d4f 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 528ba4a462..528ba4a462 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 e66fa4d6ed..e66fa4d6ed 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 fbeb22d2b3..fbeb22d2b3 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 a48fe74feb..a48fe74feb 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 20aad74b73..20aad74b73 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 5c52763cd6..5c52763cd6 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 843c2519ba..843c2519ba 100755..100644 --- a/ext/spl/tests/bug49972.phpt +++ b/ext/spl/tests/bug49972.phpt diff --git a/ext/spl/tests/bug60082.phpt b/ext/spl/tests/bug60082.phpt index 346bee7974..346bee7974 100755..100644 --- a/ext/spl/tests/bug60082.phpt +++ b/ext/spl/tests/bug60082.phpt diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt new file mode 100644 index 0000000000..7e392da9ab --- /dev/null +++ b/ext/spl/tests/bug62904.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #62904 (Crash when cloning an object which inherits SplFixedArray) +--FILE-- +<?php + +class foo extends SplFixedArray { + public function __construct($size) { + } +} + +$x = new foo(2); + +try { + $z = clone $x; +} catch (Exception $e) { + var_dump($e->getMessage()); +} +--EXPECTF-- +string(40) "The instance wasn't initialized properly" diff --git a/ext/spl/tests/bug62978.phpt b/ext/spl/tests/bug62978.phpt new file mode 100644 index 0000000000..94068d5604 --- /dev/null +++ b/ext/spl/tests/bug62978.phpt @@ -0,0 +1,50 @@ +--TEST-- +Bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables) +--FILE-- +<?php +$a = new ArrayObject(); + +$b = array(); + +$a[null]['hurr'] = 'durr'; + +var_dump($a['epic_magic']); +var_dump($b['epic_magic']); +var_dump($c['epic_magic']); // Undefined var!! + +$d = array(); +var_dump($a['epic_magic']); // more magic! +var_dump($d['epic_magic']); + +$e = 'srsly?'; +var_dump($a['epic_magic']); // srsly. +var_dump(isset($a['epic_magic'])); + +$fp = fopen(__FILE__, 'r'); +var_dump($a[$fp]); + +fclose($fp); +--EXPECTF-- +Notice: Undefined index: epic_magic in %sbug62978.php on line %d +NULL + +Notice: Undefined index: epic_magic in %sbug62978.php on line %d +NULL + +Notice: Undefined variable: c in %sbug62978.php on line %d +NULL + +Notice: Undefined index: epic_magic in %sbug62978.php on line %d +NULL + +Notice: Undefined index: epic_magic in %sbug62978.php on line %d +NULL + +Notice: Undefined index: epic_magic in %sbug62978.php on line %d +NULL +bool(false) + +Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in %sbug62978.php on line %d + +Notice: Undefined offset: %d in %sbug62978.php on line %d +NULL diff --git a/ext/spl/tests/dit_001.phpt b/ext/spl/tests/dit_001.phpt index a56166def0..a56166def0 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 a2665421e0..a2665421e0 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 4ffc2921e0..4ffc2921e0 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 61f688d79f..61f688d79f 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 8031e98fdc..8031e98fdc 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 6cc650b7b5..6cc650b7b5 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 26df62e85b..26df62e85b 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 527fe6b776..527fe6b776 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 11d37b303b..11d37b303b 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 e07cd32c39..e07cd32c39 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 640ca9f9c2..640ca9f9c2 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 54da89cbd7..54da89cbd7 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 d26c01ef79..d26c01ef79 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 04f8c00348..04f8c00348 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 0bfe74ef7f..0bfe74ef7f 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 39d1000f62..39d1000f62 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 fca159a20f..fca159a20f 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 81bc02f69c..81bc02f69c 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 119631c000..119631c000 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 119fad05fb..119fad05fb 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 aa30f79e1f..aa30f79e1f 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 f231c6eb34..f231c6eb34 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 39d1000f62..39d1000f62 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 9c234bb11d..9c234bb11d 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 81bc02f69c..81bc02f69c 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 119631c000..119631c000 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 4f2395a8e5..4f2395a8e5 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 8d055313ac..8d055313ac 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 1b6b4685ec..1b6b4685ec 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 0c7dea15bc..0c7dea15bc 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 e582b1f39e..e582b1f39e 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 1e6058246b..1e6058246b 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 fd9ba70c0f..fd9ba70c0f 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 8b53b2123a..8b53b2123a 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 e5bfde0219..e5bfde0219 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 29d147f12b..29d147f12b 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 40342f4bb4..40342f4bb4 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 84eb8e61fb..84eb8e61fb 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 548759ccbb..548759ccbb 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 3329e744bd..3329e744bd 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 9a9e66b3b3..9a9e66b3b3 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 2aa61bb03f..2aa61bb03f 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 9b890e2662..9b890e2662 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 17c9bc1ca5..17c9bc1ca5 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 ae00c81df3..ae00c81df3 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 e00ac6bc2b..e00ac6bc2b 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 ec999a5dae..ec999a5dae 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 e166f6bdce..e166f6bdce 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 95fea2f6b8..95fea2f6b8 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 301a593ba2..301a593ba2 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 6d25531175..6d25531175 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 d76b2d93ce..d76b2d93ce 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 f57415a3b2..f57415a3b2 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 e5fec4f585..e5fec4f585 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 bad4e7888a..bad4e7888a 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 b9ab2c30ac..b9ab2c30ac 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 03c7350fa2..03c7350fa2 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 63d8fbfa9a..63d8fbfa9a 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 2d198db520..2d198db520 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 a0cbdd8f73..a0cbdd8f73 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 5d9c740c31..5d9c740c31 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 91266c9571..91266c9571 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 dec68a463b..dec68a463b 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 4845708d43..4845708d43 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 edd03f5040..edd03f5040 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 e7d72b9e24..e7d72b9e24 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 5d006177f2..5d006177f2 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 5e5da22e38..5e5da22e38 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 0bc2512d80..0bc2512d80 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 883602f51d..883602f51d 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 3cd84a742f..3cd84a742f 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 f70186cdd8..f70186cdd8 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 1aae288e63..1aae288e63 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 83c8553942..83c8553942 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 ad3ba6cd0a..ad3ba6cd0a 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 b14811fbe8..b14811fbe8 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 17f51b6d0c..17f51b6d0c 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 6a8ff8425a..6a8ff8425a 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 a0349800fb..a0349800fb 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 e101272a84..e101272a84 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 d8b71b20cf..d8b71b20cf 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 e92a41ae46..e92a41ae46 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 bea5695846..bea5695846 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 219c791bbb..219c791bbb 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 1f5f85fb6d..1f5f85fb6d 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 6d4059d0b5..6d4059d0b5 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 ff9d1e97d9..ff9d1e97d9 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 2373d6dbbc..2373d6dbbc 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 7c0bd1a021..7c0bd1a021 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 1f26521b90..1f26521b90 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 f4db521d52..f4db521d52 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 21a6084eb4..21a6084eb4 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 1a81f191c7..1a81f191c7 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 4b10351866..4b10351866 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 d5e54137eb..d5e54137eb 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 e07f0e4fe5..e07f0e4fe5 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 cee557e330..cee557e330 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 8e7cba483a..8e7cba483a 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 54663c0da8..54663c0da8 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 755ef7b990..755ef7b990 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 f5fe7411fa..f5fe7411fa 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 ceb24c877c..ceb24c877c 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 ceb24c877c..ceb24c877c 100755..100644 --- a/ext/spl/tests/testclass.php.inc +++ b/ext/spl/tests/testclass.php.inc |