Instead add libxml_get_external_entity_loader()

Author: tstarling

ext/libxml/libxml.c

@@ -844,7 +844,7 @@ static PHP_RSHUTDOWN_FUNCTION(libxml)
 		zval_ptr_dtor_nogc(&LIBXML(entity_loader).callback);
 		ZVAL_NULL(&LIBXML(entity_loader).callback);
 	}
-	
+
 	return SUCCESS;
 }
 
@@ -1060,13 +1060,13 @@ PHP_FUNCTION(libxml_disable_entity_loader)
 }
 /* }}} */
 
-/* {{{ Change the default external entity loader and return the previous loader */
+/* {{{ Changes the default external entity loader */
 PHP_FUNCTION(libxml_set_external_entity_loader)
 {
-	zval 					*callback;
+	zval					*callback;
 	zend_fcall_info			fci;
-	zend_fcall_info_cache 	fcc;
-	char *error = NULL;
+	zend_fcall_info_cache	fcc;
+	char					error = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(callback)
@@ -1085,11 +1085,19 @@ PHP_FUNCTION(libxml_set_external_entity_loader)
 		LIBXML(entity_loader).fci = fci;
 		LIBXML(entity_loader).fcc = fcc;
 	}
-	ZVAL_COPY(return_value, &LIBXML(entity_loader).callback);
 	if (!Z_ISNULL(LIBXML(entity_loader).callback)) {
 		zval_ptr_dtor_nogc(&LIBXML(entity_loader).callback);
 	}
 	ZVAL_COPY(&LIBXML(entity_loader).callback, callback);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ Get the current external entity loader, or null if the default loader is installer. */
+PHP_FUNCTION(libxml_get_external_entity_loader)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+	RETURN_COPY(&LIBXML(entity_loader).callback);
 }
 /* }}} */
 

ext/libxml/libxml.stub.php

@@ -176,4 +176,6 @@ function libxml_clear_errors(): void {}
 /** @deprecated */
 function libxml_disable_entity_loader(bool $disable = true): bool {}
 
-function libxml_set_external_entity_loader(?callable $resolver_function): callable|bool|null {}
+function libxml_set_external_entity_loader(?callable $resolver_function): bool {}
+
+function libxml_get_external_entity_loader(): ?callable {}

ext/libxml/libxml_arginfo.h

@@ -0,0 +1,36 @@
+--TEST--
+libxml_get_external_entity_loader() returns current handler
+--SKIPIF--
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
+--FILE--
+<?php
+
+class Handler {
+	private $name;
+
+	public function __construct($name) {
+		$this->name = $name;
+	}
+
+	public function handle($public, $system, $context) {
+		return null;
+	}
+
+	public function __toString() {
+		return "Handler#{$this->name}";
+	}
+}
+
+var_dump(libxml_get_external_entity_loader());
+libxml_set_external_entity_loader([new Handler('A'), 'handle']);
+print libxml_get_external_entity_loader()[0] . "\n";
+libxml_set_external_entity_loader([new Handler('B'), 'handle']);
+print libxml_get_external_entity_loader()[0] . "\n";
+libxml_set_external_entity_loader(null);
+var_dump(libxml_get_external_entity_loader());
+
+--EXPECT--
+NULL
+Handler#A
+Handler#B
+NULL

ext/libxml/tests/libxml_get_external_entity_loader.phpt

@@ -22,6 +22,6 @@ try {
 echo "Done.\n";
 ?>
 --EXPECT--
-NULL
+bool(true)
 Exception: Too few arguments to function {closure}(), 3 passed and exactly 4 expected
 Done.