Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75437 Wrong reflection on imagewebp

NEWS

@@ -21,6 +21,7 @@ PHP                                                                        NEWS
 
 - GD:
   . Fixed bug #65148 (imagerotate may alter image dimensions). (cmb)
+  . Fixed bug #75437 (Wrong reflection on imagewebp). (Fabien Villepinte)
 
 - intl:
   . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead 

ext/gd/gd.c

@@ -377,6 +377,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagewebp, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, to)
+	ZEND_ARG_INFO(0, quality)
 ZEND_END_ARG_INFO()
 #endif
 

ext/gd/tests/bug75437.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Bug #75437 Wrong reflection on imagewebp
+--SKIPIF--
+if (!extension_loaded('reflection')) die('skip reflection not available');
+if (!extension_loaded('gd')) die('skip gd extension not available');
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) die("skip test requires GD 2.2.0 or higher");
+if (!function_exists('imagewebp')) die('skip WebP support not available');
+--FILE--
+<?php
+$rf = new ReflectionFunction('imagewebp');
+var_dump($rf->getNumberOfParameters());
+var_dump($rf->getNumberOfRequiredParameters());
+?>
+===DONE===
+--EXPECT--
+int(3)
+int(1)
+===DONE===