diff options
Diffstat (limited to 'ext/spl')
24 files changed, 39 insertions, 36 deletions
diff --git a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt index e1d37ecce5..11529cfee0 100644 --- a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt +++ b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt @@ -43,6 +43,6 @@ try { --EXPECT-- CallbackFilterIterator::__construct() expects exactly 2 parameters, 0 given CallbackFilterIterator::__construct() expects exactly 2 parameters, 1 given -CallbackFilterIterator::__construct() expects argument #2 ($callback) to be a valid callback, no array or string given -CallbackFilterIterator::__construct() expects argument #2 ($callback) to be a valid callback, array must have exactly two members +CallbackFilterIterator::__construct(): Argument #2 ($callback) must be a valid callback, no array or string given +CallbackFilterIterator::__construct(): Argument #2 ($callback) must be a valid callback, array must have exactly two members some message diff --git a/ext/spl/tests/SplFileInfo_setFileClass_error.phpt b/ext/spl/tests/SplFileInfo_setFileClass_error.phpt index b8aea64ea2..c1b373cebe 100644 --- a/ext/spl/tests/SplFileInfo_setFileClass_error.phpt +++ b/ext/spl/tests/SplFileInfo_setFileClass_error.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -SplFileInfo::setFileClass() expects argument #1 ($class_name) to be a class name derived from SplFileObject, 'stdClass' given +SplFileInfo::setFileClass(): Argument #1 ($class_name) must be a class name derived from SplFileObject, 'stdClass' given diff --git a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt index b0a358a9b3..f9ef81aeeb 100644 --- a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt +++ b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -SplFileInfo::setInfoClass() expects argument #1 ($class_name) to be a class name derived from SplFileInfo, 'stdClass' given +SplFileInfo::setInfoClass(): Argument #1 ($class_name) must be a class name derived from SplFileInfo, 'stdClass' given diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt index f4fb329989..76f32855b2 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, array given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, array given diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt index 240631cc88..1c9a681e82 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt index cfb0ca79a9..12e632514e 100644 --- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt +++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt @@ -12,4 +12,4 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, object given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, object given diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt index aaf2738915..855479c54a 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt @@ -9,4 +9,4 @@ try { } ?> --EXPECT-- -SplTempFileObject::__construct() expects argument #1 ($max_memory) to be of type int, string given +SplTempFileObject::__construct(): Argument #1 ($max_memory) must be of type int, string given diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt index b7700e4e31..3ac214260a 100644 --- a/ext/spl/tests/arrayObject___construct_error1.phpt +++ b/ext/spl/tests/arrayObject___construct_error1.phpt @@ -20,6 +20,6 @@ try { ?> --EXPECT-- Bad iterator type: -ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'Exception' given(6) +ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'Exception' given(6) Non-existent class: -ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'nonExistentClassName' given(13) +ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'nonExistentClassName' given(13) diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt index db751c6fba..042e317273 100644 --- a/ext/spl/tests/arrayObject_asort_basic1.phpt +++ b/ext/spl/tests/arrayObject_asort_basic1.phpt @@ -38,7 +38,7 @@ object(ArrayObject)#%d (1) { int(4) } } -asort() expects argument #2 ($sort_flags) to be of type int, string given +asort(): Argument #2 ($sort_flags) must be of type int, string given object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> array(3) { diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt index 6e20013177..892e392b8b 100644 --- a/ext/spl/tests/arrayObject_ksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt @@ -37,7 +37,7 @@ object(ArrayObject)#%d (1) { int(3) } } -ksort() expects argument #2 ($sort_flags) to be of type int, string given +ksort(): Argument #2 ($sort_flags) must be of type int, string given object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> array(4) { diff --git a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt index a80c8cbb0d..918dcbee96 100644 --- a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt +++ b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt @@ -43,7 +43,7 @@ try { ?> --EXPECT-- -string(135) "ArrayObject::setIteratorClass() expects argument #1 ($iteratorClass) to be a class name derived from Iterator, 'nonExistentClass' given" -string(127) "ArrayObject::setIteratorClass() expects argument #1 ($iteratorClass) to be a class name derived from Iterator, 'stdClass' given" -string(131) "ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'nonExistentClass' given" -string(123) "ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'stdClass' given" +string(130) "ArrayObject::setIteratorClass(): Argument #1 ($iteratorClass) must be a class name derived from Iterator, 'nonExistentClass' given" +string(122) "ArrayObject::setIteratorClass(): Argument #1 ($iteratorClass) must be a class name derived from Iterator, 'stdClass' given" +string(126) "ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'nonExistentClass' given" +string(118) "ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'stdClass' given" diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt index e48f80fe00..2521c50223 100644 --- a/ext/spl/tests/bug54291.phpt +++ b/ext/spl/tests/bug54291.phpt @@ -5,7 +5,7 @@ Bug #54291 (Crash iterating DirectoryIterator for dir name starting with \0) $dir = new DirectoryIterator("\x00/abc"); $dir->isFile(); --EXPECTF-- -Fatal error: Uncaught TypeError: DirectoryIterator::__construct() expects argument #1 ($path) to be a valid path, string given in %s:%d +Fatal error: Uncaught TypeError: DirectoryIterator::__construct(): Argument #1 ($path) must be a valid path, string given in %s:%d Stack trace: #0 %s(%d): DirectoryIterator->__construct('\x00/abc') #1 {main} diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/bug54292.phpt index 9355ef4408..27bd706ad8 100644 --- a/ext/spl/tests/bug54292.phpt +++ b/ext/spl/tests/bug54292.phpt @@ -11,4 +11,4 @@ try { ?> --EXPECT-- -string(95) "SplFileObject::__construct() expects argument #2 ($open_mode) to be of type string, array given" +string(90) "SplFileObject::__construct(): Argument #2 ($open_mode) must be of type string, array given" diff --git a/ext/spl/tests/bug77431.phpt b/ext/spl/tests/bug77431.phpt index 20545fb141..75d5c2d600 100644 --- a/ext/spl/tests/bug77431.phpt +++ b/ext/spl/tests/bug77431.phpt @@ -5,5 +5,8 @@ Bug #77431 (SplFileInfo::__construct() accepts NUL bytes) new SplFileInfo("bad\0good"); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: SplFileInfo::__construct() expects argument #1 ($file_name) to be a valid path, string given in %s:%d -Stack trace:%A +Fatal error: Uncaught TypeError: SplFileInfo::__construct(): Argument #1 ($file_name) must be a valid path, string given in %s:%d +Stack trace: +#0 %s(%d): SplFileInfo->__construct('bad\x00good') +#1 {main} + thrown in %s on line %d diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt index 4db36c202e..ad18f49689 100644 --- a/ext/spl/tests/bug78863.phpt +++ b/ext/spl/tests/bug78863.phpt @@ -16,7 +16,7 @@ foreach ($it as $fileinfo) { } ?> --EXPECTF-- -Fatal error: Uncaught TypeError: DirectoryIterator::__construct() expects argument #1 ($path) to be a valid path, string given in %s:%d +Fatal error: Uncaught TypeError: DirectoryIterator::__construct(): Argument #1 ($path) must be a valid path, string given in %s:%d Stack trace: #0 %s(%d): DirectoryIterator->__construct('%s') #1 {main} diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt index 80fffd1566..573a995cb1 100644 --- a/ext/spl/tests/fixedarray_005.phpt +++ b/ext/spl/tests/fixedarray_005.phpt @@ -23,6 +23,6 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, object given -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, object given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt index 6dc6e4cbca..9cc684ce03 100644 --- a/ext/spl/tests/fixedarray_009.phpt +++ b/ext/spl/tests/fixedarray_009.phpt @@ -10,4 +10,4 @@ try { } ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt index 74814268e7..1936cc962b 100644 --- a/ext/spl/tests/fixedarray_015.phpt +++ b/ext/spl/tests/fixedarray_015.phpt @@ -12,5 +12,5 @@ try { echo "Done\n"; ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given Done diff --git a/ext/spl/tests/iterator_042.phpt b/ext/spl/tests/iterator_042.phpt index f768e47077..4ede8afa59 100644 --- a/ext/spl/tests/iterator_042.phpt +++ b/ext/spl/tests/iterator_042.phpt @@ -39,7 +39,7 @@ foreach($it as $k => $v) ?> --EXPECTF-- -Error AppendIterator::append() expects argument #1 ($iterator) to be of type Iterator, array given in %s on line %d +Error AppendIterator::append(): Argument #1 ($iterator) must be of type Iterator, array given in %s on line %d object(ArrayIterator)#%d (1) { %s"storage"%s"ArrayIterator":private]=> array(2) { diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt index c62abb5c1a..21ab075cc9 100644 --- a/ext/spl/tests/iterator_044.phpt +++ b/ext/spl/tests/iterator_044.phpt @@ -83,8 +83,8 @@ NULL ===1=== object(stdClass)#%d (0) { } -CachingIterator::offsetExists() expects argument #1 ($index) to be of type string, object given -CachingIterator::offsetGet() expects argument #1 ($index) to be of type string, object given +CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, object given +CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, object given ===2=== object(MyFoo)#%d (0) { } @@ -124,8 +124,8 @@ int(0) ===1=== object(stdClass)#1 (0) { } -CachingIterator::offsetExists() expects argument #1 ($index) to be of type string, object given -CachingIterator::offsetGet() expects argument #1 ($index) to be of type string, object given +CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, object given +CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, object given ===2=== object(MyFoo)#2 (0) { } diff --git a/ext/spl/tests/iterator_count.phpt b/ext/spl/tests/iterator_count.phpt index 3071f9b06c..62f9ee8334 100644 --- a/ext/spl/tests/iterator_count.phpt +++ b/ext/spl/tests/iterator_count.phpt @@ -13,7 +13,7 @@ iterator_count('1'); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: iterator_count() expects argument #1 ($iterator) to be of type Traversable, string given in %s:%d +Fatal error: Uncaught TypeError: iterator_count(): Argument #1 ($iterator) must be of type Traversable, string given in %s:%d Stack trace: #0 %s(%d): iterator_count('1') #1 {main} diff --git a/ext/spl/tests/iterator_to_array.phpt b/ext/spl/tests/iterator_to_array.phpt index 09dcf5d02f..a754c9da6f 100644 --- a/ext/spl/tests/iterator_to_array.phpt +++ b/ext/spl/tests/iterator_to_array.phpt @@ -13,7 +13,7 @@ iterator_to_array('test','test'); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: iterator_to_array() expects argument #1 ($iterator) to be of type Traversable, string given in %s:%d +Fatal error: Uncaught TypeError: iterator_to_array(): Argument #1 ($iterator) must be of type Traversable, string given in %s:%d Stack trace: #0 %s(%d): iterator_to_array('test', 'test') #1 {main} diff --git a/ext/spl/tests/recursive_tree_iterator_003.phpt b/ext/spl/tests/recursive_tree_iterator_003.phpt index 0f4fed97b3..39a94ba8d3 100644 --- a/ext/spl/tests/recursive_tree_iterator_003.phpt +++ b/ext/spl/tests/recursive_tree_iterator_003.phpt @@ -9,4 +9,4 @@ try { } ?> --EXPECT-- -RecursiveCachingIterator::__construct() expects argument #1 ($iterator) to be of type RecursiveIterator, object given +RecursiveCachingIterator::__construct(): Argument #1 ($iterator) must be of type RecursiveIterator, object given diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt index 0b628d3ee1..0aca8398e6 100644 --- a/ext/spl/tests/spl_004.phpt +++ b/ext/spl/tests/spl_004.phpt @@ -84,6 +84,6 @@ int(5) int(6) int(4) ===ERRORS=== -iterator_apply() expects argument #3 ($args) to be of type array, int given -iterator_apply() expects argument #2 ($function) to be a valid callback, function 'non_existing_function' not found or invalid function name +iterator_apply(): Argument #3 ($args) must be of type array, int given +iterator_apply(): Argument #2 ($function) must be a valid callback, function 'non_existing_function' not found or invalid function name iterator_apply() expects at most 3 parameters, 4 given |