Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom xpath.c

[Antony Dovgal]

On 29.01.2008 18:55, Sebastian Bergmann wrote:
> sebastian Tue Jan 29 15:55:30 2008 UTC
> 
>   Modified files:  (Branch: PHP_5_2)
> /php-src/ext/dom  xpath.c 
>   Log:
>   MFH: Add Reflection API metadata for DOMXPath.

This broke ext/dom/tests/canonicalization.phpt and ext/dom/tests/bug32615.phpt:

# cat ext/dom/tests/bug32615.diff
001+ Catchable fatal error: Argument 2 passed to DOMNode::insertBefore() must 
be an instance of DOMNode, null given in 
/local/qa/5_2/ext/dom/tests/bug32615.php on line 25
001- 
002- 
003-
004- 
005- 
006-
007- 
008- 

# cat ext/dom/tests/canonicalization.diff
044- http://www.example.com/ns/foo"; xmlns:test="urn::test">
045-   
046-   
047-   http://www.example.com/ns/fubar";>
048-   http://www.example.com/ns/fubar";>
045+ Catchable fatal error: Argument 3 passed to DOMNode::C14N() must be an 
array, null given in /local/qa/5_2/ext/dom/tests/canonicalization.php on line 44

-- 
Wbr, 
Antony Dovgal

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom xpath.c

[Sebastian Bergmann]

sebastian   Tue Jan 29 15:55:30 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domxpath.c 
  Log:
  MFH: Add Reflection API metadata for DOMXPath.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.2&r2=1.26.2.1.2.3&diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.2 
php-src/ext/dom/xpath.c:1.26.2.1.2.3
--- php-src/ext/dom/xpath.c:1.26.2.1.2.2Mon Dec 31 07:20:06 2007
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:29 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xpath.c,v 1.26.2.1.2.2 2007/12/31 07:20:06 sebastian Exp $ */
+/* $Id: xpath.c,v 1.26.2.1.2.3 2008/01/29 15:55:29 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,11 +36,36 @@
 
 #if defined(LIBXML_XPATH_ENABLED)
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+   ZEND_ARG_INFO(0, prefix)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+   ZEND_ARG_INFO(0, expr)
+   ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 zend_function_entry php_dom_xpath_class_functions[] = {
-   PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
-   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
-   PHP_FALIAS(query, dom_xpath_query, NULL)
-   PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
+   PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct, 
ZEND_ACC_PUBLIC)
+   PHP_FALIAS(registerNamespace, dom_xpath_register_ns, 
arginfo_dom_xpath_register_ns)
+   PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+   PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
{NULL, NULL, NULL}
 };
 

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