Skip to content

Commit 867c514

Browse files
kocsismatekocsismate
authored
Declare ext/xml constants in stubs (#9131)
1 parent f4b5051 commit 867c514

File tree

4 files changed

+171
-36
lines changed

4 files changed

+171
-36
lines changed

‎ext/xml/php_xml.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,11 @@ extern zend_module_entry xml_module_entry;
3939

4040
#define phpext_xml_ptr xml_module_ptr
4141

42+
enum php_xml_option {
43+
PHP_XML_OPTION_CASE_FOLDING = 1,
44+
PHP_XML_OPTION_TARGET_ENCODING,
45+
PHP_XML_OPTION_SKIP_TAGSTART,
46+
PHP_XML_OPTION_SKIP_WHITE
47+
};
48+
4249
#endif /* PHP_XML_H */

‎ext/xml/xml.c‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@ typedef struct {
121121
unsigned short (*encoding_function)(unsigned char);
122122
} xml_encoding;
123123

124-
125-
enum php_xml_option {
126-
PHP_XML_OPTION_CASE_FOLDING = 1,
127-
PHP_XML_OPTION_TARGET_ENCODING,
128-
PHP_XML_OPTION_SKIP_TAGSTART,
129-
PHP_XML_OPTION_SKIP_WHITE
130-
};
131-
132124
/* {{{ dynamically loadable module stuff */
133125
#ifdef COMPILE_DL_XML
134126
#ifdef ZTS
@@ -262,33 +254,7 @@ PHP_MINIT_FUNCTION(xml)
262254
xml_parser_object_handlers.clone_obj = NULL;
263255
xml_parser_object_handlers.compare = zend_objects_not_comparable;
264256

265-
REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT);
266-
REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT);
267-
REGISTER_LONG_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT);
268-
REGISTER_LONG_CONSTANT("XML_ERROR_NO_ELEMENTS", XML_ERROR_NO_ELEMENTS, CONST_CS|CONST_PERSISTENT);
269-
REGISTER_LONG_CONSTANT("XML_ERROR_INVALID_TOKEN", XML_ERROR_INVALID_TOKEN, CONST_CS|CONST_PERSISTENT);
270-
REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_TOKEN", XML_ERROR_UNCLOSED_TOKEN, CONST_CS|CONST_PERSISTENT);
271-
REGISTER_LONG_CONSTANT("XML_ERROR_PARTIAL_CHAR", XML_ERROR_PARTIAL_CHAR, CONST_CS|CONST_PERSISTENT);
272-
REGISTER_LONG_CONSTANT("XML_ERROR_TAG_MISMATCH", XML_ERROR_TAG_MISMATCH, CONST_CS|CONST_PERSISTENT);
273-
REGISTER_LONG_CONSTANT("XML_ERROR_DUPLICATE_ATTRIBUTE", XML_ERROR_DUPLICATE_ATTRIBUTE, CONST_CS|CONST_PERSISTENT);
274-
REGISTER_LONG_CONSTANT("XML_ERROR_JUNK_AFTER_DOC_ELEMENT", XML_ERROR_JUNK_AFTER_DOC_ELEMENT, CONST_CS|CONST_PERSISTENT);
275-
REGISTER_LONG_CONSTANT("XML_ERROR_PARAM_ENTITY_REF", XML_ERROR_PARAM_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
276-
REGISTER_LONG_CONSTANT("XML_ERROR_UNDEFINED_ENTITY", XML_ERROR_UNDEFINED_ENTITY, CONST_CS|CONST_PERSISTENT);
277-
REGISTER_LONG_CONSTANT("XML_ERROR_RECURSIVE_ENTITY_REF", XML_ERROR_RECURSIVE_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
278-
REGISTER_LONG_CONSTANT("XML_ERROR_ASYNC_ENTITY", XML_ERROR_ASYNC_ENTITY, CONST_CS|CONST_PERSISTENT);
279-
REGISTER_LONG_CONSTANT("XML_ERROR_BAD_CHAR_REF", XML_ERROR_BAD_CHAR_REF, CONST_CS|CONST_PERSISTENT);
280-
REGISTER_LONG_CONSTANT("XML_ERROR_BINARY_ENTITY_REF", XML_ERROR_BINARY_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
281-
REGISTER_LONG_CONSTANT("XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF", XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
282-
REGISTER_LONG_CONSTANT("XML_ERROR_MISPLACED_XML_PI", XML_ERROR_MISPLACED_XML_PI, CONST_CS|CONST_PERSISTENT);
283-
REGISTER_LONG_CONSTANT("XML_ERROR_UNKNOWN_ENCODING", XML_ERROR_UNKNOWN_ENCODING, CONST_CS|CONST_PERSISTENT);
284-
REGISTER_LONG_CONSTANT("XML_ERROR_INCORRECT_ENCODING", XML_ERROR_INCORRECT_ENCODING, CONST_CS|CONST_PERSISTENT);
285-
REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT);
286-
REGISTER_LONG_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT);
287-
288-
REGISTER_LONG_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT);
289-
REGISTER_LONG_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT);
290-
REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT);
291-
REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT);
257+
register_xml_symbols(module_number);
292258

293259
/* this object should not be pre-initialised at compile time,
294260
as the order of members may vary */

‎ext/xml/xml.stub.php‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,138 @@
22

33
/** @generate-class-entries */
44

5+
/**
6+
* @var int
7+
* @cvalue XML_ERROR_NONE
8+
*/
9+
const XML_ERROR_NONE = UNKNOWN;
10+
/**
11+
* @var int
12+
* @cvalue XML_ERROR_NO_MEMORY
13+
*/
14+
const XML_ERROR_NO_MEMORY = UNKNOWN;
15+
/**
16+
* @var int
17+
* @cvalue XML_ERROR_SYNTAX
18+
*/
19+
const XML_ERROR_SYNTAX = UNKNOWN;
20+
/**
21+
* @var int
22+
* @cvalue XML_ERROR_NO_ELEMENTS
23+
*/
24+
const XML_ERROR_NO_ELEMENTS = UNKNOWN;
25+
/**
26+
* @var int
27+
* @cvalue XML_ERROR_INVALID_TOKEN
28+
*/
29+
const XML_ERROR_INVALID_TOKEN = UNKNOWN;
30+
/**
31+
* @var int
32+
* @cvalue XML_ERROR_UNCLOSED_TOKEN
33+
*/
34+
const XML_ERROR_UNCLOSED_TOKEN = UNKNOWN;
35+
/**
36+
* @var int
37+
* @cvalue XML_ERROR_PARTIAL_CHAR
38+
*/
39+
const XML_ERROR_PARTIAL_CHAR = UNKNOWN;
40+
/**
41+
* @var int
42+
* @cvalue XML_ERROR_TAG_MISMATCH
43+
*/
44+
const XML_ERROR_TAG_MISMATCH = UNKNOWN;
45+
/**
46+
* @var int
47+
* @cvalue XML_ERROR_DUPLICATE_ATTRIBUTE
48+
*/
49+
const XML_ERROR_DUPLICATE_ATTRIBUTE = UNKNOWN;
50+
/**
51+
* @var int
52+
* @cvalue XML_ERROR_JUNK_AFTER_DOC_ELEMENT
53+
*/
54+
const XML_ERROR_JUNK_AFTER_DOC_ELEMENT = UNKNOWN;
55+
/**
56+
* @var int
57+
* @cvalue XML_ERROR_PARAM_ENTITY_REF
58+
*/
59+
const XML_ERROR_PARAM_ENTITY_REF = UNKNOWN;
60+
/**
61+
* @var int
62+
* @cvalue XML_ERROR_UNDEFINED_ENTITY
63+
*/
64+
const XML_ERROR_UNDEFINED_ENTITY = UNKNOWN;
65+
/**
66+
* @var int
67+
* @cvalue XML_ERROR_RECURSIVE_ENTITY_REF
68+
*/
69+
const XML_ERROR_RECURSIVE_ENTITY_REF = UNKNOWN;
70+
/**
71+
* @var int
72+
* @cvalue XML_ERROR_ASYNC_ENTITY
73+
*/
74+
const XML_ERROR_ASYNC_ENTITY = UNKNOWN;
75+
/**
76+
* @var int
77+
* @cvalue XML_ERROR_BAD_CHAR_REF
78+
*/
79+
const XML_ERROR_BAD_CHAR_REF = UNKNOWN;
80+
/**
81+
* @var int
82+
* @cvalue XML_ERROR_BINARY_ENTITY_REF
83+
*/
84+
const XML_ERROR_BINARY_ENTITY_REF = UNKNOWN;
85+
/**
86+
* @var int
87+
* @cvalue XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF
88+
*/
89+
const XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF = UNKNOWN;
90+
/**
91+
* @var int
92+
* @cvalue XML_ERROR_MISPLACED_XML_PI
93+
*/
94+
const XML_ERROR_MISPLACED_XML_PI = UNKNOWN;
95+
/**
96+
* @var int
97+
* @cvalue XML_ERROR_UNKNOWN_ENCODING
98+
*/
99+
const XML_ERROR_UNKNOWN_ENCODING = UNKNOWN;
100+
/**
101+
* @var int
102+
* @cvalue XML_ERROR_INCORRECT_ENCODING
103+
*/
104+
const XML_ERROR_INCORRECT_ENCODING = UNKNOWN;
105+
/**
106+
* @var int
107+
* @cvalue XML_ERROR_UNCLOSED_CDATA_SECTION
108+
*/
109+
const XML_ERROR_UNCLOSED_CDATA_SECTION = UNKNOWN;
110+
/**
111+
* @var int
112+
* @cvalue XML_ERROR_EXTERNAL_ENTITY_HANDLING
113+
*/
114+
const XML_ERROR_EXTERNAL_ENTITY_HANDLING = UNKNOWN;
115+
116+
/**
117+
* @var int
118+
* @cvalue PHP_XML_OPTION_CASE_FOLDING
119+
*/
120+
const XML_OPTION_CASE_FOLDING = UNKNOWN;
121+
/**
122+
* @var int
123+
* @cvalue PHP_XML_OPTION_TARGET_ENCODING
124+
*/
125+
const XML_OPTION_TARGET_ENCODING = UNKNOWN;
126+
/**
127+
* @var int
128+
* @cvalue PHP_XML_OPTION_SKIP_TAGSTART
129+
*/
130+
const XML_OPTION_SKIP_TAGSTART = UNKNOWN;
131+
/**
132+
* @var int
133+
* @cvalue PHP_XML_OPTION_SKIP_WHITE
134+
*/
135+
const XML_OPTION_SKIP_WHITE = UNKNOWN;
136+
5137
function xml_parser_create(?string $encoding = null): XMLParser {}
6138

7139
function xml_parser_create_ns(?string $encoding = null, string $separator = ":"): XMLParser {}

‎ext/xml/xml_arginfo.h‎

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

0 commit comments

Comments
 (0)