Declare ext/intl constants in stubs - part 7 (#9269)

kocsismate · web-flow · commit 8fee9a3f1118 · 2022-08-08T14:24:22.000+02:00
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
@@ -49,7 +49,6 @@ if test "$PHP_INTL" != "no"; then
     resourcebundle/resourcebundle.c \
     resourcebundle/resourcebundle_class.c \
     resourcebundle/resourcebundle_iterator.c \
-    transliterator/transliterator.c \
     transliterator/transliterator_class.c \
     transliterator/transliterator_methods.c \
     uchar/uchar.c \
diff --git a/ext/intl/config.w32 b/ext/intl/config.w32
@@ -91,7 +91,6 @@ if (PHP_INTL != "no") {
 		}
 
 		ADD_SOURCES(configure_module_dirname + "/transliterator", "\
-				transliterator.c \
 				transliterator_class.c \
 				transliterator_methods.c",
 				"intl");
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
@@ -176,9 +176,6 @@ PHP_MINIT_FUNCTION( intl )
 	/* Register 'Transliterator' PHP class */
 	transliterator_register_Transliterator_class(  );
 
-	/* Register Transliterator constants */
-	transliterator_register_constants( INIT_FUNC_ARGS_PASSTHRU );
-
 	/* Register 'IntlTimeZone' PHP class */
 	timezone_register_IntlTimeZone_class(  );
 
diff --git a/ext/intl/transliterator/transliterator.c b/ext/intl/transliterator/transliterator.c
diff --git a/ext/intl/transliterator/transliterator.h b/ext/intl/transliterator/transliterator.h
@@ -16,12 +16,10 @@
 #define TRANSLITERATOR_TRANSLITERATOR_H
 
 #include <php.h>
-#include <unicode/utypes.h>
 #include <unicode/utrans.h>
 
 #include "zend_smart_str.h"
 
-void transliterator_register_constants( INIT_FUNC_ARGS );
 smart_str transliterator_parse_error_to_string( UParseError* pe );
 
 #endif /* #ifndef TRANSLITERATOR_TRANSLITERATOR_H */
diff --git a/ext/intl/transliterator/transliterator.stub.php b/ext/intl/transliterator/transliterator.stub.php
@@ -5,6 +5,17 @@
 /** @not-serializable */
 class Transliterator
 {
+    /**
+     * @var int
+     * @cvalue TRANSLITERATOR_FORWARD
+     */
+    public const FORWARD = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue TRANSLITERATOR_REVERSE
+     */
+    public const REVERSE = UNKNOWN;
+
     public readonly string $id;
 
     final private function __construct() {}
diff --git a/ext/intl/transliterator/transliterator_arginfo.h b/ext/intl/transliterator/transliterator_arginfo.h
diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c
@@ -188,8 +188,5 @@ void transliterator_register_Transliterator_class( void )
 	Transliterator_handlers.offset = XtOffsetOf(Transliterator_object, zo);
 	Transliterator_handlers.free_obj = Transliterator_objects_free;
 	Transliterator_handlers.clone_obj = Transliterator_clone_obj;
-
-	/* constants are declared in transliterator_register_constants, called from MINIT */
-
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@ if (PHP_INTL != "no") {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`ADD_SOURCES(configure_module_dirname + "/transliterator", "\`
`94`		`- transliterator.c \`
`95`	`94`	`transliterator_class.c \`
`96`	`95`	`transliterator_methods.c",`
`97`	`96`	`"intl");`
Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,5 @@ void transliterator_register_Transliterator_class( void )`
`188`	`188`	`Transliterator_handlers.offset = XtOffsetOf(Transliterator_object, zo);`
`189`	`189`	`Transliterator_handlers.free_obj = Transliterator_objects_free;`
`190`	`190`	`Transliterator_handlers.clone_obj = Transliterator_clone_obj;`
`191`		`-`
`192`		`- /* constants are declared in transliterator_register_constants, called from MINIT */`
`193`		`-`
`194`	`191`	`}`
`195`	`192`	`/* }}} */`