diff options
Diffstat (limited to 'ext/spl/tests')
136 files changed, 50 insertions, 151 deletions
diff --git a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt index 216a40bd6a..6a05aa0aa2 100644 --- a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt +++ b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt @@ -40,7 +40,6 @@ try { } catch(Exception $e) { echo $e->getMessage() . "\n"; } - --EXPECT-- CallbackFilterIterator::__construct() expects exactly 2 parameters, 0 given Argument 1 passed to CallbackFilterIterator::__construct() must implement interface Iterator, null given diff --git a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt index d0753fc33e..cf96425892 100644 --- a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt +++ b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt @@ -12,4 +12,4 @@ Fatal error: Uncaught RuntimeException: Directory name must not be empty. in %s: Stack trace: #0 %s(%d): DirectoryIterator->__construct('') #1 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt index 7398d4b9d2..6aac20b721 100644 --- a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt +++ b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt @@ -54,4 +54,3 @@ array(5) { [4]=> string(3) "txt" } - diff --git a/ext/spl/tests/DirectoryIterator_getInode_error.phpt b/ext/spl/tests/DirectoryIterator_getInode_error.phpt index 570bb21fda..fd89ecd1ca 100644 --- a/ext/spl/tests/DirectoryIterator_getInode_error.phpt +++ b/ext/spl/tests/DirectoryIterator_getInode_error.phpt @@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms $fileInfo = new SplFileInfo('not_existing'); var_dump($fileInfo->getInode()); ?> - --EXPECTF-- Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for %s in %s Stack trace: diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt index f6bc266cb1..4d8c1394b6 100644 --- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt +++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt @@ -41,7 +41,6 @@ function rrmdir($dir) { $targetDir = __DIR__.DIRECTORY_SEPARATOR . "depth01"; rrmdir($targetDir); ?> - --EXPECTF-- depth1 depth1 diff --git a/ext/spl/tests/SplArray_fromArray.phpt b/ext/spl/tests/SplArray_fromArray.phpt index 1144f5f8dc..143d2755a8 100644 --- a/ext/spl/tests/SplArray_fromArray.phpt +++ b/ext/spl/tests/SplArray_fromArray.phpt @@ -14,4 +14,4 @@ try { } ?> --EXPECT-- -integer overflow detected
\ No newline at end of file +integer overflow detected diff --git a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt index 12cfe40008..4af0d0b704 100644 --- a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt @@ -8,4 +8,3 @@ var_dump($dll->add()); --EXPECTF-- Warning: SplDoublyLinkedList::add() expects exactly 2 parameters, 0 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt index c9c319316f..ac87bf1979 100644 --- a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt @@ -8,4 +8,3 @@ var_dump($dll->add(2)); --EXPECTF-- Warning: SplDoublyLinkedList::add() expects exactly 2 parameters, 1 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt index 60203eb4a0..463f1a104d 100644 --- a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt @@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2); $dll->count(new SplDoublyLinkedList(2)); ?> --EXPECTF-- -Warning: SplDoublyLinkedList::count() expects exactly 0 parameters, 1 given in %s on line %d
\ No newline at end of file +Warning: SplDoublyLinkedList::count() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt index 558504b38b..4f80525f75 100644 --- a/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt @@ -10,4 +10,4 @@ var_dump($list->current()); ?> --EXPECT-- -NULL
\ No newline at end of file +NULL diff --git a/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt b/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt index cb43bee1ce..b9810fc214 100644 --- a/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt @@ -9,4 +9,3 @@ $list->getIteratorMode(24); ?> --EXPECTF-- Warning: SplDoublyLinkedList::getIteratorMode() expects exactly 0 parameters, 1 given in %s on line %d - diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt index a05ba68f7a..18456244bd 100644 --- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt @@ -11,4 +11,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) ?> --EXPECTF-- Warning: SplDoublyLinkedList::isEmpty() expects exactly 0 parameters, %d given in %s -NULL
\ No newline at end of file +NULL diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt index 5e3d8e9ee2..c88a72a25c 100644 --- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt @@ -17,4 +17,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) ?> --EXPECTF-- Warning: SplDoublyLinkedList::isEmpty() expects exactly 0 parameters, %d given in %s -NULL
\ No newline at end of file +NULL diff --git a/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt b/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt index 86a84567a8..faa009daf4 100644 --- a/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt @@ -20,4 +20,4 @@ while ($tmp = $list->current()) { } ?> --EXPECT-- -foo
\ No newline at end of file +foo diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt index 36c47fef2e..d776d69223 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt @@ -11,4 +11,4 @@ $get = $array->offsetGet(); ?> --EXPECTF-- -Warning: SplDoublyLinkedList::offsetGet() expects exactly 1 parameter, 0 given in %s on line %d
\ No newline at end of file +Warning: SplDoublyLinkedList::offsetGet() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt index b2bc444550..b6debb109b 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt @@ -15,4 +15,4 @@ Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s Stack trace: #0 %s #1 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt index a387439d16..43ce18c5c5 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt @@ -15,4 +15,4 @@ Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s Stack trace: #0 %s #1 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt index 687fcad78c..2512e23e78 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt @@ -1,9 +1,7 @@ --TEST-- Doubly Linked List - offsetUnset > number elements - --CREDITS-- PHPNW Test Fest 2009 - Mat Griffin - --FILE-- <?php $ll = new SplDoublyLinkedList(); diff --git a/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt b/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt index 11ab343dbe..a3df71bc71 100644 --- a/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt @@ -11,4 +11,4 @@ $get = $array->pop( 'param' ); ?> --EXPECTF-- -Warning: SplDoublyLinkedList::pop() expects exactly 0 parameters, 1 given in %s on line %d
\ No newline at end of file +Warning: SplDoublyLinkedList::pop() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt index 057751c2eb..26fb3a9b8d 100644 --- a/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt @@ -10,4 +10,3 @@ var_dump($dll->push()); --EXPECTF-- Warning: SplDoublyLinkedList::push() expects exactly 1 parameter, 0 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt index 6aba866669..58ad3944ba 100644 --- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt @@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2); $dll->setIteratorMode(new SplDoublyLinkedList(2)); ?> --EXPECTF-- -Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be integer, object given in %s on line %d
\ No newline at end of file +Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be integer, object given in %s on line %d diff --git a/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt index 18afa034bb..adc631407c 100644 --- a/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt @@ -10,4 +10,3 @@ var_dump($dll->unshift()); --EXPECTF-- Warning: SplDoublyLinkedList::unshift() expects exactly 1 parameter, 0 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplFileInfo_getGroup_error.phpt b/ext/spl/tests/SplFileInfo_getGroup_error.phpt index 79492e0e9c..60dea49a10 100644 --- a/ext/spl/tests/SplFileInfo_getGroup_error.phpt +++ b/ext/spl/tests/SplFileInfo_getGroup_error.phpt @@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms $fileInfo = new SplFileInfo('not_existing'); var_dump($fileInfo->getGroup()); ?> - --EXPECTF-- Fatal error: Uncaught RuntimeException: SplFileInfo::getGroup(): stat failed for not_existing in %s Stack trace: diff --git a/ext/spl/tests/SplFileInfo_getInode_error.phpt b/ext/spl/tests/SplFileInfo_getInode_error.phpt index c2b9803735..3bee5a982b 100644 --- a/ext/spl/tests/SplFileInfo_getInode_error.phpt +++ b/ext/spl/tests/SplFileInfo_getInode_error.phpt @@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms $fileInfo = new SplFileInfo('not_existing'); var_dump($fileInfo->getInode()); ?> - --EXPECTF-- Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for not_existing in %s Stack trace: diff --git a/ext/spl/tests/SplFileInfo_getOwner_error.phpt b/ext/spl/tests/SplFileInfo_getOwner_error.phpt index 073744aa00..d160b74298 100644 --- a/ext/spl/tests/SplFileInfo_getOwner_error.phpt +++ b/ext/spl/tests/SplFileInfo_getOwner_error.phpt @@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms $fileInfo = new SplFileInfo('not_existing'); var_dump($fileInfo->getOwner()); ?> - --EXPECTF-- Fatal error: Uncaught RuntimeException: SplFileInfo::getOwner(): stat failed for not_existing in %s Stack trace: diff --git a/ext/spl/tests/SplFileInfo_getPerms_error.phpt b/ext/spl/tests/SplFileInfo_getPerms_error.phpt index 4b70c2635b..632a053345 100644 --- a/ext/spl/tests/SplFileInfo_getPerms_error.phpt +++ b/ext/spl/tests/SplFileInfo_getPerms_error.phpt @@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms $fileInfo = new SplFileInfo('not_existing'); var_dump($fileInfo->getPerms() == 0100557); ?> - --EXPECTF-- Fatal error: Uncaught RuntimeException: SplFileInfo::getPerms(): stat failed for %s in %s Stack trace: diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt index f5583a8195..879edefddf 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt @@ -823,4 +823,3 @@ bool(false) string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt index 57f5681517..d23808b5ab 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt @@ -324,4 +324,3 @@ bool(false) string(%d) " " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt index ede8e59413..ab78d21b80 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt @@ -823,4 +823,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt index c4bc9f112d..b530cf61cf 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt @@ -824,4 +824,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt index 4b9e930c7c..002a7075a6 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt @@ -823,4 +823,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt index 842bb563d1..1f177df19f 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt @@ -826,4 +826,3 @@ bool(false) string(%d) "&""""&:&"&:,:":&,&:,,,, " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt index 0f9b8ce366..d42b455820 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt @@ -826,4 +826,3 @@ bool(false) string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& " Done - diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt index 64f32187ac..f7cbd72b76 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt @@ -826,4 +826,3 @@ bool(false) string(%d) "+&""""&:&"&:,:":&,&:,,,,+ " Done - diff --git a/ext/spl/tests/SplFileObject_seek_error_001.phpt b/ext/spl/tests/SplFileObject_seek_error_001.phpt index bcf44b098e..4de5bcdd4d 100644 --- a/ext/spl/tests/SplFileObject_seek_error_001.phpt +++ b/ext/spl/tests/SplFileObject_seek_error_001.phpt @@ -12,7 +12,6 @@ try { } ?> --EXPECTF-- - Warning: SplFileObject::seek() expects exactly 1 parameter, 2 given in %s Warning: SplFileObject::seek() expects exactly 1 parameter, 0 given in %s diff --git a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt index b2630606e8..c7f4710868 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt @@ -27,4 +27,3 @@ unlink('csv_control_data.csv'); groene appelen : 10 gele bananen : 20 rode kersen : 30 - diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt index f582a4a894..384fed5d23 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt @@ -21,4 +21,3 @@ unlink('csv_control_data.csv'); ?> --EXPECTF-- Warning: SplFileObject::setCsvControl(): delimiter must be a character in %s on line %d - diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt index bcfd9c4dd6..6452212ee7 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt @@ -21,4 +21,3 @@ unlink('csv_control_data.csv'); ?> --EXPECTF-- Warning: SplFileObject::setCsvControl(): enclosure must be a character in %s on line %d - diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt index 8b1f54d5a4..927172a8dc 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt @@ -23,4 +23,3 @@ unlink('csv_control_data.csv'); ?> --EXPECTF-- Warning: SplFileObject::setCsvControl(): escape must be a character in %s on line %d - diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt index 7aaf8a3fe6..c6da6b3d48 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt @@ -27,4 +27,3 @@ unlink('csv_control_data.csv'); groene appelen : 10 gele bananen : 20 rode kersen : 30 - diff --git a/ext/spl/tests/SplFixedArray__construct_param_float.phpt b/ext/spl/tests/SplFixedArray__construct_param_float.phpt index 670a1095eb..f570289e6c 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_float.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_float.phpt @@ -11,4 +11,4 @@ echo $array->getSize(); ?> --EXPECT-- -3
\ No newline at end of file +3 diff --git a/ext/spl/tests/SplFixedArray__construct_param_null.phpt b/ext/spl/tests/SplFixedArray__construct_param_null.phpt index 3b1543d4dc..8e69937f38 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_null.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_null.phpt @@ -13,4 +13,4 @@ print_r( $array ); --EXPECTF-- SplFixedArray Object ( -)
\ No newline at end of file +) diff --git a/ext/spl/tests/SplFixedArray_count_checkParams.phpt b/ext/spl/tests/SplFixedArray_count_checkParams.phpt index 5cbe2e80ce..5cb12feee7 100644 --- a/ext/spl/tests/SplFixedArray_count_checkParams.phpt +++ b/ext/spl/tests/SplFixedArray_count_checkParams.phpt @@ -13,4 +13,3 @@ echo $ar->count(3); ?> --EXPECTF-- Warning: SplFixedArray::count() expects exactly 0 parameters, 1 given in %s on line %d - diff --git a/ext/spl/tests/SplFixedArray_count_param_int.phpt b/ext/spl/tests/SplFixedArray_count_param_int.phpt index 108bb2db69..0cb4d06fdd 100644 --- a/ext/spl/tests/SplFixedArray_count_param_int.phpt +++ b/ext/spl/tests/SplFixedArray_count_param_int.phpt @@ -8,4 +8,4 @@ $array = new SplFixedArray(5); echo $array->count(3); ?> --EXPECTF-- -Warning: SplFixedArray::count() expects exactly 0 parameters, 1 given in %s on line %d
\ No newline at end of file +Warning: SplFixedArray::count() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt b/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt index 80d966997b..21c5ce7c71 100644 --- a/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt +++ b/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt @@ -7,4 +7,4 @@ Philip Norton philipnorton42@gmail.com $array = SplFixedArray::fromArray(true); ?> --EXPECTF-- -Warning: SplFixedArray::fromArray() expects parameter 1 to be array, boolean given in %s on line %d
\ No newline at end of file +Warning: SplFixedArray::fromArray() expects parameter 1 to be array, boolean given in %s on line %d diff --git a/ext/spl/tests/SplFixedArray_key_setsize.phpt b/ext/spl/tests/SplFixedArray_key_setsize.phpt index 97e48115fb..091c4650e2 100644 --- a/ext/spl/tests/SplFixedArray_key_setsize.phpt +++ b/ext/spl/tests/SplFixedArray_key_setsize.phpt @@ -17,4 +17,4 @@ foreach ( $array as $value ) { ?> --EXPECT-- -0123
\ No newline at end of file +0123 diff --git a/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt b/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt index a460747608..80df45120f 100644 --- a/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt +++ b/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt @@ -19,4 +19,4 @@ object(SplFixedArray)#1 (2) { int(1) [1]=> int(1) -}
\ No newline at end of file +} diff --git a/ext/spl/tests/SplFixedArray_setsize_grow.phpt b/ext/spl/tests/SplFixedArray_setsize_grow.phpt index 418d1ac37c..317059c152 100644 --- a/ext/spl/tests/SplFixedArray_setsize_grow.phpt +++ b/ext/spl/tests/SplFixedArray_setsize_grow.phpt @@ -27,4 +27,4 @@ SplFixedArray Object [1] => Value 2 [2] => Value 3 [3] => Value 4 -)
\ No newline at end of file +) diff --git a/ext/spl/tests/SplHeap_count_invalid_parameter.phpt b/ext/spl/tests/SplHeap_count_invalid_parameter.phpt index 727790eabd..e8b122ec10 100644 --- a/ext/spl/tests/SplHeap_count_invalid_parameter.phpt +++ b/ext/spl/tests/SplHeap_count_invalid_parameter.phpt @@ -44,4 +44,3 @@ NULL Warning: SplHeap::count() expects exactly 0 parameters, 1 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt b/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt index ba03976396..d3c9f76589 100644 --- a/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt +++ b/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt @@ -44,4 +44,3 @@ NULL Warning: SplHeap::extract() expects exactly 0 parameters, 1 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt b/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt index 86c6b6370e..f2bec5a66f 100644 --- a/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt +++ b/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt @@ -13,4 +13,3 @@ var_dump($h->insert()); --EXPECTF-- Warning: SplHeap::insert() expects exactly 1 parameter, 0 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplHeap_isEmpty.phpt b/ext/spl/tests/SplHeap_isEmpty.phpt index e179dbc8ec..e31c021b91 100644 --- a/ext/spl/tests/SplHeap_isEmpty.phpt +++ b/ext/spl/tests/SplHeap_isEmpty.phpt @@ -12,4 +12,3 @@ var_dump($h->isEmpty()); ?> --EXPECTF-- bool(true) - diff --git a/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt b/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt index 021aff423f..f98a69cadf 100644 --- a/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt +++ b/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt @@ -44,4 +44,3 @@ NULL Warning: SplHeap::isEmpty() expects exactly 0 parameters, 1 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt index 25d472c30f..4a06b2574e 100644 --- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt @@ -40,4 +40,3 @@ NULL Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, null given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt index d984429b09..dcb954b911 100644 --- a/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt @@ -17,4 +17,3 @@ NULL Warning: SplObjectStorage::attach() expects at most 2 parameters, 3 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt index 9942ff3fd1..fc5965212f 100644 --- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt @@ -40,4 +40,3 @@ NULL Warning: SplObjectStorage::contains() expects parameter 1 to be object, null given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt b/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt index 65fa69147a..4807f28c0b 100644 --- a/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt +++ b/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt @@ -12,4 +12,3 @@ var_dump($s->current()); ?> --EXPECT-- NULL - diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt index fa75a07368..be996b8d53 100644 --- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt @@ -40,4 +40,3 @@ NULL Warning: SplObjectStorage::detach() expects parameter 1 to be object, null given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt b/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt index e6c4de88c1..8ea88ddbd3 100644 --- a/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt +++ b/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt @@ -12,4 +12,3 @@ var_dump($s->getInfo()); ?> --EXPECT-- NULL - diff --git a/ext/spl/tests/SplObjectStorage_offsetGet.phpt b/ext/spl/tests/SplObjectStorage_offsetGet.phpt index e73f6b1bd6..676cbf2226 100644 --- a/ext/spl/tests/SplObjectStorage_offsetGet.phpt +++ b/ext/spl/tests/SplObjectStorage_offsetGet.phpt @@ -14,4 +14,3 @@ echo $s->offsetGet($o1); ?> --EXPECT-- some_value - diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt index 374d3d11fd..577b43a13a 100644 --- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt @@ -42,4 +42,3 @@ NULL Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, null given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt index 72b032c4ad..fa2c7aabe9 100644 --- a/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt +++ b/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt @@ -17,4 +17,3 @@ try { ?> --EXPECT-- Object not found - diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt index 69d35a1a22..b0b0a19ff1 100644 --- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt @@ -41,4 +41,3 @@ NULL Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, null given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt index 2a66f1eae8..ce5de00cb2 100644 --- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt @@ -40,4 +40,3 @@ NULL Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, null given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt b/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt index c8c3cd1030..e074951c9e 100644 --- a/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt +++ b/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt @@ -12,4 +12,3 @@ var_dump($s->setInfo('some_value')); ?> --EXPECT-- NULL - diff --git a/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt index 52f8f9b8e6..939fd5d52d 100644 --- a/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt +++ b/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt @@ -13,4 +13,3 @@ var_dump($s->setInfo()); --EXPECTF-- Warning: SplObjectStorage::setInfo() expects exactly 1 parameter, 0 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt index c8254e74c6..8eef31382d 100644 --- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt +++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt @@ -24,4 +24,3 @@ NULL Warning: SplObjectStorage::unserialize() expects parameter 1 to be string, object given in %s on line %d NULL - diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt index be2bb331b4..8ea0b6656e 100644 --- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt +++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt @@ -31,4 +31,3 @@ Error at offset %d of %d bytes Error at offset %d of %d bytes Error at offset %d of %d bytes Error at offset %d of %d bytes - diff --git a/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt b/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt index e96a82a7a1..daf415049c 100644 --- a/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt +++ b/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt @@ -17,7 +17,6 @@ echo $s."\n"; $so1 = unserialize($s); var_dump($so1); - --EXPECTF-- C:16:"SplObjectStorage":76:{x:i:2;O:8:"stdClass":1:{s:1:"a";O:8:"stdClass":0:{}},i:1;;r:4;,i:2;;m:a:0:{}} object(SplObjectStorage)#4 (1) { @@ -44,4 +43,3 @@ object(SplObjectStorage)#4 (1) { } } } - diff --git a/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt b/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt index 7dda782b93..79b75ae4a0 100644 --- a/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt +++ b/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt @@ -44,4 +44,3 @@ NULL Warning: SplPriorityQueue::extract() expects exactly 0 parameters, 1 given in %s on line %d NULL - diff --git a/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt b/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt index 7d7b589356..08314fd74c 100644 --- a/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt +++ b/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt @@ -13,4 +13,3 @@ var_dump($h->insert(NULL)); --EXPECTF-- Warning: SplPriorityQueue::insert() expects exactly 2 parameters, 1 given in %s on line %d NULL - diff --git a/ext/spl/tests/arrayObject_count_basic1.phpt b/ext/spl/tests/arrayObject_count_basic1.phpt index b0643d5754..41e1527f93 100644 --- a/ext/spl/tests/arrayObject_count_basic1.phpt +++ b/ext/spl/tests/arrayObject_count_basic1.phpt @@ -81,4 +81,4 @@ int(99) int(1) Warning: ArrayIterator::count() expects exactly 0 parameters, 1 given in %s on line %d -NULL
\ No newline at end of file +NULL diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt index c7f1b3a7af..1f037e9073 100644 --- a/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt +++ b/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt @@ -94,4 +94,4 @@ object(ArrayObject)#%d (1) { } } } -}
\ No newline at end of file +} diff --git a/ext/spl/tests/arrayObject_getFlags_basic1.phpt b/ext/spl/tests/arrayObject_getFlags_basic1.phpt index b078c51ab2..b49aad72d3 100644 --- a/ext/spl/tests/arrayObject_getFlags_basic1.phpt +++ b/ext/spl/tests/arrayObject_getFlags_basic1.phpt @@ -22,4 +22,4 @@ int(0) int(1) int(2) int(3) -int(3)
\ No newline at end of file +int(3) diff --git a/ext/spl/tests/arrayObject_getFlags_basic2.phpt b/ext/spl/tests/arrayObject_getFlags_basic2.phpt index f7d56eaf88..c2347e8950 100644 --- a/ext/spl/tests/arrayObject_getFlags_basic2.phpt +++ b/ext/spl/tests/arrayObject_getFlags_basic2.phpt @@ -21,4 +21,4 @@ int(3) int(3) int(3) int(3) -int(0)
\ No newline at end of file +int(0) diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt index abf292f5e7..00e923920a 100644 --- a/ext/spl/tests/arrayObject_natsort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt @@ -54,4 +54,3 @@ object(ArrayObject)#2 (1) { } } ===DONE=== - diff --git a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt index 1953643c84..ffb887a04c 100644 --- a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt +++ b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt @@ -7,4 +7,4 @@ var_dump($ao->offsetExists('foo')); ?> --EXPECTF-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt index 6533819b68..3aad7bf6f7 100644 --- a/ext/spl/tests/array_013.phpt +++ b/ext/spl/tests/array_013.phpt @@ -80,4 +80,4 @@ Fatal error: Uncaught Error: Cannot append properties to objects, use ArrayItera Stack trace: #0 %s(%d): ArrayIterator->append('three') #1 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/ext/spl/tests/bug44144.phpt b/ext/spl/tests/bug44144.phpt index 2933d2f220..61b45d40ab 100644 --- a/ext/spl/tests/bug44144.phpt +++ b/ext/spl/tests/bug44144.phpt @@ -23,5 +23,3 @@ array(1) { string(15) "nonstaticMethod" } } - - diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt index 1638000f09..e2a7b905d5 100644 --- a/ext/spl/tests/bug45622.phpt +++ b/ext/spl/tests/bug45622.phpt @@ -30,7 +30,6 @@ var_dump(isset($ao->p)); var_dump($ao->p); ?> --EXPECTF-- - --> Access the real property: bool(true) string(15) "object property" @@ -48,4 +47,3 @@ NULL --> Re-add the real property: bool(true) string(15) "object property" - diff --git a/ext/spl/tests/bug45622b.phpt b/ext/spl/tests/bug45622b.phpt index 879d610301..bf0ab8242e 100644 --- a/ext/spl/tests/bug45622b.phpt +++ b/ext/spl/tests/bug45622b.phpt @@ -30,4 +30,4 @@ Doesn't trigger __set. Doesn't trigger __unset. Notice: Undefined index: prop3 in %s on line 17 -Shouldn't trigger __isset.
\ No newline at end of file +Shouldn't trigger __isset. diff --git a/ext/spl/tests/bug48361.phpt b/ext/spl/tests/bug48361.phpt index 44b05abba1..61c62c7b3f 100644 --- a/ext/spl/tests/bug48361.phpt +++ b/ext/spl/tests/bug48361.phpt @@ -11,4 +11,3 @@ var_dump($info->getPathInfo()->getRealPath()); string(%d) "%stests%sbug48361.php" string(%d) "%stests" ===DONE=== - diff --git a/ext/spl/tests/bug52861.phpt b/ext/spl/tests/bug52861.phpt index 30a3261c4e..1213a1e1bc 100644 --- a/ext/spl/tests/bug52861.phpt +++ b/ext/spl/tests/bug52861.phpt @@ -19,4 +19,3 @@ Array ) ) - diff --git a/ext/spl/tests/bug53144.phpt b/ext/spl/tests/bug53144.phpt index 7cf179b3eb..8a2b2bb6b7 100644 --- a/ext/spl/tests/bug53144.phpt +++ b/ext/spl/tests/bug53144.phpt @@ -17,4 +17,4 @@ var_dump(count($b)); ?> --EXPECTF-- int(2) -int(0)
\ No newline at end of file +int(0) diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt index c0119c4360..b15a3723d4 100644 --- a/ext/spl/tests/bug54291.phpt +++ b/ext/spl/tests/bug54291.phpt @@ -10,4 +10,3 @@ Stack trace: #0 %s(%d): DirectoryIterator->__construct('\x00/abc') #1 {main} thrown in %s on line %d - diff --git a/ext/spl/tests/bug54304.phpt b/ext/spl/tests/bug54304.phpt index 32cbe486a0..143c26e153 100644 --- a/ext/spl/tests/bug54304.phpt +++ b/ext/spl/tests/bug54304.phpt @@ -23,4 +23,3 @@ int(42) string(5) "test3" string(2) "42" int(42) - diff --git a/ext/spl/tests/bug54384.phpt b/ext/spl/tests/bug54384.phpt index a1ce7edff3..a9dae2e736 100644 --- a/ext/spl/tests/bug54384.phpt +++ b/ext/spl/tests/bug54384.phpt @@ -152,7 +152,6 @@ foreach ($o as $a) { echo $a,"\n"; } } ); - --EXPECT-- IteratorIterator... exception (expected) FilterIterator... exception (expected) diff --git a/ext/spl/tests/bug55701.phpt b/ext/spl/tests/bug55701.phpt index 7d4e832d9b..28713700d1 100644 --- a/ext/spl/tests/bug55701.phpt +++ b/ext/spl/tests/bug55701.phpt @@ -293,9 +293,6 @@ testChildClass( function() { $o = new SplTempFileObjectChild(); $o->count(); } ); - - - --EXPECT-- ->count()... ran normally (expected) ->rewind()... ran normally (expected) diff --git a/ext/spl/tests/bug61347.phpt b/ext/spl/tests/bug61347.phpt index cb091858ae..f893b24527 100644 --- a/ext/spl/tests/bug61347.phpt +++ b/ext/spl/tests/bug61347.phpt @@ -22,8 +22,6 @@ var_dump(isset($b[37])); //true var_dump(isset($b['no_exists'])); //false var_dump(empty($b['b'])); //true var_dump(empty($b[37])); //true - - --EXPECT-- bool(false) bool(false) diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt index ae9151483a..776a08e756 100644 --- a/ext/spl/tests/bug62904.phpt +++ b/ext/spl/tests/bug62904.phpt @@ -12,7 +12,5 @@ $x = new foo(2); $z = clone $x; echo "No crash."; - --EXPECTF-- No crash. - diff --git a/ext/spl/tests/bug64023.phpt b/ext/spl/tests/bug64023.phpt index 2c177f9512..cb98445279 100644 --- a/ext/spl/tests/bug64023.phpt +++ b/ext/spl/tests/bug64023.phpt @@ -14,7 +14,6 @@ echo $a, $a->__toString(), $a->__toString() . '', "\n"; // Does not work - outputs parent::__toString() echo $a . '', "\n"; - --EXPECT-- -expected- -expected- -expected- -expected- diff --git a/ext/spl/tests/bug64228.phpt b/ext/spl/tests/bug64228.phpt index 3f30dd2b23..fd7b1b628b 100644 --- a/ext/spl/tests/bug64228.phpt +++ b/ext/spl/tests/bug64228.phpt @@ -22,4 +22,3 @@ Array [0] => . [1] => .. ) - diff --git a/ext/spl/tests/bug66702.phpt b/ext/spl/tests/bug66702.phpt index fedfc869a8..b6321b8679 100644 --- a/ext/spl/tests/bug66702.phpt +++ b/ext/spl/tests/bug66702.phpt @@ -17,7 +17,6 @@ $it2 = new \RegexIterator($it, "/^ba/", \RegexIterator::MATCH, \RegexIterator::U print_r(iterator_to_array($it2)); $it2 = new \RegexIterator($it, "/^ba/", \RegexIterator::MATCH, \RegexIterator::USE_KEY | \RegexIterator::INVERT_MATCH); print_r(iterator_to_array($it2)); - --EXPECTF-- Array ( @@ -37,4 +36,3 @@ Array ( [foo] => 1 ) - diff --git a/ext/spl/tests/bug68128.phpt b/ext/spl/tests/bug68128.phpt index ff41dd4931..5ac7f8b2fb 100644 --- a/ext/spl/tests/bug68128.phpt +++ b/ext/spl/tests/bug68128.phpt @@ -88,4 +88,3 @@ Array ) ) - diff --git a/ext/spl/tests/bug70068.phpt b/ext/spl/tests/bug70068.phpt index 96b2fa808f..dc949da8fa 100644 --- a/ext/spl/tests/bug70068.phpt +++ b/ext/spl/tests/bug70068.phpt @@ -11,4 +11,4 @@ $a = unserialize('a:3:{i:0;C:11:"ArrayObject":20:{x:i:0;r:3;;m:a:0:{};}i:1;d:11; OK --EXPECT-- Error at offset 10 of 20 bytes -OK
\ No newline at end of file +OK diff --git a/ext/spl/tests/bug70366.phpt b/ext/spl/tests/bug70366.phpt index c9aa584ae2..da4cc2d389 100644 --- a/ext/spl/tests/bug70366.phpt +++ b/ext/spl/tests/bug70366.phpt @@ -51,4 +51,4 @@ array(5) { } [4]=> string(24) "%s" -}
\ No newline at end of file +} diff --git a/ext/spl/tests/bug70573.phpt b/ext/spl/tests/bug70573.phpt index b93e48876d..add2ca9a94 100644 --- a/ext/spl/tests/bug70573.phpt +++ b/ext/spl/tests/bug70573.phpt @@ -11,5 +11,3 @@ echo "ok\n"; ?> --EXPECT-- ok - - diff --git a/ext/spl/tests/bug70868.phpt b/ext/spl/tests/bug70868.phpt index d3dd76354a..3ce97bc155 100644 --- a/ext/spl/tests/bug70868.phpt +++ b/ext/spl/tests/bug70868.phpt @@ -25,7 +25,6 @@ echo "Done", PHP_EOL; ?> --EXPECTF-- - string(6) "A.phpt" string(6) "B.phpt" string(6) "C.phpt" diff --git a/ext/spl/tests/bug71735.phpt b/ext/spl/tests/bug71735.phpt index 92568028c4..1134b5d6dd 100644 --- a/ext/spl/tests/bug71735.phpt +++ b/ext/spl/tests/bug71735.phpt @@ -12,4 +12,4 @@ $var_1->offsetSet(100,new DateTime('2000-01-01')); ===DONE=== --EXPECT-- Offset invalid or out of range -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/bug74478.phpt b/ext/spl/tests/bug74478.phpt index c384648466..3609db53ee 100644 --- a/ext/spl/tests/bug74478.phpt +++ b/ext/spl/tests/bug74478.phpt @@ -59,4 +59,4 @@ offsetGet(0) offsetExists(1) offsetGet(1) offsetExists(2) -int(42)
\ No newline at end of file +int(42) diff --git a/ext/spl/tests/countable_count_variation1.phpt b/ext/spl/tests/countable_count_variation1.phpt index 642887d0c4..0a99399329 100644 --- a/ext/spl/tests/countable_count_variation1.phpt +++ b/ext/spl/tests/countable_count_variation1.phpt @@ -65,4 +65,4 @@ int(1) Count returns an array: int(1) Count throws an exception: -Thrown from count
\ No newline at end of file +Thrown from count diff --git a/ext/spl/tests/dit_001_noglob.phpt b/ext/spl/tests/dit_001_noglob.phpt index acb2092a55..9733c015b4 100644 --- a/ext/spl/tests/dit_001_noglob.phpt +++ b/ext/spl/tests/dit_001_noglob.phpt @@ -24,4 +24,3 @@ object(DirectoryIterator)#%d (3) { bool(false) bool(false) ===DONE=== - diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt index 781614abcc..7b012e7710 100644 --- a/ext/spl/tests/fileobject_005.phpt +++ b/ext/spl/tests/fileobject_005.phpt @@ -39,4 +39,4 @@ NULL Warning: SplFileObject::ftruncate() expects exactly 1 parameter, 0 given in %s on line %d NULL -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/spl/tests/heap_corruption.phpt b/ext/spl/tests/heap_corruption.phpt index 6b85681de5..47e8d008c0 100644 --- a/ext/spl/tests/heap_corruption.phpt +++ b/ext/spl/tests/heap_corruption.phpt @@ -67,4 +67,4 @@ bool(false) Compare Exception: Compare exception Corruption Exception: Heap is corrupted, heap properties are no longer ensured. bool(true) -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/spl/tests/heap_current_variation_001.phpt b/ext/spl/tests/heap_current_variation_001.phpt index eb6df2b88e..f67eb428c3 100644 --- a/ext/spl/tests/heap_current_variation_001.phpt +++ b/ext/spl/tests/heap_current_variation_001.phpt @@ -19,4 +19,4 @@ var_dump($heap->current()); ?> --EXPECT-- -NULL
\ No newline at end of file +NULL diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt index a4ff7a214c..74d393b677 100644 --- a/ext/spl/tests/iterator_036.phpt +++ b/ext/spl/tests/iterator_036.phpt @@ -18,5 +18,4 @@ test(new CachingIterator($ar, 0)); ?> ===DONE=== --EXPECTF-- - Fatal error: Method CachingIterator::__toString() must not throw an exception, caught BadMethodCallException: CachingIterator does not fetch string value (see CachingIterator::__construct) in %siterator_036.php on line %d diff --git a/ext/spl/tests/iterator_070.phpt b/ext/spl/tests/iterator_070.phpt index bbb518e074..318a2ef044 100644 --- a/ext/spl/tests/iterator_070.phpt +++ b/ext/spl/tests/iterator_070.phpt @@ -13,8 +13,7 @@ var_dump($recItIt->endIteration()); var_dump($recItIt->nextElement()); ?> - --EXPECTF-- NULL NULL -NULL
\ No newline at end of file +NULL diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt index 9f2cb6c604..2a12fafd8d 100644 --- a/ext/spl/tests/iterator_071.phpt +++ b/ext/spl/tests/iterator_071.phpt @@ -29,4 +29,4 @@ MyRecursiveIteratorIterator::nextelement MyRecursiveIteratorIterator::nextelement 0 MyRecursiveIteratorIterator::nextelement -1
\ No newline at end of file +1 diff --git a/ext/spl/tests/limititerator_seek.phpt b/ext/spl/tests/limititerator_seek.phpt index a59a49bee8..3336cd0a39 100644 --- a/ext/spl/tests/limititerator_seek.phpt +++ b/ext/spl/tests/limititerator_seek.phpt @@ -13,6 +13,4 @@ $lt->seek(1,1); // Should throw a warning as seek expects only 1 argument ?> --EXPECTF-- - Warning: LimitIterator::seek() expects exactly 1 parameter, 2 given in %s on line %d - diff --git a/ext/spl/tests/pqueue_compare_error.phpt b/ext/spl/tests/pqueue_compare_error.phpt index 610be2a569..99b47bb437 100644 --- a/ext/spl/tests/pqueue_compare_error.phpt +++ b/ext/spl/tests/pqueue_compare_error.phpt @@ -16,4 +16,3 @@ Warning: SplPriorityQueue::compare() expects exactly 2 parameters, 0 given in %s Warning: SplPriorityQueue::compare() expects exactly 2 parameters, 1 given in %s Warning: SplPriorityQueue::compare() expects exactly 2 parameters, 3 given in %s - diff --git a/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt index c9476e0e56..0eea8b28fa 100644 --- a/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt @@ -29,4 +29,3 @@ int(1) int(2) ::beginIteration() was invoked int(2) - diff --git a/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt index 0355401f27..b7c3cf6702 100644 --- a/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt @@ -29,4 +29,3 @@ int(2) int(1) int(2) ::endIteration() was invoked - diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt index 5d1c958d92..7cbfa165fb 100644 --- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt @@ -17,4 +17,3 @@ var_dump($iterator->getSubIterator() === $not_sub_iterator); --EXPECT-- bool(true) bool(false) - diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt index 760082f6bd..068ace9d8c 100644 --- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt @@ -12,4 +12,3 @@ $iterator->getSubIterator(0, 0); ?> --EXPECTF-- Warning: RecursiveIteratorIterator::getSubIterator() expects at most 1 parameter, 2 given in %s on line 5 - diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt index b114a9022d..7495ae617f 100644 --- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt @@ -39,4 +39,3 @@ array(2) { [1]=> int(4) } - diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt index aac4e65bb8..a898a03f80 100644 --- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt @@ -17,4 +17,3 @@ var_dump(is_null($iterator->getSubIterator())); --EXPECT-- bool(false) bool(false) - diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt index ff18840391..7a4dbc2e33 100644 --- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt @@ -39,4 +39,3 @@ array(2) { int(4) } NULL - diff --git a/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt index 0bf4f198f3..b5508f73e4 100644 --- a/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt @@ -36,4 +36,3 @@ int(2) int(3) ::nextElement() was invoked int(4) - diff --git a/ext/spl/tests/regexiterator_getpregflags.phpt b/ext/spl/tests/regexiterator_getpregflags.phpt index 58a4dc4a3b..875dbb6d60 100644 --- a/ext/spl/tests/regexiterator_getpregflags.phpt +++ b/ext/spl/tests/regexiterator_getpregflags.phpt @@ -30,4 +30,4 @@ echo is_long($r->getPregFlags()); ?> --EXPECTF-- -1
\ No newline at end of file +1 diff --git a/ext/spl/tests/regexiterator_setflags_exception.phpt b/ext/spl/tests/regexiterator_setflags_exception.phpt index 44108c746d..7cf771db6f 100644 --- a/ext/spl/tests/regexiterator_setflags_exception.phpt +++ b/ext/spl/tests/regexiterator_setflags_exception.phpt @@ -32,4 +32,4 @@ try{ ?> --EXPECTF-- -Warning: RegexIterator::setFlags() expects exactly 1 parameter, 0 given in %s
\ No newline at end of file +Warning: RegexIterator::setFlags() expects exactly 1 parameter, 0 given in %s diff --git a/ext/spl/tests/regexiterator_setpregflags.phpt b/ext/spl/tests/regexiterator_setpregflags.phpt index ea1b455488..eb68e62163 100644 --- a/ext/spl/tests/regexiterator_setpregflags.phpt +++ b/ext/spl/tests/regexiterator_setpregflags.phpt @@ -31,4 +31,4 @@ echo $r->getPregFlags(); ?> --EXPECTF-- -256
\ No newline at end of file +256 diff --git a/ext/spl/tests/regexiterator_setpregflags_exception.phpt b/ext/spl/tests/regexiterator_setpregflags_exception.phpt index c84af67d2b..5750e72af1 100644 --- a/ext/spl/tests/regexiterator_setpregflags_exception.phpt +++ b/ext/spl/tests/regexiterator_setpregflags_exception.phpt @@ -33,4 +33,4 @@ try{ ?> --EXPECTF-- -Warning: RegexIterator::setPregFlags() expects exactly 1 parameter, 0 given in %s
\ No newline at end of file +Warning: RegexIterator::setPregFlags() expects exactly 1 parameter, 0 given in %s diff --git a/ext/spl/tests/spl_autoload_013.phpt b/ext/spl/tests/spl_autoload_013.phpt index 44d4d857f2..c956ccd92f 100644 --- a/ext/spl/tests/spl_autoload_013.phpt +++ b/ext/spl/tests/spl_autoload_013.phpt @@ -48,4 +48,4 @@ array(3) { string(2) "d2" } } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_autoload_014.phpt b/ext/spl/tests/spl_autoload_014.phpt index a68fcb7e60..782fe8d07e 100644 --- a/ext/spl/tests/spl_autoload_014.phpt +++ b/ext/spl/tests/spl_autoload_014.phpt @@ -44,4 +44,4 @@ closure called with class TestX Autoloader('d1') called with TestX WorkingAutoloader() called with TestX WorkingAutoloader() called with TestY -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_autoload_bug48541.phpt b/ext/spl/tests/spl_autoload_bug48541.phpt index 9937a7f42c..4936270d3b 100644 --- a/ext/spl/tests/spl_autoload_bug48541.phpt +++ b/ext/spl/tests/spl_autoload_bug48541.phpt @@ -36,4 +36,4 @@ a called a2 called b called foo -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_classes.phpt b/ext/spl/tests/spl_classes.phpt index 9d897c497d..a47c86eff8 100644 --- a/ext/spl/tests/spl_classes.phpt +++ b/ext/spl/tests/spl_classes.phpt @@ -10,4 +10,3 @@ var_dump(is_array(spl_classes())); ?> --EXPECT-- bool(true) - diff --git a/ext/spl/tests/spl_heap_isempty.phpt b/ext/spl/tests/spl_heap_isempty.phpt index 2729c7fa87..fb016f4737 100644 --- a/ext/spl/tests/spl_heap_isempty.phpt +++ b/ext/spl/tests/spl_heap_isempty.phpt @@ -18,4 +18,4 @@ TestFest London May 2009 --EXPECT-- Checking a new heap is empty: bool(true) Checking after insert: bool(false) -Checking after extract: bool(true)
\ No newline at end of file +Checking after extract: bool(true) diff --git a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt index 823c809f82..126d394f29 100644 --- a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt +++ b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt @@ -10,6 +10,4 @@ TestFest London May 2009 $h->recoverFromCorruption("no args"); ?> --EXPECTF-- - Warning: SplHeap::recoverFromCorruption() expects exactly 0 parameters, 1 given in %s on line %d - diff --git a/ext/spl/tests/spl_iterator_caching_count_basic.phpt b/ext/spl/tests/spl_iterator_caching_count_basic.phpt index b11eb7b540..4d9c90f86b 100644 --- a/ext/spl/tests/spl_iterator_caching_count_basic.phpt +++ b/ext/spl/tests/spl_iterator_caching_count_basic.phpt @@ -18,4 +18,4 @@ foreach ($i as $value) { 3 4 5 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_iterator_caching_count_error.phpt b/ext/spl/tests/spl_iterator_caching_count_error.phpt index 70aa2be30b..68d92dcf38 100644 --- a/ext/spl/tests/spl_iterator_caching_count_error.phpt +++ b/ext/spl/tests/spl_iterator_caching_count_error.phpt @@ -18,4 +18,4 @@ try { ===DONE=== --EXPECT-- Exception raised -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_iterator_caching_getcache_error.phpt b/ext/spl/tests/spl_iterator_caching_getcache_error.phpt index 2ea4bd819b..9db726df43 100644 --- a/ext/spl/tests/spl_iterator_caching_getcache_error.phpt +++ b/ext/spl/tests/spl_iterator_caching_getcache_error.phpt @@ -18,4 +18,4 @@ try { ===DONE=== --EXPECT-- Exception raised -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_minheap_compare_error.phpt b/ext/spl/tests/spl_minheap_compare_error.phpt index 7120a6cd11..d7e5cbb5a1 100644 --- a/ext/spl/tests/spl_minheap_compare_error.phpt +++ b/ext/spl/tests/spl_minheap_compare_error.phpt @@ -28,4 +28,3 @@ Warning: SplMinHeap::compare() expects exactly 2 parameters, 0 given in %s Warning: SplMinHeap::compare() expects exactly 2 parameters, 1 given in %s Warning: SplMinHeap::compare() expects exactly 2 parameters, 3 given in %s - diff --git a/ext/spl/tests/spl_pq_top_basic.phpt b/ext/spl/tests/spl_pq_top_basic.phpt index 14e0af51cb..b9a88fc8ef 100644 --- a/ext/spl/tests/spl_pq_top_basic.phpt +++ b/ext/spl/tests/spl_pq_top_basic.phpt @@ -45,4 +45,4 @@ Array [priority] => 2 ) EXTR_DATA -value: b
\ No newline at end of file +value: b diff --git a/ext/spl/tests/spl_pq_top_error_args.phpt b/ext/spl/tests/spl_pq_top_error_args.phpt index a0e5969034..8e26c6c7b8 100644 --- a/ext/spl/tests/spl_pq_top_error_args.phpt +++ b/ext/spl/tests/spl_pq_top_error_args.phpt @@ -9,4 +9,4 @@ $priorityQueue = new SplPriorityQueue(); $priorityQueue->top('var'); ?> --EXPECTF-- -Warning: SplPriorityQueue::top() expects exactly 0 parameters, 1 given in %s
\ No newline at end of file +Warning: SplPriorityQueue::top() expects exactly 0 parameters, 1 given in %s diff --git a/ext/spl/tests/splpriorityqueue_extract.phpt b/ext/spl/tests/splpriorityqueue_extract.phpt index eee7bb2f73..c3af4dd8f1 100644 --- a/ext/spl/tests/splpriorityqueue_extract.phpt +++ b/ext/spl/tests/splpriorityqueue_extract.phpt @@ -14,6 +14,4 @@ $sp->extract(1); // Should throw a warning as extract expects NO arguments ?> --EXPECTF-- - Warning: SplPriorityQueue::extract() expects exactly 0 parameters, 1 given in %s on line %d - diff --git a/ext/spl/tests/splpriorityqueue_setextractflags.phpt b/ext/spl/tests/splpriorityqueue_setextractflags.phpt index 97d86f375e..0326dbb03c 100644 --- a/ext/spl/tests/splpriorityqueue_setextractflags.phpt +++ b/ext/spl/tests/splpriorityqueue_setextractflags.phpt @@ -12,6 +12,4 @@ $sp->setExtractFlags(1,1); // Should throw a warning as setExtractFlags expects ?> --EXPECTF-- - Warning: SplPriorityQueue::setExtractFlags() expects exactly 1 parameter, 2 given in %s on line %d - |