Merge branch 'PHP-7.1' into PHP-7.2

cmb69 · cmb69 · commit 8c396e0e8852 · 2018-02-24T11:32:03.000+01:00
* PHP-7.1:
  Fix imagesetinterpolation arginfo
diff --git a/NEWS b/NEWS
@@ -19,6 +19,9 @@ PHP                                                                        NEWS
 - FTP:
   . Fixed ftp_pasv arginfo. (carusogabriel)
 
+-GD:
+  . Fixed imagesetinterpolation arginfo. (Gabriel Caruso)
+
 - LDAP:
   . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
 
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -848,7 +848,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imageaffinematrixconcat, 0)
 	ZEND_ARG_INFO(0, m2)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_imagesetinterpolation, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imagesetinterpolation, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, method)
 ZEND_END_ARG_INFO()
