Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix callbacks
  bump version
This commit is contained in:
Anatol Belski 2018-08-02 21:25:29 +02:00
commit e018a1c98a
4 changed files with 8 additions and 11 deletions

View file

@ -512,15 +512,13 @@ static void saproxy_iter_get_key(zend_object_iterator *iter, zval *key)
}
}
static int saproxy_iter_move_forwards(zend_object_iterator *iter)
static void saproxy_iter_move_forwards(zend_object_iterator *iter)
{
php_com_saproxy_iter *I = (php_com_saproxy_iter*)Z_PTR(iter->data);
if (++I->key >= I->imax) {
I->key = -1;
return FAILURE;
}
return SUCCESS;
}
static const zend_object_iterator_funcs saproxy_iter_funcs = {