From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 9 Feb 2021 14:19:56 +0000 (+0100)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=550aee0be3bf256fc1dec5409ad1262c96b23147;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Properly check imagegd() signature
  Make imagegd $file parameter nullable
---

550aee0be3bf256fc1dec5409ad1262c96b23147
diff --cc ext/gd/gd_arginfo.h
index de974fc7d7,4baeccace3..5a3f12f519
--- a/ext/gd/gd_arginfo.h
+++ b/ext/gd/gd_arginfo.h
@@@ -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()