Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

NEWS

@@ -4,7 +4,11 @@ PHP                                                                        NEWS
 
 - Exif:
   . Fixed bug #75301 (Exif extension has built in revision version). (Peter
-    Kokot).
+    Kokot)
+
+- Zlib:
+  . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
+    Villepinte)
 
 12 Oct 2017, PHP 7.2.0RC4
 

ext/zlib/tests/bug75299.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #75299 Wrong reflection on inflate_init and inflate_add
+--SKIPIF--
+<?php if (!extension_loaded("zlib") || !extension_loaded('reflection')) die("skip"); ?>
+--FILE--
+<?php
+$r = new ReflectionFunction('inflate_init');
+var_dump($r->getNumberOfRequiredParameters());
+var_dump($r->getNumberOfParameters());
+$r = new ReflectionFunction('inflate_add');
+var_dump($r->getNumberOfRequiredParameters());
+var_dump($r->getNumberOfParameters());
+?>
+===DONE===
+--EXPECT--
+int(1)
+int(2)
+int(2)
+int(3)
+===DONE===

ext/zlib/zlib.c

@@ -1366,11 +1366,13 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_init, 0, 0, 1)
 	ZEND_ARG_INFO(0, encoding)
+	ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_add, 0, 0, 2)
-	ZEND_ARG_INFO(0, resource)
-	ZEND_ARG_INFO(0, flush_behavior)
+	ZEND_ARG_INFO(0, context)
+	ZEND_ARG_INFO(0, encoded_data)
+	ZEND_ARG_INFO(0, flush_mode)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_get_status, 0, 0, 1)