com php-src: Consolidate Parameter Names For ext/simplexml:ext/simplexml/simplexml.stub.php ext/simplexml/simplexml_arginfo.h

  112393
July 27, 2020 19:42 beberlei@php.net (Benjamin Eberlei)
Commit:    eaeceb32932026c08a9d9e5be56da8e8111c5caa
Author:    Benjamin Eberlei <kontakt@beberlei.de>         Mon, 27 Jul 2020 19:32:00 +0200
Parents:   8a6bc6767dbda4861b83fb9dcbba4453e541bbb9
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=eaeceb32932026c08a9d9e5be56da8e8111c5caa

Log:
Consolidate Parameter Names For ext/simplexml

Co-authored-by: Thomas Weinert <thomas@weinert.info>

Changed paths:
  M  ext/simplexml/simplexml.stub.php
  M  ext/simplexml/simplexml_arginfo.h


Diff:
diff --git a/ext/simplexml/simplexml.stub.php b/ext/simplexml/simplexml.stub.php
index 2922adce4b..d3e48b0e6a 100644
--- a/ext/simplexml/simplexml.stub.php
+++ b/ext/simplexml/simplexml.stub.php
@@ -2,19 +2,19 @@
 
 /** @generate-function-entries */
 
-function simplexml_load_file(string $filename, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false): SimpleXMLElement|false {}
+function simplexml_load_file(string $filename, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = '', bool $is_prefix = false): SimpleXMLElement|false {}
 
-function simplexml_load_string(string $data, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false): SimpleXMLElement|false {}
+function simplexml_load_string(string $data, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = '', bool $is_prefix = false): SimpleXMLElement|false {}
 
 function simplexml_import_dom(DOMNode $node, ?string $class_name = SimpleXMLElement::class): ?SimpleXMLElement {}
 
 class SimpleXMLElement implements Stringable, Countable, RecursiveIterator
 {
     /** @return array|false */
-    public function xpath(string $path) {}
+    public function xpath(string $expression) {}
 
     /** @return bool */
-    public function registerXPathNamespace(string $prefix, string $ns) {}
+    public function registerXPathNamespace(string $prefix, string $namespace) {}
 
     /** @return string|bool */
     public function asXML(string $filename = UNKNOWN) {}
@@ -29,21 +29,21 @@ class SimpleXMLElement implements Stringable, Countable, RecursiveIterator
     public function getNamespaces(bool $recursive = false) {}
 
     /** @return array|false */
-    public function getDocNamespaces(bool $recursive = false, bool $from_root = true) {}
+    public function getDocNamespaces(bool $recursive = false, bool $fromRoot = true) {}
 
     /** @return SimpleXMLIterator */
-    public function children(?string $ns = null, bool $is_prefix = false) {}
+    public function children(?string $namespaceOrPrefix = null, bool $isPrefix = false) {}
 
     /** @return SimpleXMLIterator */
-    public function attributes(?string $ns = null, bool $is_prefix = false) {}
+    public function attributes(?string $namespaceOrPrefix = null, bool $isPrefix = false) {}
 
-    public function __construct(string $data, int $options = 0, bool $data_is_url = false, string $ns = '', bool $is_prefix = false) {}
+    public function __construct(string $data, int $options = 0, bool $dataIsURL = false, string $namespaceOrPrefix = '', bool $isPrefix = false) {}
 
     /** @return SimpleXMLElement */
-    public function addChild(string $name, ?string $value = null, ?string $ns = null) {}
+    public function addChild(string $qualifiedName, ?string $value = null, ?string $namespace = null) {}
 
     /** @return SimpleXMLElement */
-    public function addAttribute(string $name, ?string $value = null, ?string $ns = null) {}
+    public function addAttribute(string $qualifiedName, ?string $value = null, ?string $namespace = null) {}
 
     /** @return string */
     public function getName() {}
diff --git a/ext/simplexml/simplexml_arginfo.h b/ext/simplexml/simplexml_arginfo.h
index 964c5c3c6a..dc369e0321 100644
--- a/ext/simplexml/simplexml_arginfo.h
+++ b/ext/simplexml/simplexml_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7b3ff8b991fc7e424aaf1e86cfbebe662a30c48f */
+ * Stub hash: fbe25d8a7a0a1de0cbd5dc9118e77a2e8d5dbd67 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_file, 0, 1, SimpleXMLElement, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 1, "SimpleXMLElement::class")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 0, "\'\'")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespace_or_prefix, IS_STRING, 0, "\'\'")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
@@ -13,7 +13,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_string, 0, 1,
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 1, "SimpleXMLElement::class")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 0, "\'\'")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespace_or_prefix, IS_STRING, 0, "\'\'")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
@@ -23,12 +23,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_simplexml_import_dom, 0, 1, Simpl
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_xpath, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, expression, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_registerXPathNamespace, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, ns, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_asXML, 0, 0, 0)
@@ -43,12 +43,12 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_getDocNamespaces, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recursive, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, from_root, _IS_BOOL, 0, "true")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fromRoot, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_children, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceOrPrefix, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isPrefix, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SimpleXMLElement_attributes arginfo_class_SimpleXMLElement_children
@@ -56,15 +56,15 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data_is_url, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 0, "\'\'")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, is_prefix, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dataIsURL, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceOrPrefix, IS_STRING, 0, "\'\'")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isPrefix, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleXMLElement_addChild, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespace, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SimpleXMLElement_addAttribute arginfo_class_SimpleXMLElement_addChild
July 27, 2020 22:53 derick@php.net (Derick Rethans)
On 27 July 2020 20:42:33 BST, Benjamin Eberlei <beberlei@php.net> wrote:
>Commit: eaeceb32932026c08a9d9e5be56da8e8111c5caa >Author: Benjamin Eberlei <kontakt@beberlei.de> Mon, 27 Jul >2020 19:32:00 +0200 >Parents: 8a6bc6767dbda4861b83fb9dcbba4453e541bbb9 >Branches: master > >Link: >http://git.php.net/?p=php-src.git;a=commitdiff;h=eaeceb32932026c08a9d9e5be56da8e8111c5caa > >Log: >Consolidate Parameter Names For ext/simplexml > >Co-authored-by: Thomas Weinert <thomas@weinert.info> > >Changed paths: > M ext/simplexml/simplexml.stub.php > M ext/simplexml/simplexml_arginfo.h > > >Diff: >diff --git a/ext/simplexml/simplexml.stub.php >b/ext/simplexml/simplexml.stub.php >index 2922adce4b..d3e48b0e6a 100644 >--- a/ext/simplexml/simplexml.stub.php >+++ b/ext/simplexml/simplexml.stub.php >@@ -2,19 +2,19 @@ > > /** @generate-function-entries */ > >-function simplexml_load_file(string $filename, ?string $class_name = >SimpleXMLElement::class, int $options = 0, string $ns = '', bool >$is_prefix = false): SimpleXMLElement|false {} >+function simplexml_load_file(string $filename, ?string $class_name = >SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix >= '', bool $is_prefix = false): SimpleXMLElement|false {}
I thought we were using studlyCaps, so that should be isPrefix and namespaceOrPrefix? cheers, Derick