]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Feb 2021 13:37:41 +0000 (14:37 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Feb 2021 13:37:41 +0000 (14:37 +0100)
* PHP-8.0:
  Use E_ERROR to report arginfo/zpp mismatch
  Make NumberFormatter ctor $pattern nullable
  Make IntlDateFormatter ctor $pattern nullable

1  2 
Zend/zend_execute.c
ext/intl/dateformat/dateformat.stub.php
ext/intl/dateformat/dateformat_arginfo.h
ext/intl/formatter/formatter.stub.php
ext/intl/formatter/formatter_arginfo.h
ext/intl/php_intl.stub.php
ext/intl/php_intl_arginfo.h

Simple merge
index 65db5ecb95e6230f565dfe51f14561de5de0530a,8830fa615e8018562ad0068d552b833b1a06ba4c..dd309dd34c1a14297562dd71bc1f759ee62efeb3
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 4f93c3fca18c225b26dec1e970b783baa4622425 */
 - * Stub hash: faeef90c9c1324c6a25f0df36c7239ddc2b43ee4 */
++ * Stub hash: a83ee23ab33293a878280f137260da9f8914218a */
  
  ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 3)
        ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
Simple merge
index c30f2ad215cf8b995cc929fa85ec32aa8537c760,a62160597737bce1d89934d1c5ab443021d3bff8..256ba0773af7d44ce239ffc072f1c276e06a0a66
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 2a232c97981e23bec14f03e564a7ec3d7fedc31e */
 - * Stub hash: de7625297bcdb8c7e4944a319c019ed68508ea2c */
++ * Stub hash: 4fa61766d54f40d3295da0992b16e08ede9aaab1 */
  
  ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
        ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
Simple merge
index 6d52b53b5738acbf762d80799443459e6953e383,351662024eeb576c0aed3a44d2785683b796744d..fc734d594ecc9e47a090e0cbdca66abf9d42858b
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 9ddf3e4e42735c34a8b53a1856d6dc93346afc6f */
 - * Stub hash: fb91064c471d6bced3a6dad8beb56c92c9047e52 */
++ * Stub hash: 9d6b4d36a39e4bb346ea0d45d4be8c941070bd67 */
  
  ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
        ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")