felipe                                   Fri, 11 Feb 2011 21:10:48 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308262

Log:
- Fixed bug #53991 (SimpleXMLElement::__construct shows no params via 
ReflectionMethod)

Bug: http://bugs.php.net/53991 (Open) SimpleXMLElement::__construct shows no 
params via ReflectionMethod
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
    U   php/php-src/trunk/ext/simplexml/simplexml.c

Modified: php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c      2011-02-11 
20:42:00 UTC (rev 308261)
+++ php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c      2011-02-11 
21:10:48 UTC (rev 308262)
@@ -2470,6 +2470,45 @@
        ZEND_ARG_INFO(0, node)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_xpath, 0, 0, 1)
+       ZEND_ARG_INFO(0, path)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_registerxpathnamespace, 0, 0, 
2)
+       ZEND_ARG_INFO(0, prefix)
+       ZEND_ARG_INFO(0, ns)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_asxml, 0, 0, 0)
+       ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_getnamespaces, 0, 0, 0)
+       ZEND_ARG_INFO(0, recursve)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_children, 0, 0, 0)
+       ZEND_ARG_INFO(0, ns)
+       ZEND_ARG_INFO(0, is_prefix)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement__construct, 0, 0, 1)
+       ZEND_ARG_INFO(0, data)
+       ZEND_ARG_INFO(0, options)
+       ZEND_ARG_INFO(0, data_is_url)
+       ZEND_ARG_INFO(0, ns)
+       ZEND_ARG_INFO(0, is_prefix)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_simplexmlelement__void, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_addchild, 0, 0, 1)
+       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, value)
+       ZEND_ARG_INFO(0, ns)
+ZEND_END_ARG_INFO()
 /* }}} */

 const zend_function_entry simplexml_functions[] = { /* {{{ */
@@ -2509,20 +2548,20 @@
 /* the method table */
 /* each method can have its own parameters and visibility */
 static const zend_function_entry sxe_functions[] = { /* {{{ */
-       SXE_ME(__construct,            NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* 
must be called */
-       SXE_ME(asXML,                  NULL, ZEND_ACC_PUBLIC)
-       SXE_MALIAS(saveXML, asXML,         NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(xpath,                  NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(registerXPathNamespace, NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(attributes,             NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(children,               NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(getNamespaces,          NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(getDocNamespaces,       NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(getName,                NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(addChild,               NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(addAttribute,           NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(__toString,             NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(count,                  NULL, ZEND_ACC_PUBLIC)
+       SXE_ME(__construct,            arginfo_simplexmlelement__construct, 
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */
+       SXE_ME(asXML,                  arginfo_simplexmlelement_asxml, 
ZEND_ACC_PUBLIC)
+       SXE_MALIAS(saveXML, asXML,         arginfo_simplexmlelement_asxml, 
ZEND_ACC_PUBLIC)
+       SXE_ME(xpath,                  arginfo_simplexmlelement_xpath, 
ZEND_ACC_PUBLIC)
+       SXE_ME(registerXPathNamespace, 
arginfo_simplexmlelement_registerxpathnamespace, ZEND_ACC_PUBLIC)
+       SXE_ME(attributes,             arginfo_simplexmlelement_children, 
ZEND_ACC_PUBLIC)
+       SXE_ME(children,               arginfo_simplexmlelement_children, 
ZEND_ACC_PUBLIC)
+       SXE_ME(getNamespaces,          arginfo_simplexmlelement_getnamespaces, 
ZEND_ACC_PUBLIC)
+       SXE_ME(getDocNamespaces,       arginfo_simplexmlelement_getnamespaces, 
ZEND_ACC_PUBLIC)
+       SXE_ME(getName,                arginfo_simplexmlelement__void, 
ZEND_ACC_PUBLIC)
+       SXE_ME(addChild,               arginfo_simplexmlelement_addchild, 
ZEND_ACC_PUBLIC)
+       SXE_ME(addAttribute,           arginfo_simplexmlelement_addchild, 
ZEND_ACC_PUBLIC)
+       SXE_ME(__toString,             arginfo_simplexmlelement__void, 
ZEND_ACC_PUBLIC)
+       SXE_ME(count,                  arginfo_simplexmlelement__void, 
ZEND_ACC_PUBLIC)
        {NULL, NULL, NULL}
 };
 /* }}} */

Modified: php/php-src/trunk/ext/simplexml/simplexml.c
===================================================================
--- php/php-src/trunk/ext/simplexml/simplexml.c 2011-02-11 20:42:00 UTC (rev 
308261)
+++ php/php-src/trunk/ext/simplexml/simplexml.c 2011-02-11 21:10:48 UTC (rev 
308262)
@@ -2470,6 +2470,45 @@
        ZEND_ARG_INFO(0, node)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_xpath, 0, 0, 1)
+       ZEND_ARG_INFO(0, path)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_registerxpathnamespace, 0, 0, 
2)
+       ZEND_ARG_INFO(0, prefix)
+       ZEND_ARG_INFO(0, ns)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_asxml, 0, 0, 0)
+       ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_getnamespaces, 0, 0, 0)
+       ZEND_ARG_INFO(0, recursve)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_children, 0, 0, 0)
+       ZEND_ARG_INFO(0, ns)
+       ZEND_ARG_INFO(0, is_prefix)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement__construct, 0, 0, 1)
+       ZEND_ARG_INFO(0, data)
+       ZEND_ARG_INFO(0, options)
+       ZEND_ARG_INFO(0, data_is_url)
+       ZEND_ARG_INFO(0, ns)
+       ZEND_ARG_INFO(0, is_prefix)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_simplexmlelement__void, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexmlelement_addchild, 0, 0, 1)
+       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, value)
+       ZEND_ARG_INFO(0, ns)
+ZEND_END_ARG_INFO()
 /* }}} */

 const zend_function_entry simplexml_functions[] = { /* {{{ */
@@ -2509,20 +2548,20 @@
 /* the method table */
 /* each method can have its own parameters and visibility */
 static const zend_function_entry sxe_functions[] = { /* {{{ */
-       SXE_ME(__construct,            NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* 
must be called */
-       SXE_ME(asXML,                  NULL, ZEND_ACC_PUBLIC)
-       SXE_MALIAS(saveXML, asXML,         NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(xpath,                  NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(registerXPathNamespace, NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(attributes,             NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(children,               NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(getNamespaces,          NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(getDocNamespaces,       NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(getName,                NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(addChild,               NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(addAttribute,           NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(__toString,             NULL, ZEND_ACC_PUBLIC)
-       SXE_ME(count,                  NULL, ZEND_ACC_PUBLIC)
+       SXE_ME(__construct,            arginfo_simplexmlelement__construct, 
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */
+       SXE_ME(asXML,                  arginfo_simplexmlelement_asxml, 
ZEND_ACC_PUBLIC)
+       SXE_MALIAS(saveXML, asXML,         arginfo_simplexmlelement_asxml, 
ZEND_ACC_PUBLIC)
+       SXE_ME(xpath,                  arginfo_simplexmlelement_xpath, 
ZEND_ACC_PUBLIC)
+       SXE_ME(registerXPathNamespace, 
arginfo_simplexmlelement_registerxpathnamespace, ZEND_ACC_PUBLIC)
+       SXE_ME(attributes,             arginfo_simplexmlelement_children, 
ZEND_ACC_PUBLIC)
+       SXE_ME(children,               arginfo_simplexmlelement_children, 
ZEND_ACC_PUBLIC)
+       SXE_ME(getNamespaces,          arginfo_simplexmlelement_getnamespaces, 
ZEND_ACC_PUBLIC)
+       SXE_ME(getDocNamespaces,       arginfo_simplexmlelement_getnamespaces, 
ZEND_ACC_PUBLIC)
+       SXE_ME(getName,                arginfo_simplexmlelement__void, 
ZEND_ACC_PUBLIC)
+       SXE_ME(addChild,               arginfo_simplexmlelement_addchild, 
ZEND_ACC_PUBLIC)
+       SXE_ME(addAttribute,           arginfo_simplexmlelement_addchild, 
ZEND_ACC_PUBLIC)
+       SXE_ME(__toString,             arginfo_simplexmlelement__void, 
ZEND_ACC_PUBLIC)
+       SXE_ME(count,                  arginfo_simplexmlelement__void, 
ZEND_ACC_PUBLIC)
        {NULL, NULL, NULL}
 };
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to