Skip to content

Commit ed0f1f0

Browse files
kocsismatekocsismate
authored
Declare ext/standard constants in stubs - part 8 (#9615)
1 parent bb79ef7 commit ed0f1f0

File tree

6 files changed

+179
-45
lines changed

6 files changed

+179
-45
lines changed

‎ext/standard/basic_functions.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
298298

299299
assertion_error_ce = register_class_AssertionError(zend_ce_error);
300300

301-
register_phpinfo_constants(INIT_FUNC_ARGS_PASSTHRU);
302-
register_html_constants(INIT_FUNC_ARGS_PASSTHRU);
303-
304301
BASIC_MINIT_SUBMODULE(var)
305302
BASIC_MINIT_SUBMODULE(file)
306303
BASIC_MINIT_SUBMODULE(pack)

‎ext/standard/basic_functions.stub.php

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,69 @@
425425
const DNS_ALL = UNKNOWN;
426426
#endif
427427

428+
/* html.c */
429+
430+
/**
431+
* @var int
432+
* @cvalue PHP_HTML_SPECIALCHARS
433+
*/
434+
const HTML_SPECIALCHARS = UNKNOWN;
435+
/**
436+
* @var int
437+
* @cvalue PHP_HTML_ENTITIES
438+
*/
439+
const HTML_ENTITIES = UNKNOWN;
440+
/**
441+
* @var int
442+
* @cvalue ENT_COMPAT
443+
*/
444+
const ENT_COMPAT = UNKNOWN;
445+
/**
446+
* @var int
447+
* @cvalue ENT_QUOTES
448+
*/
449+
const ENT_QUOTES = UNKNOWN;
450+
/**
451+
* @var int
452+
* @cvalue ENT_NOQUOTES
453+
*/
454+
const ENT_NOQUOTES = UNKNOWN;
455+
/**
456+
* @var int
457+
* @cvalue ENT_IGNORE
458+
*/
459+
const ENT_IGNORE = UNKNOWN;
460+
/**
461+
* @var int
462+
* @cvalue ENT_SUBSTITUTE
463+
*/
464+
const ENT_SUBSTITUTE = UNKNOWN;
465+
/**
466+
* @var int
467+
* @cvalue ENT_DISALLOWED
468+
*/
469+
const ENT_DISALLOWED = UNKNOWN;
470+
/**
471+
* @var int
472+
* @cvalue ENT_HTML401
473+
*/
474+
const ENT_HTML401 = UNKNOWN;
475+
/**
476+
* @var int
477+
* @cvalue ENT_XML1
478+
*/
479+
const ENT_XML1 = UNKNOWN;
480+
/**
481+
* @var int
482+
* @cvalue ENT_XHTML
483+
*/
484+
const ENT_XHTML = UNKNOWN;
485+
/**
486+
* @var int
487+
* @cvalue ENT_HTML5
488+
*/
489+
const ENT_HTML5 = UNKNOWN;
490+
428491
/* image.c */
429492

430493
/**
@@ -541,6 +604,89 @@
541604
*/
542605
const IMAGETYPE_COUNT = UNKNOWN;
543606

607+
/* info.c */
608+
609+
/**
610+
* @var int
611+
* @cvalue PHP_INFO_GENERAL
612+
*/
613+
const INFO_GENERAL = UNKNOWN;
614+
/**
615+
* @var int
616+
* @cvalue PHP_INFO_CREDITS
617+
*/
618+
const INFO_CREDITS = UNKNOWN;
619+
/**
620+
* @var int
621+
* @cvalue PHP_INFO_CONFIGURATION
622+
*/
623+
const INFO_CONFIGURATION = UNKNOWN;
624+
/**
625+
* @var int
626+
* @cvalue PHP_INFO_MODULES
627+
*/
628+
const INFO_MODULES = UNKNOWN;
629+
/**
630+
* @var int
631+
* @cvalue PHP_INFO_ENVIRONMENT
632+
*/
633+
const INFO_ENVIRONMENT = UNKNOWN;
634+
/**
635+
* @var int
636+
* @cvalue PHP_INFO_VARIABLES
637+
*/
638+
const INFO_VARIABLES = UNKNOWN;
639+
/**
640+
* @var int
641+
* @cvalue PHP_INFO_LICENSE
642+
*/
643+
const INFO_LICENSE = UNKNOWN;
644+
/**
645+
* @var int
646+
* @cvalue PHP_INFO_ALL
647+
*/
648+
const INFO_ALL = UNKNOWN;
649+
/**
650+
* @var int
651+
* @cvalue PHP_CREDITS_GROUP
652+
*/
653+
const CREDITS_GROUP = UNKNOWN;
654+
/**
655+
* @var int
656+
* @cvalue PHP_CREDITS_GENERAL
657+
*/
658+
const CREDITS_GENERAL = UNKNOWN;
659+
/**
660+
* @var int
661+
* @cvalue PHP_CREDITS_SAPI
662+
*/
663+
const CREDITS_SAPI = UNKNOWN;
664+
/**
665+
* @var int
666+
* @cvalue PHP_CREDITS_MODULES
667+
*/
668+
const CREDITS_MODULES = UNKNOWN;
669+
/**
670+
* @var int
671+
* @cvalue PHP_CREDITS_DOCS
672+
*/
673+
const CREDITS_DOCS = UNKNOWN;
674+
/**
675+
* @var int
676+
* @cvalue PHP_CREDITS_FULLPAGE
677+
*/
678+
const CREDITS_FULLPAGE = UNKNOWN;
679+
/**
680+
* @var int
681+
* @cvalue PHP_CREDITS_QA
682+
*/
683+
const CREDITS_QA = UNKNOWN;
684+
/**
685+
* @var int
686+
* @cvalue PHP_CREDITS_ALL
687+
*/
688+
const CREDITS_ALL = UNKNOWN;
689+
544690
/* syslog.c */
545691

546692
/* error levels */

‎ext/standard/basic_functions_arginfo.h

Lines changed: 29 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/standard/html.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,24 +1335,9 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
13351335
}
13361336
/* }}} */
13371337

1338-
#define HTML_SPECIALCHARS 0
1339-
#define HTML_ENTITIES 1
1340-
13411338
/* {{{ register_html_constants */
13421339
void register_html_constants(INIT_FUNC_ARGS)
13431340
{
1344-
REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS);
1345-
REGISTER_LONG_CONSTANT("HTML_ENTITIES", HTML_ENTITIES, CONST_PERSISTENT|CONST_CS);
1346-
REGISTER_LONG_CONSTANT("ENT_COMPAT", ENT_COMPAT, CONST_PERSISTENT|CONST_CS);
1347-
REGISTER_LONG_CONSTANT("ENT_QUOTES", ENT_QUOTES, CONST_PERSISTENT|CONST_CS);
1348-
REGISTER_LONG_CONSTANT("ENT_NOQUOTES", ENT_NOQUOTES, CONST_PERSISTENT|CONST_CS);
1349-
REGISTER_LONG_CONSTANT("ENT_IGNORE", ENT_IGNORE, CONST_PERSISTENT|CONST_CS);
1350-
REGISTER_LONG_CONSTANT("ENT_SUBSTITUTE", ENT_SUBSTITUTE, CONST_PERSISTENT|CONST_CS);
1351-
REGISTER_LONG_CONSTANT("ENT_DISALLOWED", ENT_DISALLOWED, CONST_PERSISTENT|CONST_CS);
1352-
REGISTER_LONG_CONSTANT("ENT_HTML401", ENT_HTML401, CONST_PERSISTENT|CONST_CS);
1353-
REGISTER_LONG_CONSTANT("ENT_XML1", ENT_XML1, CONST_PERSISTENT|CONST_CS);
1354-
REGISTER_LONG_CONSTANT("ENT_XHTML", ENT_XHTML, CONST_PERSISTENT|CONST_CS);
1355-
REGISTER_LONG_CONSTANT("ENT_HTML5", ENT_HTML5, CONST_PERSISTENT|CONST_CS);
13561341
}
13571342
/* }}} */
13581343

@@ -1467,7 +1452,7 @@ static inline void write_s3row_data(
14671452
/* {{{ Returns the internal translation table used by htmlspecialchars and htmlentities */
14681453
PHP_FUNCTION(get_html_translation_table)
14691454
{
1470-
zend_long all = HTML_SPECIALCHARS,
1455+
zend_long all = PHP_HTML_SPECIALCHARS,
14711456
flags = ENT_QUOTES|ENT_SUBSTITUTE;
14721457
int doctype;
14731458
entity_table_opt entity_table;
@@ -1498,7 +1483,7 @@ PHP_FUNCTION(get_html_translation_table)
14981483
to_uni_table = enc_to_uni_index[charset];
14991484
}
15001485

1501-
if (all) { /* HTML_ENTITIES (actually, any non-zero value for 1st param) */
1486+
if (all) { /* PHP_HTML_ENTITIES (actually, any non-zero value for 1st param) */
15021487
const entity_stage1_row *ms_table = entity_table.ms_table;
15031488

15041489
if (CHARSET_UNICODE_COMPAT(charset)) {

‎ext/standard/html.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
/* reserve bit 6 */
3131
#define ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS 128
3232

33+
#define PHP_HTML_SPECIALCHARS 0
34+
#define PHP_HTML_ENTITIES 1
3335

3436
#define ENT_COMPAT ENT_HTML_QUOTE_DOUBLE
3537
#define ENT_QUOTES (ENT_HTML_QUOTE_DOUBLE | ENT_HTML_QUOTE_SINGLE)
@@ -42,8 +44,6 @@
4244
#define ENT_HTML5 (16|32)
4345
#define ENT_DISALLOWED 128
4446

45-
void register_html_constants(INIT_FUNC_ARGS);
46-
4747
PHPAPI zend_string *php_escape_html_entities(const unsigned char *old, size_t oldlen, int all, int flags, const char *hint_charset);
4848
PHPAPI zend_string *php_escape_html_entities_ex(const unsigned char *old, size_t oldlen, int all, int flags, const char *hint_charset, bool double_encode, bool quiet);
4949
PHPAPI zend_string *php_unescape_html_entities(zend_string *str, int all, int flags, const char *hint_charset);

‎ext/standard/info.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,28 +1243,6 @@ PHPAPI ZEND_COLD void php_info_print_table_row_ex(int num_cols, const char *valu
12431243
}
12441244
/* }}} */
12451245

1246-
/* {{{ register_phpinfo_constants */
1247-
void register_phpinfo_constants(INIT_FUNC_ARGS)
1248-
{
1249-
REGISTER_LONG_CONSTANT("INFO_GENERAL", PHP_INFO_GENERAL, CONST_PERSISTENT|CONST_CS);
1250-
REGISTER_LONG_CONSTANT("INFO_CREDITS", PHP_INFO_CREDITS, CONST_PERSISTENT|CONST_CS);
1251-
REGISTER_LONG_CONSTANT("INFO_CONFIGURATION", PHP_INFO_CONFIGURATION, CONST_PERSISTENT|CONST_CS);
1252-
REGISTER_LONG_CONSTANT("INFO_MODULES", PHP_INFO_MODULES, CONST_PERSISTENT|CONST_CS);
1253-
REGISTER_LONG_CONSTANT("INFO_ENVIRONMENT", PHP_INFO_ENVIRONMENT, CONST_PERSISTENT|CONST_CS);
1254-
REGISTER_LONG_CONSTANT("INFO_VARIABLES", PHP_INFO_VARIABLES, CONST_PERSISTENT|CONST_CS);
1255-
REGISTER_LONG_CONSTANT("INFO_LICENSE", PHP_INFO_LICENSE, CONST_PERSISTENT|CONST_CS);
1256-
REGISTER_LONG_CONSTANT("INFO_ALL", PHP_INFO_ALL, CONST_PERSISTENT|CONST_CS);
1257-
REGISTER_LONG_CONSTANT("CREDITS_GROUP", PHP_CREDITS_GROUP, CONST_PERSISTENT|CONST_CS);
1258-
REGISTER_LONG_CONSTANT("CREDITS_GENERAL", PHP_CREDITS_GENERAL, CONST_PERSISTENT|CONST_CS);
1259-
REGISTER_LONG_CONSTANT("CREDITS_SAPI", PHP_CREDITS_SAPI, CONST_PERSISTENT|CONST_CS);
1260-
REGISTER_LONG_CONSTANT("CREDITS_MODULES", PHP_CREDITS_MODULES, CONST_PERSISTENT|CONST_CS);
1261-
REGISTER_LONG_CONSTANT("CREDITS_DOCS", PHP_CREDITS_DOCS, CONST_PERSISTENT|CONST_CS);
1262-
REGISTER_LONG_CONSTANT("CREDITS_FULLPAGE", PHP_CREDITS_FULLPAGE, CONST_PERSISTENT|CONST_CS);
1263-
REGISTER_LONG_CONSTANT("CREDITS_QA", PHP_CREDITS_QA, CONST_PERSISTENT|CONST_CS);
1264-
REGISTER_LONG_CONSTANT("CREDITS_ALL", PHP_CREDITS_ALL, CONST_PERSISTENT|CONST_CS);
1265-
}
1266-
/* }}} */
1267-
12681246
/* {{{ Output a page of useful information about PHP and the current request */
12691247
PHP_FUNCTION(phpinfo)
12701248
{

0 commit comments

Comments
 (0)