diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-27 12:40:20 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-27 12:41:15 +0100 |
| commit | d7a02844f9cd41b7a91562030ca06e6d3f0bf4b9 (patch) | |
| tree | 3345b2702925d331250021f438e02beb2c8304c0 /ext/spl | |
| parent | fd255b8878b5e798e256c13b1e05a7e55fea38e8 (diff) | |
| parent | 4bd7658e1b44b72ff76913036c1b41f74318b065 (diff) | |
| download | php-git-d7a02844f9cd41b7a91562030ca06e6d3f0bf4b9.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/spl_iterators.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 6d087c37d3..e4d3611e2e 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1327,6 +1327,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it_setPrefixPart, 0, 0, 2) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it_setPostfix, 0, 0, 1) + ZEND_ARG_INFO(0, postfix) +ZEND_END_ARG_INFO(); + static const zend_function_entry spl_funcs_RecursiveTreeIterator[] = { SPL_ME(RecursiveTreeIterator, __construct, arginfo_recursive_tree_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveIteratorIterator, rewind, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) @@ -1344,7 +1348,7 @@ static const zend_function_entry spl_funcs_RecursiveTreeIterator[] = { SPL_ME(RecursiveTreeIterator, getPrefix, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveTreeIterator, setPrefixPart, arginfo_recursive_tree_it_setPrefixPart, ZEND_ACC_PUBLIC) SPL_ME(RecursiveTreeIterator, getEntry, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - SPL_ME(RecursiveTreeIterator, setPostfix, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveTreeIterator, setPostfix, arginfo_recursive_tree_it_setPostfix, ZEND_ACC_PUBLIC) SPL_ME(RecursiveTreeIterator, getPostfix, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) PHP_FE_END }; |