diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-27 13:12:09 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-27 13:13:06 +0100 |
| commit | 96595a232a7ad2031165152a2292ed3055507493 (patch) | |
| tree | 2fe9810c5ec124fb31525a5f919c1b28f55af0ba | |
| parent | d7a02844f9cd41b7a91562030ca06e6d3f0bf4b9 (diff) | |
| parent | a882f95e39a7d9bc78fb5b4ed0210e345acab6d2 (diff) | |
| download | php-git-96595a232a7ad2031165152a2292ed3055507493.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/spl/spl_iterators.c | 6 |
2 files changed, 1 insertions, 9 deletions
@@ -8,10 +8,6 @@ PHP NEWS - ODBC: . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol) -- SPL: - . Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature). - (cmb) - 01 Feb 2018, PHP 7.2.2 - Core: diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index e4d3611e2e..6d087c37d3 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1327,10 +1327,6 @@ 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) @@ -1348,7 +1344,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_tree_it_setPostfix, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveTreeIterator, setPostfix, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveTreeIterator, getPostfix, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) PHP_FE_END }; |