Skip to content

Commit c05898d

Browse files
committed
Update ext/xml parameter names
Closes GH-6297.
1 parent 74d757e commit c05898d

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

ext/xml/xml.stub.php

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,41 @@
44

55
function xml_parser_create(?string $encoding = null): XmlParser {}
66

7-
function xml_parser_create_ns(?string $encoding = null, string $sep = ":"): XmlParser {}
7+
function xml_parser_create_ns(?string $encoding = null, string $separator = ":"): XmlParser {}
88

9-
function xml_set_object(XmlParser $parser, object $obj): bool {}
9+
function xml_set_object(XmlParser $parser, object $object): bool {}
1010

1111
/**
12-
* @param callable $shdl
13-
* @param callable $ehdl
12+
* @param callable $start_handler
13+
* @param callable $end_handler
1414
*/
15-
function xml_set_element_handler(XmlParser $parser, $shdl, $ehdl): bool {}
15+
function xml_set_element_handler(XmlParser $parser, $start_handler, $end_handler): bool {}
1616

17-
/** @param callable $hdl */
18-
function xml_set_character_data_handler(XmlParser $parser, $hdl): bool {}
17+
/** @param callable $handler */
18+
function xml_set_character_data_handler(XmlParser $parser, $handler): bool {}
1919

20-
/** @param callable $hdl */
21-
function xml_set_processing_instruction_handler(XmlParser $parser, $hdl): bool {}
20+
/** @param callable $handler */
21+
function xml_set_processing_instruction_handler(XmlParser $parser, $handler): bool {}
2222

23-
/** @param callable $hdl */
24-
function xml_set_default_handler(XmlParser $parser, $hdl): bool {}
23+
/** @param callable $handler */
24+
function xml_set_default_handler(XmlParser $parser, $handler): bool {}
2525

26-
/** @param callable $hdl */
27-
function xml_set_unparsed_entity_decl_handler(XmlParser $parser, $hdl): bool {}
26+
/** @param callable $handler */
27+
function xml_set_unparsed_entity_decl_handler(XmlParser $parser, $handler): bool {}
2828

29-
/** @param callable $hdl */
30-
function xml_set_notation_decl_handler(XmlParser $parser, $hdl): bool {}
29+
/** @param callable $handler */
30+
function xml_set_notation_decl_handler(XmlParser $parser, $handler): bool {}
3131

32-
/** @param callable $hdl */
33-
function xml_set_external_entity_ref_handler(XmlParser $parser, $hdl): bool {}
32+
/** @param callable $handler */
33+
function xml_set_external_entity_ref_handler(XmlParser $parser, $handler): bool {}
3434

35-
/** @param callable $hdl */
36-
function xml_set_start_namespace_decl_handler(XmlParser $parser, $hdl): bool {}
35+
/** @param callable $handler */
36+
function xml_set_start_namespace_decl_handler(XmlParser $parser, $handler): bool {}
3737

38-
/** @param callable $hdl */
39-
function xml_set_end_namespace_decl_handler(XmlParser $parser, $hdl): bool {}
38+
/** @param callable $handler */
39+
function xml_set_end_namespace_decl_handler(XmlParser $parser, $handler): bool {}
4040

41-
function xml_parse(XmlParser $parser, string $data, bool $isfinal = false): int {}
41+
function xml_parse(XmlParser $parser, string $data, bool $is_final = false): int {}
4242

4343
/**
4444
* @param array $values
@@ -48,7 +48,7 @@ function xml_parse_into_struct(XmlParser $parser, string $data, &$values, &$inde
4848

4949
function xml_get_error_code(XmlParser $parser): int {}
5050

51-
function xml_error_string(int $code): ?string {}
51+
function xml_error_string(int $error_code): ?string {}
5252

5353
function xml_get_current_line_number(XmlParser $parser): int {}
5454

ext/xml/xml_arginfo.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 5be46eaeaea40f3494a6bbad269f85256030f758 */
2+
* Stub hash: 591ba6543081654cbf55945d2a446e7039a81372 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_xml_parser_create, 0, 0, XmlParser, 0)
55
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
66
ZEND_END_ARG_INFO()
77

88
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_xml_parser_create_ns, 0, 0, XmlParser, 0)
99
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
10-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sep, IS_STRING, 0, "\":\"")
10+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, separator, IS_STRING, 0, "\":\"")
1111
ZEND_END_ARG_INFO()
1212

1313
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_set_object, 0, 2, _IS_BOOL, 0)
1414
ZEND_ARG_OBJ_INFO(0, parser, XmlParser, 0)
15-
ZEND_ARG_TYPE_INFO(0, obj, IS_OBJECT, 0)
15+
ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
1616
ZEND_END_ARG_INFO()
1717

1818
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_set_element_handler, 0, 3, _IS_BOOL, 0)
1919
ZEND_ARG_OBJ_INFO(0, parser, XmlParser, 0)
20-
ZEND_ARG_INFO(0, shdl)
21-
ZEND_ARG_INFO(0, ehdl)
20+
ZEND_ARG_INFO(0, start_handler)
21+
ZEND_ARG_INFO(0, end_handler)
2222
ZEND_END_ARG_INFO()
2323

2424
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_set_character_data_handler, 0, 2, _IS_BOOL, 0)
2525
ZEND_ARG_OBJ_INFO(0, parser, XmlParser, 0)
26-
ZEND_ARG_INFO(0, hdl)
26+
ZEND_ARG_INFO(0, handler)
2727
ZEND_END_ARG_INFO()
2828

2929
#define arginfo_xml_set_processing_instruction_handler arginfo_xml_set_character_data_handler
@@ -43,7 +43,7 @@ ZEND_END_ARG_INFO()
4343
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_parse, 0, 2, IS_LONG, 0)
4444
ZEND_ARG_OBJ_INFO(0, parser, XmlParser, 0)
4545
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
46-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isfinal, _IS_BOOL, 0, "false")
46+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_final, _IS_BOOL, 0, "false")
4747
ZEND_END_ARG_INFO()
4848

4949
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_parse_into_struct, 0, 3, IS_LONG, 0)
@@ -58,7 +58,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_get_error_code, 0, 1, IS_LON
5858
ZEND_END_ARG_INFO()
5959

6060
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xml_error_string, 0, 1, IS_STRING, 1)
61-
ZEND_ARG_TYPE_INFO(0, code, IS_LONG, 0)
61+
ZEND_ARG_TYPE_INFO(0, error_code, IS_LONG, 0)
6262
ZEND_END_ARG_INFO()
6363

6464
#define arginfo_xml_get_current_line_number arginfo_xml_get_error_code

0 commit comments

Comments
 (0)