Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1: Fix bug #75437 Wrong reflection on imagewebp
kea · Oct 25, 2017 · c78813a · c78813a
2 parents 58ccfb0 + 9d59beb
commit c78813a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.2.0RC6
 
+- GD:
+  . Fixed bug #75437 (Wrong reflection on imagewebp). (Fabien Villepinte)
 
 26 Oct 2017, PHP 7.2.0RC5
 

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -381,6 +381,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
 

diff --git a/ext/gd/tests/bug75437.phpt b/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===