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

Merge branch 'PHP-8.0'

* PHP-8.0:
  Use E_ERROR to report arginfo/zpp mismatch
  Make NumberFormatter ctor $pattern nullable
  Make IntlDateFormatter ctor $pattern nullable
---

9d54609a1907094643c6d26fe375058359f1b97e
diff --cc ext/intl/dateformat/dateformat_arginfo.h
index 65db5ecb95,8830fa615e..dd309dd34c
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@@ -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)
diff --cc ext/intl/formatter/formatter_arginfo.h
index c30f2ad215,a621605977..256ba0773a
--- a/ext/intl/formatter/formatter_arginfo.h
+++ b/ext/intl/formatter/formatter_arginfo.h
@@@ -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)
diff --cc ext/intl/php_intl_arginfo.h
index 6d52b53b57,351662024e..fc734d594e
--- a/ext/intl/php_intl_arginfo.h
+++ b/ext/intl/php_intl_arginfo.h
@@@ -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")