From 5a87705fda8a735b785e76ad02b136c1a798cdfa Mon Sep 17 00:00:00 2001 From: David Carlier Date: Tue, 28 Feb 2023 12:08:01 +0000 Subject: [PATCH] Fix GH-10727: Spoofchecker constant updates. - Adding MIXED_NUMBERS from ICU 58. - Adding HIDDEN_OVERLAY from ICU 62. --- UPGRADING | 4 ++++ ext/intl/spoofchecker/spoofchecker.stub.php | 12 ++++++++++++ ext/intl/spoofchecker/spoofchecker_arginfo.h | 18 +++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/UPGRADING b/UPGRADING index 98b9dabe4cba..cdada9e9b327 100644 --- a/UPGRADING +++ b/UPGRADING @@ -143,6 +143,10 @@ PHP 8.3 UPGRADE NOTES 10. New Global Constants ======================================== +- Intl: + . MIXED_NUMBERS (Spoofchecker). + . HIDDEN_OVERLAY (Spoofchecker). + - PCNTL: . SIGINFO diff --git a/ext/intl/spoofchecker/spoofchecker.stub.php b/ext/intl/spoofchecker/spoofchecker.stub.php index 71f6ad0f2e20..ed34b90da98f 100644 --- a/ext/intl/spoofchecker/spoofchecker.stub.php +++ b/ext/intl/spoofchecker/spoofchecker.stub.php @@ -71,6 +71,18 @@ class Spoofchecker * @cvalue USPOOF_SINGLE_SCRIPT_RESTRICTIVE */ public const SINGLE_SCRIPT_RESTRICTIVE = UNKNOWN; + /** + * @var int + * @cvalue USPOOF_MIXED_NUMBERS + */ + public const MIXED_NUMBERS = UNKNOWN; +#endif +#if U_ICU_VERSION_MAJOR_NUM >= 62 + /** + * @var int + * @cvalue USPOOF_HIDDEN_OVERLAY + */ + public const HIDDEN_OVERLAY = UNKNOWN; #endif public function __construct() {} diff --git a/ext/intl/spoofchecker/spoofchecker_arginfo.h b/ext/intl/spoofchecker/spoofchecker_arginfo.h index 98df10a3350a..4409a0aa3ec4 100644 --- a/ext/intl/spoofchecker/spoofchecker_arginfo.h +++ b/ext/intl/spoofchecker/spoofchecker_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: eb2f5a660053b4a38858045968b746bdb3be072e */ + * Stub hash: 6ebcb47ddc86a03b0543702b2529e05222a6ad93 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker___construct, 0, 0, 0) ZEND_END_ARG_INFO() @@ -149,6 +149,22 @@ static zend_class_entry *register_class_Spoofchecker(void) zend_declare_class_constant_ex(class_entry, const_SINGLE_SCRIPT_RESTRICTIVE_name, &const_SINGLE_SCRIPT_RESTRICTIVE_value, ZEND_ACC_PUBLIC, NULL); zend_string_release(const_SINGLE_SCRIPT_RESTRICTIVE_name); #endif +#if U_ICU_VERSION_MAJOR_NUM >= 58 + + zval const_MIXED_NUMBERS_value; + ZVAL_LONG(&const_MIXED_NUMBERS_value, USPOOF_MIXED_NUMBERS); + zend_string *const_MIXED_NUMBERS_name = zend_string_init_interned("MIXED_NUMBERS", sizeof("MIXED_NUMBERS") - 1, 1); + zend_declare_class_constant_ex(class_entry, const_MIXED_NUMBERS_name, &const_MIXED_NUMBERS_value, ZEND_ACC_PUBLIC, NULL); + zend_string_release(const_MIXED_NUMBERS_name); +#endif +#if U_ICU_VERSION_MAJOR_NUM >= 62 + + zval const_HIDDEN_OVERLAY_value; + ZVAL_LONG(&const_HIDDEN_OVERLAY_value, USPOOF_HIDDEN_OVERLAY); + zend_string *const_HIDDEN_OVERLAY_name = zend_string_init_interned("HIDDEN_OVERLAY", sizeof("HIDDEN_OVERLAY") - 1, 1); + zend_declare_class_constant_ex(class_entry, const_HIDDEN_OVERLAY_name, &const_HIDDEN_OVERLAY_value, ZEND_ACC_PUBLIC, NULL); + zend_string_release(const_HIDDEN_OVERLAY_name); +#endif return class_entry; }