archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Throw from XmlReader::expand() if DOM extension missing

Browse source 
Otherwise it is hard to uphold the arginfo contract for this
function -- we cannot simply mirror the zpp call, as the class
entry it is based on does not exist.
This commit is contained in:
Nikita Popov 2020-10-05 12:31:48 +02:00
parent d3cf597328
commit faea5ab837
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/xmlreader/php_xmlreader.c
View file

@ -1132,8 +1132,13 @@ PHP_METHOD(XMLReader, expand)
RETURN_THROWS(); RETURN_THROWS();
} }
#else #else
php_error(E_WARNING, "DOM support is not enabled"); zval *dummy;
return; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z!", &dummy) == FAILURE) {
RETURN_THROWS();
}
zend_throw_error(NULL, "XMLReader::expand() requires the DOM extension to be enabled");
RETURN_THROWS();
#endif #endif
} }
/* }}} */ /* }}} */

2
ext/xmlreader/php_xmlreader.stub.php
View file

@ -76,6 +76,6 @@ class XMLReader
/** @return bool|XMLReader */ /** @return bool|XMLReader */
public static function XML(string $source, ?string $encoding = null, int $options = 0) {} public static function XML(string $source, ?string $encoding = null, int $options = 0) {}
/** @return DOMNode|false|null */ /** @return DOMNode|false */
public function expand(?DOMNode $basenode = null) {} public function expand(?DOMNode $basenode = null) {}
} }

2
ext/xmlreader/php_xmlreader_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: 65f093ef5916078c10dd4bff7e854561f153ab9c */ * Stub hash: 7d549429c217e5c3b9c36013b6737f4e8eeccbb6 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_close, 0, 0, 0) ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_close, 0, 0, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()