From: Anatol Belski <ab@php.net>
Date: Thu, 2 Aug 2018 19:25:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.4.0alpha1~2171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e018a1c98a272eab2fb3660e7e83cca6f3cfb2ee;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix callbacks
  bump version
---

e018a1c98a272eab2fb3660e7e83cca6f3cfb2ee
diff --cc ext/com_dotnet/com_saproxy.c
index a8cd9b9214,4fff134178..68c814f4b4
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@@ -518,12 -520,10 +518,10 @@@ static void saproxy_iter_move_forwards(
  
  	if (++I->key >= I->imax) {
  		I->key = -1;
- 		return FAILURE;
  	}
- 	return SUCCESS;
  }
  
 -static zend_object_iterator_funcs saproxy_iter_funcs = {
 +static const zend_object_iterator_funcs saproxy_iter_funcs = {
  	saproxy_iter_dtor,
  	saproxy_iter_valid,
  	saproxy_iter_get_data,