Refactor code to allow multiple namespaces

php · Nov 30, 2023 · f4cd4d3 · f4cd4d3
1 parent cd5c8d0
commit f4cd4d3
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 122 deletions.
diff --git a/ext/dom/tests/DOMXPath_callables.phpt b/ext/dom/tests/DOMXPath_callables.phpt
@@ -65,6 +65,11 @@ $xpath->registerNamespace("php", "http://php.net/xpath");
 $xpath->registerCycle();
 $xpath->evaluate("//a[php:function('cycle', string(@href))]");
 
+echo "--- Legit cases: reset to null ---\n";
+
+$xpath->registerPhpFunctions(null);
+$xpath->evaluate("//a[php:function('var_dump', string(@href))]");
+
 echo "--- Error cases ---\n";
 
 $xpath = new DOMXPath($doc);
@@ -118,6 +123,8 @@ string(15) "https://php.net"
 No callback handler "notinset" registered
 --- Legit cases: set with cycle ---
 dummy: https://php.net
+--- Legit cases: reset to null ---
+string(15) "https://php.net"
 --- Error cases ---
 DOMXPath::registerPhpFunctions(): Argument #1 ($restrict) must be a callable, function "nonexistent" not found or invalid function name
 DOMXPath::registerPhpFunctions(): Argument #1 ($restrict) must be of type array|string|null, Closure given

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
@@ -77,10 +77,6 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
 			"xmlExtFunctionTest: failed to get the internal object\n");
 			error = true;
 		}
-		else if (intern->xpath_callbacks.mode == PHP_DOM_REG_FUNC_MODE_NONE) {
-			zend_throw_error(NULL, "No callbacks were registered");
-			error = true;
-		}
 	}
 
 	if (error) {
@@ -381,7 +377,16 @@ PHP_METHOD(DOMXPath, evaluate)
 PHP_METHOD(DOMXPath, registerPhpFunctions)
 {
 	dom_xpath_object *intern = Z_XPATHOBJ_P(ZEND_THIS);
-	php_dom_xpath_callbacks_update_method_handler(&intern->xpath_callbacks, INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+	zend_string *name = NULL;
+	HashTable *callable_ht = NULL;
+
+	ZEND_PARSE_PARAMETERS_START(0, 1)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(callable_ht, name)
+	ZEND_PARSE_PARAMETERS_END();
+
+	php_dom_xpath_callbacks_update_method_handler(&intern->xpath_callbacks, NULL, name, callable_ht);
 }
 /* }}} end dom_xpath_register_php_functions */