From faea5ab837ab6393c8821f85cf8abe2723593e8e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 5 Oct 2020 12:31:48 +0200 Subject: Throw from XmlReader::expand() if DOM extension missing 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. --- ext/xmlreader/php_xmlreader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ext/xmlreader/php_xmlreader.c') diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 7b26195409..afc8cc80ba 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -1132,8 +1132,13 @@ PHP_METHOD(XMLReader, expand) RETURN_THROWS(); } #else - php_error(E_WARNING, "DOM support is not enabled"); - return; + zval *dummy; + 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 } /* }}} */ -- cgit v1.2.1