Skip to content

Commit eaeceb3

Browse files
beberleiThomasWeinert
beberlei
and
ThomasWeinert
committed
Consolidate Parameter Names For ext/simplexml
Co-authored-by: Thomas Weinert <thomas@weinert.info>
1 parent 8a6bc67 commit eaeceb3

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎ext/simplexml/simplexml.stub.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

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

5-
function simplexml_load_file(string $filename, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false): SimpleXMLElement|false {}
5+
function simplexml_load_file(string $filename, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = '', bool $is_prefix = false): SimpleXMLElement|false {}
66

7-
function simplexml_load_string(string $data, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false): SimpleXMLElement|false {}
7+
function simplexml_load_string(string $data, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = '', bool $is_prefix = false): SimpleXMLElement|false {}
88

99
function simplexml_import_dom(DOMNode $node, ?string $class_name = SimpleXMLElement::class): ?SimpleXMLElement {}
1010

1111
class SimpleXMLElement implements Stringable, Countable, RecursiveIterator
1212
{
1313
/** @return array|false */
14-
public function xpath(string $path) {}
14+
public function xpath(string $expression) {}
1515

1616
/** @return bool */
17-
public function registerXPathNamespace(string $prefix, string $ns) {}
17+
public function registerXPathNamespace(string $prefix, string $namespace) {}
1818

1919
/** @return string|bool */
2020
public function asXML(string $filename = UNKNOWN) {}
@@ -29,21 +29,21 @@ public function saveXML(string $filename = UNKNOWN) {}
2929
public function getNamespaces(bool $recursive = false) {}
3030

3131
/** @return array|false */
32-
public function getDocNamespaces(bool $recursive = false, bool $from_root = true) {}
32+
public function getDocNamespaces(bool $recursive = false, bool $fromRoot = true) {}
3333

3434
/** @return SimpleXMLIterator */
35-
public function children(?string $ns = null, bool $is_prefix = false) {}
35+
public function children(?string $namespaceOrPrefix = null, bool $isPrefix = false) {}
3636

3737
/** @return SimpleXMLIterator */
38-
public function attributes(?string $ns = null, bool $is_prefix = false) {}
38+
public function attributes(?string $namespaceOrPrefix = null, bool $isPrefix = false) {}
3939

40-
public function __construct(string $data, int $options = 0, bool $data_is_url = false, string $ns = '', bool $is_prefix = false) {}
40+
public function __construct(string $data, int $options = 0, bool $dataIsURL = false, string $namespaceOrPrefix = '', bool $isPrefix = false) {}
4141

4242
/** @return SimpleXMLElement */
43-
public function addChild(string $name, ?string $value = null, ?string $ns = null) {}
43+
public function addChild(string $qualifiedName, ?string $value = null, ?string $namespace = null) {}
4444

4545
/** @return SimpleXMLElement */
46-
public function addAttribute(string $name, ?string $value = null, ?string $ns = null) {}
46+
public function addAttribute(string $qualifiedName, ?string $value = null, ?string $namespace = null) {}
4747

4848
/** @return string */
4949
public function getName() {}

‎ext/simplexml/simplexml_arginfo.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 7b3ff8b991fc7e424aaf1e86cfbebe662a30c48f */
2+
* Stub hash: fbe25d8a7a0a1de0cbd5dc9118e77a2e8d5dbd67 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_file, 0, 1, SimpleXMLElement, MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
66
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 1, "SimpleXMLElement::class")
77
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
8-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 0, "\'\'")
8+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespace_or_prefix, IS_STRING, 0, "\'\'")
99
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
1010
ZEND_END_ARG_INFO()
1111

1212
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_string, 0, 1, SimpleXMLElement, MAY_BE_FALSE)
1313
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
1414
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 1, "SimpleXMLElement::class")
1515
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
16-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 0, "\'\'")
16+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespace_or_prefix, IS_STRING, 0, "\'\'")
1717
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
1818
ZEND_END_ARG_INFO()
1919

@@ -23,12 +23,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_simplexml_import_dom, 0, 1, Simpl
2323
ZEND_END_ARG_INFO()
2424

2525
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_xpath, 0, 0, 1)
26-
ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
26+
ZEND_ARG_TYPE_INFO(0, expression, IS_STRING, 0)
2727
ZEND_END_ARG_INFO()
2828

2929
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_registerXPathNamespace, 0, 0, 2)
3030
ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
31-
ZEND_ARG_TYPE_INFO(0, ns, IS_STRING, 0)
31+
ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 0)
3232
ZEND_END_ARG_INFO()
3333

3434
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_asXML, 0, 0, 0)
@@ -43,28 +43,28 @@ ZEND_END_ARG_INFO()
4343

4444
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_getDocNamespaces, 0, 0, 0)
4545
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recursive, _IS_BOOL, 0, "false")
46-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, from_root, _IS_BOOL, 0, "true")
46+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fromRoot, _IS_BOOL, 0, "true")
4747
ZEND_END_ARG_INFO()
4848

4949
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_children, 0, 0, 0)
50-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 1, "null")
51-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
50+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceOrPrefix, IS_STRING, 1, "null")
51+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isPrefix, _IS_BOOL, 0, "false")
5252
ZEND_END_ARG_INFO()
5353

5454
#define arginfo_class_SimpleXMLElement_attributes arginfo_class_SimpleXMLElement_children
5555

5656
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement___construct, 0, 0, 1)
5757
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
5858
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
59-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data_is_url, _IS_BOOL, 0, "false")
60-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 0, "\'\'")
61-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
59+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dataIsURL, _IS_BOOL, 0, "false")
60+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceOrPrefix, IS_STRING, 0, "\'\'")
61+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isPrefix, _IS_BOOL, 0, "false")
6262
ZEND_END_ARG_INFO()
6363

6464
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_addChild, 0, 0, 1)
65-
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
65+
ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
6666
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 1, "null")
67-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 1, "null")
67+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespace, IS_STRING, 1, "null")
6868
ZEND_END_ARG_INFO()
6969

7070
#define arginfo_class_SimpleXMLElement_addAttribute arginfo_class_SimpleXMLElement_addChild

0 commit comments

Comments
 (0)