ext/dom: Return numeric results from XPath callbacks as numbers not as string

see https://www.w3.org/TR/xpath-10/#numbers

Author: afflerbach

ext/dom/tests/modern/xml/return_scalars_from_xpath.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Returning scalar values from Dom\XPath callback
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$dom = Dom\XMLDocument::createFromString('<root/>');
+$xpath = new Dom\XPath($dom);
+$xpath->registerPhpFunctionNs('urn:x', 'get-number', fn() => 42);
+$xpath->registerPhpFunctionNs('urn:x', 'get-string', fn() => "test");
+$xpath->registerPhpFunctionNs('urn:x', 'get-bool', fn(bool $b) => $b);
+$xpath->registerNamespace('x', 'urn:x');
+var_dump($xpath->evaluate('x:get-number()'));
+var_dump($xpath->evaluate('x:get-string()'));
+var_dump($xpath->evaluate('x:get-bool(1)'));
+var_dump($xpath->evaluate('x:get-bool(0)'));
+?>
+--EXPECT--
+float(42)
+string(4) "test"
+bool(true)
+bool(false)

ext/dom/xpath_callbacks.c

@@ -438,6 +438,10 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
 			valuePush(ctxt, xmlXPathNewNodeSet(nodep));
 		} else if (Z_TYPE(callback_retval) == IS_FALSE || Z_TYPE(callback_retval) == IS_TRUE) {
 			valuePush(ctxt, xmlXPathNewBoolean(Z_TYPE(callback_retval) == IS_TRUE));
+		} else if (Z_TYPE(callback_retval) == IS_LONG) {
+			valuePush(ctxt, xmlXPathNewFloat(Z_LVAL(callback_retval)));
+		} else if (Z_TYPE(callback_retval) == IS_DOUBLE) {
+			valuePush(ctxt, xmlXPathNewFloat(Z_DVAL(callback_retval)));
 		} else if (Z_TYPE(callback_retval) == IS_OBJECT) {
 			zend_type_error("Only objects that are instances of DOM nodes can be converted to an XPath expression");
 			zval_ptr_dtor(&callback_retval);