Skip to content

Commit 6bc7370

Browse files
committed
Merge branch 'PHP-8.0' of github.com:php/php-src into PHP-8.0
2 parents 8cd6acd + eedc988 commit 6bc7370

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ext/simplexml/simplexml.stub.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function simplexml_import_dom(SimpleXMLElement|DOMNode $node, ?string $class_nam
1010

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

1616
/** @return bool */
@@ -31,18 +31,18 @@ public function getNamespaces(bool $recursive = false) {}
3131
/** @return array|false */
3232
public function getDocNamespaces(bool $recursive = false, bool $fromRoot = true) {}
3333

34-
/** @return SimpleXMLIterator */
34+
/** @return SimpleXMLElement|null */
3535
public function children(?string $namespaceOrPrefix = null, bool $isPrefix = false) {}
3636

37-
/** @return SimpleXMLIterator */
37+
/** @return SimpleXMLElement|null */
3838
public function attributes(?string $namespaceOrPrefix = null, bool $isPrefix = false) {}
3939

4040
public function __construct(string $data, int $options = 0, bool $dataIsURL = false, string $namespaceOrPrefix = "", bool $isPrefix = false) {}
4141

42-
/** @return SimpleXMLElement */
42+
/** @return SimpleXMLElement|null */
4343
public function addChild(string $qualifiedName, ?string $value = null, ?string $namespace = null) {}
4444

45-
/** @return SimpleXMLElement */
45+
/** @return SimpleXMLElement|null */
4646
public function addAttribute(string $qualifiedName, ?string $value = null, ?string $namespace = null) {}
4747

4848
/** @return string */

ext/simplexml/simplexml_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 70ace711365bb5e7df3174d4cfe68fb3df34a105 */
2+
* Stub hash: 9d5e78ef2ea4e8bda025f9a9e7f0e07d2e9db702 */
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)

0 commit comments

Comments
 (0)