]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Feb 2021 14:19:56 +0000 (15:19 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Feb 2021 14:19:56 +0000 (15:19 +0100)
* PHP-8.0:
  Properly check imagegd() signature
  Make imagegd $file parameter nullable

1  2 
ext/gd/gd.c
ext/gd/gd.stub.php
ext/gd/gd_arginfo.h

diff --cc ext/gd/gd.c
Simple merge
Simple merge
index de974fc7d79771a5868ce725a557aa4b28422038,4baeccace3583d152b418880f4bf82e64dd0df93..5a3f12f519b445653ea8c0e2d9d1568b506589d7
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: e5688b77ea52f6df10e3335594d9fc1956c10c34 */
 - * Stub hash: 63898b501cc3ae38585fe0c6f70a9f7865fbee4d */
++ * Stub hash: 884e30d9f263c5873d15cec9c2d2f1fef5b75fe6 */
  
  ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0)
  ZEND_END_ARG_INFO()