]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 17 Mar 2021 14:06:46 +0000 (15:06 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 17 Mar 2021 14:06:46 +0000 (15:06 +0100)
* PHP-8.0:
  Return bool from imageinterlace()

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 92aeba77162f84ea12e2278572bb23fbd1ab7bb2,ffa8b5565cd7a94ee88ec8ad6897e967ae4239bd..fdc509901c7cd2f0fb7d7fd04418dc4a680a6bdd
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 884e30d9f263c5873d15cec9c2d2f1fef5b75fe6 */
 - * Stub hash: 155175c4f5b60aaed37df2210ae6a5e7f979dae2 */
++ * Stub hash: a2e5f8b612433e77d623bbab6b1d3d32fca7966c */
  
  ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0)
  ZEND_END_ARG_INFO()