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

nielsdos · web-flow · commit e218ca216184 · 2024-05-07T18:23:28.000+02:00
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -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;
 	}
 
diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt
@@ -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)
diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt
@@ -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)
diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1500,7 +1500,7 @@ static int phar_build(zend_object_iterator iter, void puser) /* {{{ */`
`1500`	`1500`	`}`
`1501`	`1501`	`ZEND_FALLTHROUGH;`
`1502`	`1502`	`default:`
`1503`		`- zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, "Iterator %s returned an invalid value (must return a string)", ZSTR_VAL(ce->name));`
	`1503`	`+ 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));`
`1504`	`1504`	`return ZEND_HASH_APPLY_STOP;`
`1505`	`1505`	`}`
`1506`	`1506`