From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Mon, 17 Apr 2017 09:20:47 +0000 (+0200)
Subject: Fix bug #74457 Wrong reflection on XMLReader::expand
X-Git-Tag: php-7.0.20RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c0e50c88ac49052c61d1f23d5797e5d00384524;p=php

Fix bug #74457 Wrong reflection on XMLReader::expand
---

diff --git a/NEWS b/NEWS
index ec8b4f91f3..2a05eae0a7 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - intl:
   . Fixed bug #74468 (wrong reflection on Collator::sortWithSortKeys). (villfa)
 
+- xmlreader:
+  . Fixed bug #74457 (Wrong reflection on XMLReader::expand). (villfa)
+
 11 May 2017 PHP 7.0.19
 
 - Core:
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===