From 464868a475a830ea2bac5b5e52a5d195083c4047 Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Sun, 15 Oct 2023 14:55:23 +0000 Subject: [PATCH] Code Modernization: Declare dynamic properties on WP_Text_Diff_Renderer_Table. Core uses 3 known, named, dynamic properties on the `WP_Text_Diff_Renderer_Table` class: * `_title` * `_title_left` * `_title_right` When reviewing revisions (within the admin UI), `wp_text_diff()` passes the arguments (without the leading `_`) to a new instance, which raised deprecation notices (see [56354]). Note: the parent class adds the leading `_` to each of these properties (see [7747]). The deprecation notices are resolved by declaring each of these known, named, dynamic properties on the class, per the #56034 mitigation strategy. These new properties are not initialized to retain their previous `null` behavior. Follow-up to [56354], [23506], [7747]. Props wildworks, antonvlasenko, hellofromTonya, ironprogrammer, kafleg, mukesh27, nicolefurlan, presskopp, sabernhardt. Fixes #59431. See #58898, #56034. Built from https://develop.svn.wordpress.org/trunk@56938 git-svn-id: http://core.svn.wordpress.org/trunk@56449 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../class-wp-text-diff-renderer-table.php | 24 +++++++++++++++++++ wp-includes/version.php | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/wp-includes/class-wp-text-diff-renderer-table.php b/wp-includes/class-wp-text-diff-renderer-table.php index ddf732c3e5..4fa3d414d2 100644 --- a/wp-includes/class-wp-text-diff-renderer-table.php +++ b/wp-includes/class-wp-text-diff-renderer-table.php @@ -30,6 +30,30 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { */ public $_trailing_context_lines = 10000; + /** + * Title of the item being compared. + * + * @since 6.4.0 Declared a previously dynamic property. + * @var string|null + */ + public $_title; + + /** + * Title for the left column. + * + * @since 6.4.0 Declared a previously dynamic property. + * @var string|null + */ + public $_title_left; + + /** + * Title for the right column. + * + * @since 6.4.0 Declared a previously dynamic property. + * @var string|null + */ + public $_title_right; + /** * Threshold for when a diff should be saved or omitted. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 67a1a3d754..ab04a759b7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-beta4-56937'; +$wp_version = '6.4-beta4-56938'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.