Skip to content

Declare ext/intl constants in stubs - part 5 #9267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Declare ext/intl constants in stubs - part 5 #9267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ext/intl/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion ext/intl/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
60 changes: 0 additions & 60 deletions ext/intl/normalizer/normalizer.c
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ext/intl/normalizer/normalizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,4 @@
#define NORMALIZER_DEFAULT NORMALIZER_FORM_C
#endif

void normalizer_register_constants( INIT_FUNC_ARGS );

#endif // NORMALIZER_NORMALIZER_H
53 changes: 53 additions & 0 deletions ext/intl/normalizer/normalizer.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
66 changes: 65 additions & 1 deletion ext/intl/normalizer/normalizer_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ext/intl/normalizer/normalizer_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
+----------------------------------------------------------------------+
*/

#include "normalizer.h"
#include "normalizer_class.h"
#include "php_intl.h"
#include "normalizer_arginfo.h"
Expand Down
4 changes: 0 additions & 4 deletions ext/intl/php_intl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

#include "msgformat/msgformat_class.h"

#include "normalizer/normalizer.h"
#include "normalizer/normalizer_class.h"

#include "locale/locale.h"
Expand Down Expand Up @@ -159,9 +158,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( );

Expand Down