diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-05-02 06:24:59 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-05-02 06:25:21 +0100 |
| commit | 6bd30e8f1a12f062f13013796d736847c827d1a4 (patch) | |
| tree | d1684feddb0d41331924ca39981c69852b6ea6a1 /ext/xmlreader | |
| parent | 2735318c7b8a464488e9bfe6c4f88921186b3fe2 (diff) | |
| parent | 4c0e50c88ac49052c61d1f23d5797e5d00384524 (diff) | |
| download | php-git-6bd30e8f1a12f062f13013796d736847c827d1a4.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #74457 Wrong reflection on XMLReader::expand
Diffstat (limited to 'ext/xmlreader')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 3 | ||||
| -rw-r--r-- | ext/xmlreader/tests/bug74457.phpt | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index d2a90bd50a..40b7d462cd 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -1260,7 +1260,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_XML, 0, 0, 1) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_expand, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_expand, 0, 0, 0) + ZEND_ARG_INFO(0, basenode) ZEND_END_ARG_INFO() /* }}} */ diff --git a/ext/xmlreader/tests/bug74457.phpt b/ext/xmlreader/tests/bug74457.phpt new file mode 100644 index 0000000000..17ed5c5c69 --- /dev/null +++ b/ext/xmlreader/tests/bug74457.phpt @@ -0,0 +1,15 @@ +--TEST-- +XMLReader: Bug #74457 Wrong reflection on XMLReader::expand +--SKIPIF-- +<?php if (!extension_loaded("xmlreader")) die("skip xmlreader extension not available"); ?> +--FILE-- +<?php +$rm = new ReflectionMethod(XMLReader::class, 'expand'); +var_dump($rm->getNumberOfParameters()); +var_dump($rm->getNumberOfRequiredParameters()); +?> +===DONE=== +--EXPECT-- +int(1) +int(0) +===DONE=== |