mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use same type error wording for alias iterable in ZPP (#8838)

Browse Source 
Follow-up from #7309 as I didn't change the ZPP TypeError wording.
This commit is contained in:
George Peter Banyard 2022-06-21 15:19:23 +01:00 committed by GitHub
parent 804c708023
commit 280b3db054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/tests/iterable_or_null.phpt
View File

@ -40,8 +40,8 @@ try {
?>
--EXPECT--
zend_iterable(): Argument #1 ($arg1) must be of type iterable, string given
zend_iterable(): Argument #1 ($arg1) must be of type iterable, int given
zend_iterable(): Argument #1 ($arg1) must be of type iterable, null given
zend_iterable(): Argument #2 ($arg2) must be of type ?iterable, string given
zend_iterable(): Argument #1 ($arg1) must be of type Traversable|array, string given
zend_iterable(): Argument #1 ($arg1) must be of type Traversable|array, int given
zend_iterable(): Argument #1 ($arg1) must be of type Traversable|array, null given
zend_iterable(): Argument #2 ($arg2) must be of type Traversable|array|null, string given

4
Zend/zend_API.h
View File

@ -1319,8 +1319,8 @@ static zend_always_inline zval *zend_try_array_init(zval *zv)
_(Z_EXPECTED_ARRAY_OR_NULL, "of type ?array") \
_(Z_EXPECTED_ARRAY_OR_LONG, "of type array|int") \
_(Z_EXPECTED_ARRAY_OR_LONG_OR_NULL, "of type array|int|null") \
_(Z_EXPECTED_ITERABLE, "of type iterable") \
_(Z_EXPECTED_ITERABLE_OR_NULL, "of type ?iterable") \
_(Z_EXPECTED_ITERABLE, "of type Traversable|array") \
_(Z_EXPECTED_ITERABLE_OR_NULL, "of type Traversable|array|null") \
_(Z_EXPECTED_FUNC, "a valid callback") \
_(Z_EXPECTED_FUNC_OR_NULL, "a valid callback or null") \
_(Z_EXPECTED_RESOURCE, "of type resource") \