Stdlib: IntlListFormatter on PROFILE=8.5 (#23229)

ext/intl/BuiltinClasses.php

@@ -12,10 +12,10 @@
  * Register intl builtin classes (php-src ext/intl/php_intl.c; issues #5774, #6696, #19549, #6151, #19670).
  *
  * Locale / IntlDateFormatter / IntlDatePatternGenerator / IntlCalendar / IntlTimeZone /
- * NumberFormatter / Normalizer / Collator / MessageFormatter / Transliterator / ResourceBundle /
- * IntlBreakIterator / IntlCodePointBreakIterator / IntlChar / UConverter / Spoofchecker / IntlException
- * all gate on {@see IntlExtensionPolicy} advertisement (no phantom class_exists; #6366, #6171, #6139,
- * #6188, #20035, #20740, #20822).
+ * NumberFormatter / Normalizer / Collator / MessageFormatter / IntlListFormatter /
+ * Transliterator / ResourceBundle / IntlBreakIterator / IntlCodePointBreakIterator /
+ * IntlChar / UConverter / Spoofchecker / IntlException all gate on {@see IntlExtensionPolicy}
+ * advertisement (no phantom class_exists; #6366, #6171, #6139, #6188, #20035, #20740, #20822, #23229).
  */
 final class BuiltinClasses
 {
@@ -69,6 +69,9 @@ public static function register(Context $ctx): void
         VmNumberFormatter::registerClass($ctx);
         VmCollator::registerClass($ctx);
         VmMessageFormatter::registerClass($ctx);
+        if (IntlExtensionPolicy::advertisesIntlListFormatter()) {
+            VmIntlListFormatter::registerClass($ctx);
+        }
         VmTransliterator::registerClass($ctx);
         VmResourceBundle::registerClass($ctx);
         VmBreakIterator::registerClass($ctx);
@@ -259,6 +262,17 @@ public static function registerMessageFormatter(Context $ctx): void
         }
     }
 
+    /** IntlListFormatter — PHP 8.5+ + host intl (#23229). */
+    public static function registerIntlListFormatter(Context $ctx): void
+    {
+        $before = array_keys($ctx->classes);
+        VmIntlListFormatter::registerClass($ctx);
+        self::registerIntlException($ctx);
+        foreach (array_diff(array_keys($ctx->classes), $before) as $lc) {
+            $ctx->classes[$lc]->isInternal = true;
+        }
+    }
+
     public static function registerTransliterator(Context $ctx): void
     {
         $before = array_keys($ctx->classes);

ext/intl/IntlExtensionPolicy.php

@@ -211,6 +211,17 @@ public static function advertisesMessageFormatter(): bool
         return self::advertisesBuiltins();
     }
 
+    /**
+     * IntlListFormatter — PHP 8.5+ + loaded ext/intl (php-src ext/intl/listformatter; #23229).
+     *
+     * Withheld when host intl is off or language profile < 8.5 (no phantom class_exists).
+     */
+    public static function advertisesIntlListFormatter(): bool
+    {
+        return self::advertisesBuiltins()
+            && CompilerVersion::advertisesIntlListFormatter();
+    }
+
     /**
      * Transliterator / transliterator_* — require loaded ext/intl (php-src transliterator; #6139, #19670).
      */

ext/intl/IntlSerializeDeny.php

@@ -12,6 +12,7 @@
  * - NumberFormatter — ext/intl/formatter/formatter.stub.php (#23092)
  * - Collator — ext/intl/collator/collator.stub.php (#23092)
  * - MessageFormatter — ext/intl/msgformat/msgformat.stub.php (#23092)
+ * - IntlListFormatter — ext/intl/listformatter/listformatter.stub.php (#23229)
  * - ResourceBundle — ext/intl/resourcebundle/resourcebundle.stub.php (#23092)
  * - IntlCalendar / IntlGregorianCalendar (+ subclasses) — ext/intl/calendar/calendar.stub.php (#23092)
  * - Transliterator — ext/intl/transliterator/transliterator.stub.php (#23136)
@@ -28,6 +29,7 @@ final class IntlSerializeDeny
         VmNumberFormatter::CLASS_LC,
         VmCollator::CLASS_LC,
         VmMessageFormatter::CLASS_LC,
+        VmIntlListFormatter::CLASS_LC,
         VmResourceBundle::CLASS_LC,
         VmIntlCalendar::CLASS_LC,
         VmIntlCalendar::GREGORIAN_CLASS_LC,

ext/intl/Module.php

@@ -60,6 +60,9 @@ public function init(Runtime $runtime): void
         if (IntlExtensionPolicy::advertisesMessageFormatter()) {
             BuiltinClasses::registerMessageFormatter($runtime->vmContext);
         }
+        if (IntlExtensionPolicy::advertisesIntlListFormatter()) {
+            BuiltinClasses::registerIntlListFormatter($runtime->vmContext);
+        }
         if (IntlExtensionPolicy::advertisesTransliterator()) {
             BuiltinClasses::registerTransliterator($runtime->vmContext);
         }