php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message in Phar::buildFromIterator() (#14145)

Browse Source
This commit is contained in:
Niels Dossche
2024-05-07 18:23:28 +02:00
committed by GitHub
parent d2a9edfee6
commit e218ca2161
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/phar/phar_object.c
View File

@@ -1500,7 +1500,7 @@ static int phar_build(zend_object_iterator *iter, void *puser) /* {{{ */
}
ZEND_FALLTHROUGH;
default:
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, "Iterator %s returned an invalid value (must return a string)", ZSTR_VAL(ce->name));
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, "Iterator %s returned an invalid value (must return a string, a stream, or an SplFileInfo object)", ZSTR_VAL(ce->name));
return ZEND_HASH_APPLY_STOP;
}

2
ext/phar/tests/phar_buildfromiterator5.phpt
View File

@@ -49,4 +49,4 @@ rewind
valid
current
%s(24) "UnexpectedValueException"
Iterator myIterator returned an invalid value (must return a string)
Iterator myIterator returned an invalid value (must return a string, a stream, or an SplFileInfo object)

2
ext/phar/tests/tar/phar_buildfromiterator5.phpt
View File

@@ -49,4 +49,4 @@ rewind
valid
current
%s(24) "UnexpectedValueException"
Iterator myIterator returned an invalid value (must return a string)
Iterator myIterator returned an invalid value (must return a string, a stream, or an SplFileInfo object)

2
ext/phar/tests/zip/phar_buildfromiterator5.phpt
View File

@@ -49,4 +49,4 @@ rewind
valid
current
%s(24) "UnexpectedValueException"
Iterator myIterator returned an invalid value (must return a string)
Iterator myIterator returned an invalid value (must return a string, a stream, or an SplFileInfo object)