Merge branch 'PHP-7.1' into PHP-7.2

cmb69 · cmb69 · commit 56abfd2798be · 2018-08-13T16:00:25.000+02:00
* PHP-7.1:
  Fix arginfo for bzcompress
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #72443 (Generate enabled extension). (petk)
 
+- Bz2:
+  . Fixed arginfo for bzcompress. (Tyson Andre)
+
 - gettext:
   . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
 
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
@@ -75,7 +75,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_bzerror, 0)
 	ZEND_ARG_INFO(0, bz)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 1)
 	ZEND_ARG_INFO(0, source)
 	ZEND_ARG_INFO(0, blocksize)
 	ZEND_ARG_INFO(0, workfactor)
