From a882f95e39a7d9bc78fb5b4ed0210e345acab6d2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 27 Jan 2018 13:11:30 +0100 Subject: [PATCH] Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature" This reverts commit 4bd7658e1b44b72ff76913036c1b41f74318b065. To avoid the BC break we apply the fix to master only. --- NEWS | 4 ---- ext/spl/spl_iterators.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 40fc8e861a..d14b616a64 100644 --- a/NEWS +++ b/NEWS @@ -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.1.14 - Core: diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 1b38cc0ff2..db6896965a 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1328,10 +1328,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) @@ -1349,7 +1345,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 }; -- 2.40.0