diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-02 18:14:50 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-02 18:14:50 +0100 |
| commit | 2d1955796ea00ce8f718502d583394ad0d05d266 (patch) | |
| tree | c4a9ad323cd639f1c00092d85b9ead82a7af519a | |
| parent | d2658287fa19191ddf19142089abdd880534badb (diff) | |
| parent | acda2563cea2acacdb126a6c14a144a9bf52e3a3 (diff) | |
| download | php-git-2d1955796ea00ce8f718502d583394ad0d05d266.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/gd/gd.c | 2 | ||||
| -rw-r--r-- | ext/gd/tests/bug74031.phpt | 10 |
3 files changed, 16 insertions, 0 deletions
@@ -6,6 +6,10 @@ PHP NEWS . Fixed bug #73807 (Performance problem with processing large post request). (Nikita) +- GD: + . Fixed bug #74031 (ReflectionFunction for imagepng is missing last two + parameters). (finwe) + - OpenSSL: . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file). (Anatol) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 72c0083cad..9d0dcca690 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -368,6 +368,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepng, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, to) + ZEND_ARG_INFO(0, quality) + ZEND_ARG_INFO(0, filters) ZEND_END_ARG_INFO() #endif diff --git a/ext/gd/tests/bug74031.phpt b/ext/gd/tests/bug74031.phpt new file mode 100644 index 0000000000..e5d6d7091e --- /dev/null +++ b/ext/gd/tests/bug74031.phpt @@ -0,0 +1,10 @@ +--TEST-- +(Bug #74031) ReflectionFunction for imagepng returns wrong number of parameters +--FILE-- +<?php + +$ref = new ReflectionFunction('imagepng'); +var_dump(count($ref->getParameters())); +?> +--EXPECT-- +int(4) |