From 8782249e9e7673b5e7318990a0b95f91453ac31d Mon Sep 17 00:00:00 2001
From: bogdanungureanu <bogdanungureanu21@gmail.com>
Date: Wed, 5 Mar 2025 13:04:09 +0200
Subject: [PATCH] Add DECIMAL_COMPACT_SHORT and DECIMAL_COMPACT_LONG for
 NumberFormatter class

---
 ext/intl/formatter/formatter.stub.php         |  4 ++
 ext/intl/formatter/formatter_arginfo.h        | 14 ++++-
 .../formatter_format_decimal_compact.phpt     | 57 +++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 ext/intl/tests/formatter_format_decimal_compact.phpt

diff --git a/ext/intl/formatter/formatter.stub.php b/ext/intl/formatter/formatter.stub.php
index e335698688d64..4445005c41705 100644
--- a/ext/intl/formatter/formatter.stub.php
+++ b/ext/intl/formatter/formatter.stub.php
@@ -11,6 +11,10 @@ class NumberFormatter
     public const int PATTERN_DECIMAL = UNKNOWN;
     /** @cvalue UNUM_DECIMAL */
     public const int DECIMAL = UNKNOWN;
+    /** @cvalue UNUM_DECIMAL_COMPACT_SHORT */
+    public const int DECIMAL_COMPACT_SHORT = UNKNOWN;
+    /** @cvalue UNUM_DECIMAL_COMPACT_LONG */
+    public const int DECIMAL_COMPACT_LONG = UNKNOWN;
     /** @cvalue UNUM_CURRENCY */
     public const int CURRENCY = UNKNOWN;
     /** @cvalue UNUM_PERCENT */
diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h
index 0e3d8b797e721..c7fd28c3a9f77 100644
--- a/ext/intl/formatter/formatter_arginfo.h
+++ b/ext/intl/formatter/formatter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: caaa6ff408bfd88ec9bb998ffd753f4de971ccff */
+ * Stub hash: 05ab9fb3ba33163b2100e2773d70f67e110ecefc */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -137,6 +137,18 @@ static zend_class_entry *register_class_NumberFormatter(void)
 	zend_declare_typed_class_constant(class_entry, const_DECIMAL_name, &const_DECIMAL_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
 	zend_string_release(const_DECIMAL_name);
 
+	zval const_DECIMAL_COMPACT_SHORT_value;
+	ZVAL_LONG(&const_DECIMAL_COMPACT_SHORT_value, UNUM_DECIMAL_COMPACT_SHORT);
+	zend_string *const_DECIMAL_COMPACT_SHORT_name = zend_string_init_interned("DECIMAL_COMPACT_SHORT", sizeof("DECIMAL_COMPACT_SHORT") - 1, 1);
+	zend_declare_typed_class_constant(class_entry, const_DECIMAL_COMPACT_SHORT_name, &const_DECIMAL_COMPACT_SHORT_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
+	zend_string_release(const_DECIMAL_COMPACT_SHORT_name);
+
+	zval const_DECIMAL_COMPACT_LONG_value;
+	ZVAL_LONG(&const_DECIMAL_COMPACT_LONG_value, UNUM_DECIMAL_COMPACT_LONG);
+	zend_string *const_DECIMAL_COMPACT_LONG_name = zend_string_init_interned("DECIMAL_COMPACT_LONG", sizeof("DECIMAL_COMPACT_LONG") - 1, 1);
+	zend_declare_typed_class_constant(class_entry, const_DECIMAL_COMPACT_LONG_name, &const_DECIMAL_COMPACT_LONG_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
+	zend_string_release(const_DECIMAL_COMPACT_LONG_name);
+
 	zval const_CURRENCY_value;
 	ZVAL_LONG(&const_CURRENCY_value, UNUM_CURRENCY);
 	zend_string *const_CURRENCY_name = zend_string_init_interned("CURRENCY", sizeof("CURRENCY") - 1, 1);
diff --git a/ext/intl/tests/formatter_format_decimal_compact.phpt b/ext/intl/tests/formatter_format_decimal_compact.phpt
new file mode 100644
index 0000000000000..2c78f8787e0f4
--- /dev/null
+++ b/ext/intl/tests/formatter_format_decimal_compact.phpt
@@ -0,0 +1,57 @@
+--TEST--
+numfmt_format_currency() icu >= 4.8
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+
+function ut_main()
+{
+    $locales = array(
+        'en_UK',
+        'en_US',
+        'ru',
+        'zh_CN',
+        'ro',
+        'uk',
+        'en',
+        'bg'
+    );
+
+    $number = 1234567.89;
+
+    $res_str = '';
+    foreach( $locales as $locale )
+    {
+        $fmt = ut_nfmt_create( $locale, NumberFormatter::DECIMAL_COMPACT_SHORT );
+        $res_str .= "$locale: short = " . ut_nfmt_format ($fmt, $number) . "\n";
+
+        $fmt = ut_nfmt_create( $locale, NumberFormatter::DECIMAL_COMPACT_LONG );
+        $res_str .= "$locale: long = " . ut_nfmt_format ($fmt, $number) . "\n";
+    }
+    return $res_str;
+}
+
+include_once( 'ut_common.inc' );
+
+// Run the test
+ut_run();
+
+?>
+--EXPECTF--
+en_UK: short = 1.2M
+en_UK: long = 1.2 million
+en_US: short = 1.2M
+en_US: long = 1.2 million
+ru: short = 1,2 млн
+ru: long = 1,2 миллиона
+zh_CN: short = 123万
+zh_CN: long = 123万
+ro: short = 1,2 mil.
+ro: long = 1,2 milioane
+uk: short = 1,2 млн
+uk: long = 1,2 мільйона
+en: short = 1.2M
+en: long = 1.2 million
+bg: short = 1,2 млн.
+bg: long = 1,2 милиона
\ No newline at end of file