File tree Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -1767,34 +1767,32 @@ PHP_METHOD(RegexIterator, __construct)
1767
1767
/* {{{ Calls the callback with the current value, the current key and the inner iterator as arguments */
1768
1768
PHP_METHOD (CallbackFilterIterator , accept )
1769
1769
{
1770
- spl_dual_it_object * intern = Z_SPLDUAL_IT_P (ZEND_THIS );
1771
- zend_fcall_info * fci = & intern -> u .cbfilter -> fci ;
1772
- zend_fcall_info_cache * fcc = & intern -> u .cbfilter -> fcc ;
1773
- zval params [3 ];
1770
+ spl_dual_it_object * intern = Z_SPLDUAL_IT_P (ZEND_THIS );
1774
1771
1775
1772
if (zend_parse_parameters_none () == FAILURE ) {
1776
1773
RETURN_THROWS ();
1777
1774
}
1778
1775
1776
+ SPL_FETCH_AND_CHECK_DUAL_IT (intern , ZEND_THIS );
1777
+
1779
1778
if (Z_TYPE (intern -> current .data ) == IS_UNDEF || Z_TYPE (intern -> current .key ) == IS_UNDEF ) {
1780
1779
RETURN_FALSE ;
1781
1780
}
1782
1781
1782
+ zval params [3 ];
1783
1783
ZVAL_COPY_VALUE (& params [0 ], & intern -> current .data );
1784
1784
ZVAL_COPY_VALUE (& params [1 ], & intern -> current .key );
1785
1785
ZVAL_COPY_VALUE (& params [2 ], & intern -> inner .zobject );
1786
1786
1787
+ zend_fcall_info * fci = & intern -> u .cbfilter -> fci ;
1788
+ zend_fcall_info_cache * fcc = & intern -> u .cbfilter -> fcc ;
1787
1789
fci -> retval = return_value ;
1788
1790
fci -> param_count = 3 ;
1789
1791
fci -> params = params ;
1790
1792
1791
1793
if (zend_call_function (fci , fcc ) != SUCCESS || Z_ISUNDEF_P (return_value )) {
1792
1794
RETURN_FALSE ;
1793
1795
}
1794
-
1795
- if (EG (exception )) {
1796
- RETURN_THROWS ();
1797
- }
1798
1796
}
1799
1797
/* }}} */
1800
1798
You can’t perform that action at this time.
0 commit comments