]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Feb 2021 11:57:58 +0000 (12:57 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Feb 2021 11:57:58 +0000 (12:57 +0100)
* PHP-8.0:
  Make Phar $fileNotFoundScript nullable

1  2 
ext/phar/phar_object.c
ext/phar/phar_object.stub.php
ext/phar/phar_object_arginfo.h

Simple merge
Simple merge
index 1e91c2f1a0a41f7b85708c1cf2eb4709c6ece050,ade8f874abae9e4d508016cb1da84d6b6eb12c3c..3858271c8e646a6d14b82883173830e1362b70b5
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 96900fb403c625ad76b86bac37aed65722472f84 */
 - * Stub hash: a8562e63010e127aadb97134733ac328ced3c7bf */
++ * Stub hash: bad833e724b1ebface8e8331310ecf7c32a52898 */
  
  ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar___construct, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)