From 2fa3d5a56f5f76815416224ae8adad4114329125 Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Wed, 18 Sep 2024 18:04:14 +0000 Subject: [PATCH] Code Modernization: Remove xml_set_object() in IXR_Message::parse(). The XML Parser extension still supports a quite dated mechanism for method based callbacks, where the object is first set via `xml_set_object()` and the callbacks are then set by passing only the name of the method to the relevant parameters on any of the `xml_set_*_handler()` functions. {{{ xml_set_object( $parser, $my_obj ); xml_set_character_data_handler( $parser, 'method_name_on_my_obj' ); }}} Passing proper callables to the `xml_set_*_handler()` functions has been supported for the longest time and is cross-version compatible. So the above code is 100% equivalent to: {{{ xml_set_character_data_handler( $parser, [$my_obj, 'method_name_on_my_obj'] ); }}} The mechanism of setting the callbacks with `xml_set_object()` has now been deprecated as of PHP 8.4, in favour of passing proper callables to the `xml_set_*_handler()` functions. This is also means that calling the `xml_set_object()` function is deprecated as well. This commit fixes this deprecation for the `IXR_Message::parse()` method. This change is safeguarded via the new`Tests_XMLRPC_Message::test_parse_sets_handlers()` test method. Note: Though this is "officially" an external library, this package is no longer externally maintained. The code style of the fix in the source file is in line with the existing code style for the file. Refs: * https://wiki.php.net/rfc/deprecations_php_8_4#xml_set_object_and_xml_set_handler_with_string_method_names * https://www.php.net/manual/en/function.xml-set-object.php * https://www.php.net/manual/en/ref.xml.php Follow-up to [15612], [1346]. Props jrf, hellofromTonya. See #62061. Built from https://develop.svn.wordpress.org/trunk@59056 git-svn-id: http://core.svn.wordpress.org/trunk@58452 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/IXR/class-IXR-message.php | 5 ++--- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wp-includes/IXR/class-IXR-message.php b/wp-includes/IXR/class-IXR-message.php index 2b27293f52..60e4219737 100644 --- a/wp-includes/IXR/class-IXR-message.php +++ b/wp-includes/IXR/class-IXR-message.php @@ -93,9 +93,8 @@ class IXR_Message // Set XML parser to take the case of tags in to account xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false); // Set XML parser callback functions - xml_set_object($this->_parser, $this); - xml_set_element_handler($this->_parser, 'tag_open', 'tag_close'); - xml_set_character_data_handler($this->_parser, 'cdata'); + xml_set_element_handler($this->_parser, array($this, 'tag_open'), array($this, 'tag_close')); + xml_set_character_data_handler($this->_parser, array($this, 'cdata')); // 256Kb, parse in chunks to avoid the RAM usage on very large messages $chunk_size = 262144; diff --git a/wp-includes/version.php b/wp-includes/version.php index 2f954c67d0..c02a674ce1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.7-alpha-59055'; +$wp_version = '6.7-alpha-59056'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.