Declare ext/intl constants in stubs - part 5

Author: kocsismate

ext/intl/config.m4

@@ -27,7 +27,6 @@ if test "$PHP_INTL" != "no"; then
     formatter/formatter_data.c \
     formatter/formatter_format.c \
     formatter/formatter_parse.c \
-    normalizer/normalizer.c \
     normalizer/normalizer_class.c \
     normalizer/normalizer_normalize.c \
     locale/locale.c \

ext/intl/config.w32

@@ -53,7 +53,6 @@ if (PHP_INTL != "no") {
                                 grapheme_string.c grapheme_util.c  \
                                 ", "intl");
 		ADD_SOURCES(configure_module_dirname + "/normalizer", "\
-				normalizer.c \
 				normalizer_class.c \
 				normalizer_normalize.c \
 				", "intl");

ext/intl/normalizer/normalizer.c

@@ -45,6 +45,4 @@
 #define NORMALIZER_DEFAULT NORMALIZER_FORM_C
 #endif
 
-void normalizer_register_constants( INIT_FUNC_ARGS );
-
 #endif // NORMALIZER_NORMALIZER_H

ext/intl/normalizer/normalizer.h

@@ -4,6 +4,59 @@
 
 class Normalizer
 {
+    /**
+     * @var int
+     * @cvalue NORMALIZER_FORM_D
+     */
+    public const FORM_D = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_NFD
+     */
+    public const NFD = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_FORM_KD
+     */
+    public const FORM_KD = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_NFKD
+     */
+    public const NFKD = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_FORM_C
+     */
+    public const FORM_C = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_NFC
+     */
+    public const NFC = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_FORM_KC
+     */
+    public const FORM_KC = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_NFKC
+     */
+    public const NFKC = UNKNOWN;
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+    /**
+     * @var int
+     * @cvalue NORMALIZER_FORM_KC_CF
+     */
+    public const FORM_KC_CF = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue NORMALIZER_NFKC_CF
+     */
+    public const NFKC_CF = UNKNOWN;
+#endif
+
     /**
      * @tentative-return-type
      * @alias normalizer_normalize

ext/intl/normalizer/normalizer.stub.php

@@ -12,6 +12,7 @@
    +----------------------------------------------------------------------+
  */
 
+#include "normalizer.h"
 #include "normalizer_class.h"
 #include "php_intl.h"
 #include "normalizer_arginfo.h"

ext/intl/normalizer/normalizer_arginfo.h

@@ -159,9 +159,6 @@ PHP_MINIT_FUNCTION( intl )
 	/* Register 'Normalizer' PHP class */
 	normalizer_register_Normalizer_class(  );
 
-	/* Expose Normalizer constants to PHP scripts */
-	normalizer_register_constants( INIT_FUNC_ARGS_PASSTHRU );
-
 	/* Register 'Locale' PHP class */
 	locale_register_Locale_class(  );