From 71759fcd740a195fc955ffc65a351eea82d87f75 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Tue, 11 Jul 2023 21:07:35 +0100
Subject: [PATCH 01/20] Lazily load properties.

---
 src/wp-includes/block-supports/duotone.php |  4 --
 src/wp-includes/class-wp-duotone.php       | 55 +++++++++++++++++-----
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/wp-includes/block-supports/duotone.php b/src/wp-includes/block-supports/duotone.php
index b7964aa47809b..8ec08f08d9f84 100644
--- a/src/wp-includes/block-supports/duotone.php
+++ b/src/wp-includes/block-supports/duotone.php
@@ -40,10 +40,6 @@
 	)
 );
 
-// Set up metadata prior to rendering any blocks.
-add_action( 'wp_loaded', array( 'WP_Duotone', 'set_global_styles_presets' ), 10 );
-add_action( 'wp_loaded', array( 'WP_Duotone', 'set_global_style_block_names' ), 10 );
-
 // Add classnames to blocks using duotone support.
 add_filter( 'render_block', array( 'WP_Duotone', 'render_duotone_support' ), 10, 2 );
 
diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 99da521f06619..ded772d0c319c 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -54,7 +54,7 @@ class WP_Duotone {
 	 *
 	 * @var array
 	 */
-	private static $global_styles_block_names = array();
+	private static $global_styles_block_names;
 
 	/**
 	 * An array of duotone filter data from global, theme, and custom presets.
@@ -78,7 +78,7 @@ class WP_Duotone {
 	 *
 	 * @var array
 	 */
-	private static $global_styles_presets = array();
+	private static $global_styles_presets;
 
 	/**
 	 * All of the duotone filter data from presets for CSS custom properties on
@@ -575,7 +575,7 @@ private static function is_preset( $duotone_attr ) {
 		$slug      = self::get_slug_from_attribute( $duotone_attr );
 		$filter_id = self::get_filter_id( $slug );
 
-		return array_key_exists( $filter_id, self::$global_styles_presets );
+		return array_key_exists( $filter_id, self::_get_global_styles_presets() );
 	}
 
 	/**
@@ -897,7 +897,8 @@ private static function enqueue_custom_filter( $filter_id, $duotone_selector, $f
 	 * @param string $filter_value     The filter CSS value. e.g. 'url(#wp-duotone-blue-orange)' or 'unset'.
 	 */
 	private static function enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value ) {
-		if ( ! array_key_exists( $filter_id, self::$global_styles_presets ) ) {
+		$global_styles_presets = self::_get_global_styles_presets();
+		if ( ! array_key_exists( $filter_id, $global_styles_presets ) ) {
 			$error_message = sprintf(
 				/* translators: %s: duotone filter ID */
 				__( 'The duotone id "%s" is not registered in theme.json settings' ),
@@ -906,8 +907,8 @@ private static function enqueue_global_styles_preset( $filter_id, $duotone_selec
 			_doing_it_wrong( __METHOD__, $error_message, '6.3.0' );
 			return;
 		}
-		self::$used_global_styles_presets[ $filter_id ] = self::$global_styles_presets[ $filter_id ];
-		self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, self::$global_styles_presets[ $filter_id ] );
+		self::$used_global_styles_presets[ $filter_id ] = $global_styles_presets[ $filter_id ];
+		self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $global_styles_presets[ $filter_id ] );
 	}
 
 	/**
@@ -1012,6 +1013,21 @@ public static function set_global_styles_presets() {
 		}
 	}
 
+	/**
+	 * Get global styles presets.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array
+	 */
+	private static function _get_global_styles_presets() {
+		if ( ! isset( self::$global_styles_presets ) ) {
+			self::set_global_styles_presets();
+		}
+
+		return self::$global_styles_presets;
+	}
+
 	/**
 	 * Scrape all block names from global styles and store in self::$global_styles_block_names.
 	 *
@@ -1048,6 +1064,20 @@ public static function set_global_style_block_names() {
 		}
 	}
 
+	/**
+	 * Get global style block names.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array
+	 */
+	private static function _get_global_style_block_names() {
+		if ( ! isset( self::$global_styles_block_names ) ) {
+			self::set_global_style_block_names();
+		}
+		return self::$global_styles_block_names;
+	}
+
 	/**
 	 * Render out the duotone CSS styles and SVG.
 	 *
@@ -1063,9 +1093,11 @@ public static function set_global_style_block_names() {
 	public static function render_duotone_support( $block_content, $block ) {
 		$duotone_selector = self::get_selector( $block['blockName'] );
 
+		$global_styles_block_names = self::_get_global_style_block_names();
+
 		// The block should have a duotone attribute or have duotone defined in its theme.json to be processed.
 		$has_duotone_attribute     = isset( $block['attrs']['style']['color']['duotone'] );
-		$has_global_styles_duotone = array_key_exists( $block['blockName'], self::$global_styles_block_names );
+		$has_global_styles_duotone = array_key_exists( $block['blockName'], $global_styles_block_names );
 
 		if (
 			empty( $block_content ) ||
@@ -1119,7 +1151,7 @@ public static function render_duotone_support( $block_content, $block ) {
 				self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $filter_data );
 			}
 		} elseif ( $has_global_styles_duotone ) {
-			$slug         = self::$global_styles_block_names[ $block['blockName'] ]; // e.g. 'blue-orange'.
+			$slug         = $global_styles_block_names[ $block['blockName'] ]; // e.g. 'blue-orange'.
 			$filter_id    = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-blue-orange'.
 			$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--blue-orange)'.
 
@@ -1198,14 +1230,15 @@ public static function output_footer_assets() {
 	 * @return array The editor settings with duotone SVGs and CSS custom properties.
 	 */
 	public static function add_editor_settings( $settings ) {
-		if ( ! empty( self::$global_styles_presets ) ) {
+		$global_styles_presets = self::_get_global_styles_presets();
+		if ( ! empty( $global_styles_presets ) ) {
 			if ( ! isset( $settings['styles'] ) ) {
 				$settings['styles'] = array();
 			}
 
 			$settings['styles'][] = array(
 				// For the editor we can add all of the presets by default.
-				'assets'         => self::get_svg_definitions( self::$global_styles_presets ),
+				'assets'         => self::get_svg_definitions( $global_styles_presets ),
 				// The 'svgs' type is new in 6.3 and requires the corresponding JS changes in the EditorStyles component to work.
 				'__unstableType' => 'svgs',
 				// These styles not generated by global styles, so this must be false or they will be stripped out in wp_get_block_editor_settings.
@@ -1214,7 +1247,7 @@ public static function add_editor_settings( $settings ) {
 
 			$settings['styles'][] = array(
 				// For the editor we can add all of the presets by default.
-				'css'            => self::get_global_styles_presets( self::$global_styles_presets ),
+				'css'            => self::get_global_styles_presets( $global_styles_presets ),
 				// This must be set and must be something other than 'theme' or they will be stripped out in the post editor <Editor> component.
 				'__unstableType' => 'presets',
 				// These styles are no longer generated by global styles, so this must be false or they will be stripped out in wp_get_block_editor_settings.

From ffbf037a546e2ac6333214deafa1465f02f98bbe Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Tue, 11 Jul 2023 21:19:05 +0100
Subject: [PATCH 02/20] More refactors.

---
 src/wp-includes/class-wp-duotone.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index ded772d0c319c..801b81fc21aa4 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -1004,6 +1004,7 @@ public static function set_global_styles_presets() {
 		$tree              = wp_get_global_settings();
 		$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
 
+		self::$global_styles_presets = array();
 		foreach ( $presets_by_origin as $presets ) {
 			foreach ( $presets as $preset ) {
 				$filter_id = self::get_filter_id( _wp_to_kebab_case( $preset['slug'] ) );
@@ -1042,6 +1043,8 @@ public static function set_global_style_block_names() {
 		$block_nodes = $tree->get_styles_block_nodes();
 		$theme_json  = $tree->get_raw_data();
 
+		self::$global_styles_block_names = array();
+
 		foreach ( $block_nodes as $block_node ) {
 			// This block definition doesn't include any duotone settings. Skip it.
 			if ( empty( $block_node['duotone'] ) ) {
@@ -1091,19 +1094,22 @@ private static function _get_global_style_block_names() {
 	 * @return string                Filtered block content.
 	 */
 	public static function render_duotone_support( $block_content, $block ) {
+		if ( empty( $block_content ) ) {
+			return $block_content;
+		}
 		$duotone_selector = self::get_selector( $block['blockName'] );
 
+		if ( ! $duotone_selector ) {
+			return $block_content;
+		}
+
 		$global_styles_block_names = self::_get_global_style_block_names();
 
 		// The block should have a duotone attribute or have duotone defined in its theme.json to be processed.
 		$has_duotone_attribute     = isset( $block['attrs']['style']['color']['duotone'] );
 		$has_global_styles_duotone = array_key_exists( $block['blockName'], $global_styles_block_names );
 
-		if (
-			empty( $block_content ) ||
-			! $duotone_selector ||
-			( ! $has_duotone_attribute && ! $has_global_styles_duotone )
-		) {
+		if ( ! $has_duotone_attribute && ! $has_global_styles_duotone ) {
 			return $block_content;
 		}
 

From 68871ff0d38912245a2e0a79e93acaf650d39e7a Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 01:06:57 +0100
Subject: [PATCH 03/20] Change method names to make things cleaner.

---
 src/wp-includes/class-wp-duotone.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 801b81fc21aa4..1bd1fb923397b 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -575,7 +575,7 @@ private static function is_preset( $duotone_attr ) {
 		$slug      = self::get_slug_from_attribute( $duotone_attr );
 		$filter_id = self::get_filter_id( $slug );
 
-		return array_key_exists( $filter_id, self::_get_global_styles_presets() );
+		return array_key_exists( $filter_id, self::get_all_global_styles_presets() );
 	}
 
 	/**
@@ -897,7 +897,7 @@ private static function enqueue_custom_filter( $filter_id, $duotone_selector, $f
 	 * @param string $filter_value     The filter CSS value. e.g. 'url(#wp-duotone-blue-orange)' or 'unset'.
 	 */
 	private static function enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value ) {
-		$global_styles_presets = self::_get_global_styles_presets();
+		$global_styles_presets = self::get_all_global_styles_presets();
 		if ( ! array_key_exists( $filter_id, $global_styles_presets ) ) {
 			$error_message = sprintf(
 				/* translators: %s: duotone filter ID */
@@ -999,7 +999,7 @@ private static function get_selector( $block_name ) {
 	 *
 	 * @since 6.3.0
 	 */
-	public static function set_global_styles_presets() {
+	public static function load_global_styles_presets() {
 		// Get the per block settings from the theme.json.
 		$tree              = wp_get_global_settings();
 		$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
@@ -1021,9 +1021,9 @@ public static function set_global_styles_presets() {
 	 *
 	 * @return array
 	 */
-	private static function _get_global_styles_presets() {
+	private static function get_all_global_styles_presets() {
 		if ( ! isset( self::$global_styles_presets ) ) {
-			self::set_global_styles_presets();
+			self::load_global_styles_presets();
 		}
 
 		return self::$global_styles_presets;
@@ -1037,7 +1037,7 @@ private static function _get_global_styles_presets() {
 	 *
 	 * @since 6.3.0
 	 */
-	public static function set_global_style_block_names() {
+	public static function load_global_style_block_names() {
 		// Get the per block settings from the theme.json.
 		$tree        = WP_Theme_JSON_Resolver::get_merged_data();
 		$block_nodes = $tree->get_styles_block_nodes();
@@ -1074,9 +1074,9 @@ public static function set_global_style_block_names() {
 	 *
 	 * @return array
 	 */
-	private static function _get_global_style_block_names() {
+	private static function get_all_global_style_block_names() {
 		if ( ! isset( self::$global_styles_block_names ) ) {
-			self::set_global_style_block_names();
+			self::load_global_style_block_names();
 		}
 		return self::$global_styles_block_names;
 	}
@@ -1103,7 +1103,7 @@ public static function render_duotone_support( $block_content, $block ) {
 			return $block_content;
 		}
 
-		$global_styles_block_names = self::_get_global_style_block_names();
+		$global_styles_block_names = self::get_all_global_style_block_names();
 
 		// The block should have a duotone attribute or have duotone defined in its theme.json to be processed.
 		$has_duotone_attribute     = isset( $block['attrs']['style']['color']['duotone'] );
@@ -1236,7 +1236,7 @@ public static function output_footer_assets() {
 	 * @return array The editor settings with duotone SVGs and CSS custom properties.
 	 */
 	public static function add_editor_settings( $settings ) {
-		$global_styles_presets = self::_get_global_styles_presets();
+		$global_styles_presets = self::get_all_global_styles_presets();
 		if ( ! empty( $global_styles_presets ) ) {
 			if ( ! isset( $settings['styles'] ) ) {
 				$settings['styles'] = array();

From 7d647cd9b6761bea3df315911ab1a140a00646aa Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 10:33:17 +0100
Subject: [PATCH 04/20] More tweaks for performance.

---
 src/wp-includes/class-wp-duotone.php | 65 +++++++++++++---------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 1bd1fb923397b..ad673832ba6ab 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -921,16 +921,7 @@ private static function enqueue_global_styles_preset( $filter_id, $duotone_selec
 	 * @param WP_Block_Type $block_type Block Type.
 	 */
 	public static function register_duotone_support( $block_type ) {
-		$has_duotone_support = false;
-		if ( property_exists( $block_type, 'supports' ) ) {
-			/*
-			 * Previous `color.__experimentalDuotone` support flag is migrated
-			 * to `filter.duotone` via `block_type_metadata_settings` filter.
-			 */
-			$has_duotone_support = _wp_array_get( $block_type->supports, array( 'filter', 'duotone' ), null );
-		}
-
-		if ( $has_duotone_support ) {
+		if ( block_has_support( $block_type, array( 'filter', 'duotone' ) ) ) {
 			if ( ! $block_type->attributes ) {
 				$block_type->attributes = array();
 			}
@@ -960,34 +951,36 @@ public static function register_duotone_support( $block_type ) {
 	private static function get_selector( $block_name ) {
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
 
-		if ( $block_type && property_exists( $block_type, 'supports' ) ) {
-			/*
-			 * Backwards compatibility with `supports.color.__experimentalDuotone`
-			 * is provided via the `block_type_metadata_settings` filter. If
-			 * `supports.filter.duotone` has not been set and the experimental
-			 * property has been, the experimental property value is copied into
-			 * `supports.filter.duotone`.
-			 */
-			$duotone_support = _wp_array_get( $block_type->supports, array( 'filter', 'duotone' ), false );
-			if ( ! $duotone_support ) {
-				return null;
-			}
+		if ( ! $block_type ) {
+			return null;
+		}
 
-			/*
-			 * If the experimental duotone support was set, that value is to be
-			 * treated as a selector and requires scoping.
-			 */
-			$experimental_duotone = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
-			if ( $experimental_duotone ) {
-				$root_selector = wp_get_block_css_selector( $block_type );
-				return is_string( $experimental_duotone )
-					? WP_Theme_JSON::scope_selector( $root_selector, $experimental_duotone )
-					: $root_selector;
-			}
+		/*
+		 * Backwards compatibility with `supports.color.__experimentalDuotone`
+		 * is provided via the `block_type_metadata_settings` filter. If
+		 * `supports.filter.duotone` has not been set and the experimental
+		 * property has been, the experimental property value is copied into
+		 * `supports.filter.duotone`.
+		 */
+		$duotone_support = block_has_support( $block_type, array( 'filter', 'duotone' ) );
+		if ( ! $duotone_support ) {
+			return null;
+		}
 
-			// Regular filter.duotone support uses filter.duotone selectors with fallbacks.
-			return wp_get_block_css_selector( $block_type, array( 'filter', 'duotone' ), true );
+		/*
+		 * If the experimental duotone support was set, that value is to be
+		 * treated as a selector and requires scoping.
+		 */
+		$experimental_duotone = block_has_support( $block_type, array( 'color', '__experimentalDuotone' ) );
+		if ( $experimental_duotone ) {
+			$root_selector = wp_get_block_css_selector( $block_type );
+			return is_string( $experimental_duotone )
+				? WP_Theme_JSON::scope_selector( $root_selector, $experimental_duotone )
+				: $root_selector;
 		}
+
+		// Regular filter.duotone support uses filter.duotone selectors with fallbacks.
+		return wp_get_block_css_selector( $block_type, array( 'filter', 'duotone' ), true );
 	}
 
 	/**
@@ -1094,7 +1087,7 @@ private static function get_all_global_style_block_names() {
 	 * @return string                Filtered block content.
 	 */
 	public static function render_duotone_support( $block_content, $block ) {
-		if ( empty( $block_content ) ) {
+		if ( empty( $block_content ) || ! $block['blockName'] ) {
 			return $block_content;
 		}
 		$duotone_selector = self::get_selector( $block['blockName'] );

From 27c9a69651ec89e883a2d7a228148876a376e57f Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 10:52:16 +0100
Subject: [PATCH 05/20] More refactored

---
 src/wp-includes/block-supports/duotone.php |  2 +-
 src/wp-includes/class-wp-duotone.php       | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/wp-includes/block-supports/duotone.php b/src/wp-includes/block-supports/duotone.php
index 8ec08f08d9f84..a90eb762ba8f0 100644
--- a/src/wp-includes/block-supports/duotone.php
+++ b/src/wp-includes/block-supports/duotone.php
@@ -41,7 +41,7 @@
 );
 
 // Add classnames to blocks using duotone support.
-add_filter( 'render_block', array( 'WP_Duotone', 'render_duotone_support' ), 10, 2 );
+add_filter( 'render_block', array( 'WP_Duotone', 'render_duotone_support' ), 10, 3 );
 
 // Enqueue styles.
 // Block styles (core-block-supports-inline-css) before the style engine (wp_enqueue_stored_styles).
diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index ad673832ba6ab..28bd34af840c2 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -940,7 +940,7 @@ public static function register_duotone_support( $block_type ) {
 	 * This handles selectors defined in `color.__experimentalDuotone` support
 	 * if `filter.duotone` support is not defined.
 	 *
-	 * @param string $block_name The block name.
+	 * @param WP_Block_Type $block_type  Block type to check for support.
 	 *
 	 * @internal
 	 *
@@ -948,13 +948,7 @@ public static function register_duotone_support( $block_type ) {
 	 *
 	 * @return string The CSS selector or null if there is no support.
 	 */
-	private static function get_selector( $block_name ) {
-		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
-
-		if ( ! $block_type ) {
-			return null;
-		}
-
+	private static function get_selector( $block_type ) {
 		/*
 		 * Backwards compatibility with `supports.color.__experimentalDuotone`
 		 * is provided via the `block_type_metadata_settings` filter. If
@@ -1084,13 +1078,14 @@ private static function get_all_global_style_block_names() {
 	 *
 	 * @param  string $block_content Rendered block content.
 	 * @param  array  $block         Block object.
+	 * @param  WP_Block $wp_block      The block instance.
 	 * @return string                Filtered block content.
 	 */
-	public static function render_duotone_support( $block_content, $block ) {
+	public static function render_duotone_support( $block_content, $block, $wp_block ) {
 		if ( empty( $block_content ) || ! $block['blockName'] ) {
 			return $block_content;
 		}
-		$duotone_selector = self::get_selector( $block['blockName'] );
+		$duotone_selector = self::get_selector( $wp_block->block_type );
 
 		if ( ! $duotone_selector ) {
 			return $block_content;

From 9c16d50fddfebe8963c79ebb1d56baa4dfe2ce64 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 12:18:00 +0100
Subject: [PATCH 06/20] Fix tests.

---
 tests/phpunit/tests/block-supports/duotone.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/tests/block-supports/duotone.php b/tests/phpunit/tests/block-supports/duotone.php
index 672e91c00bc6a..2077ef705b19a 100644
--- a/tests/phpunit/tests/block-supports/duotone.php
+++ b/tests/phpunit/tests/block-supports/duotone.php
@@ -27,9 +27,10 @@ public function test_render_duotone_support_preset() {
 			'blockName' => 'core/image',
 			'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => 'var:preset|duotone|blue-orange' ) ) ),
 		);
+		$wp_block      = new WP_Block( $block );
 		$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg" /></figure>';
 		$expected      = '<figure class="wp-block-image size-full wp-duotone-blue-orange"><img src="/my-image.jpg" /></figure>';
-		$this->assertSame( $expected, WP_Duotone::render_duotone_support( $block_content, $block ) );
+		$this->assertSame( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
 	}
 
 	/**
@@ -44,9 +45,10 @@ public function test_render_duotone_support_css() {
 			'blockName' => 'core/image',
 			'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => 'unset' ) ) ),
 		);
+		$wp_block      = new WP_Block( $block );
 		$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg" /></figure>';
 		$expected      = '/<figure class="wp-block-image size-full wp-duotone-unset-\d+"><img src="\\/my-image.jpg" \\/><\\/figure>/';
-		$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block ) );
+		$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
 	}
 
 	/**
@@ -59,9 +61,10 @@ public function test_render_duotone_support_custom() {
 			'blockName' => 'core/image',
 			'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => array( '#FFFFFF', '#000000' ) ) ) ),
 		);
+		$wp_block      = new WP_Block( $block );
 		$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg" /></figure>';
 		$expected      = '/<figure class="wp-block-image size-full wp-duotone-ffffff-000000-\d+"><img src="\\/my-image.jpg" \\/><\\/figure>/';
-		$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block ) );
+		$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
 	}
 
 	/**

From a8fc72ed5a42ca085e591495b1694eeefadd1449 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 12:29:37 +0100
Subject: [PATCH 07/20] Fix test again.

---
 tests/phpunit/tests/blocks/supportedStyles.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/blocks/supportedStyles.php b/tests/phpunit/tests/blocks/supportedStyles.php
index d3b1a191de242..95c5326b4542f 100644
--- a/tests/phpunit/tests/blocks/supportedStyles.php
+++ b/tests/phpunit/tests/blocks/supportedStyles.php
@@ -695,13 +695,14 @@ public function test_render_block_suppresses_warnings_without_at_suppression() {
 		);
 		$this->register_block_type( 'core/example', $block_type_settings );
 
-		$block = array(
+		$block    = array(
 			'blockName'    => 'core/example',
 			'attrs'        => array(),
 			'innerBlock'   => array(),
 			'innerContent' => array(),
 			'innerHTML'    => array(),
 		);
+		$wp_block = new WP_Block( $block );
 
 		// Custom error handler's see Warnings even if they are suppressed by the @ symbol.
 		$errors = array();
@@ -714,7 +715,7 @@ static function ( $errno = 0, $errstr = '' ) use ( &$errors ) {
 
 		// HTML5 elements like <time> are not supported by the DOMDocument parser used by the block supports feature.
 		// This specific example is emitted by the "Display post date" setting in the latest-posts block.
-		apply_filters( 'render_block', '<div><time datetime="2020-06-18T04:01:43+10:00" class="wp-block-latest-posts__post-date">June 18, 2020</time></div>', $block );
+		apply_filters( 'render_block', '<div><time datetime="2020-06-18T04:01:43+10:00" class="wp-block-latest-posts__post-date">June 18, 2020</time></div>', $block, $wp_block );
 
 		restore_error_handler();
 

From a8ed13a1b8f73b930379aead98e9836d144390ab Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:41:16 +0100
Subject: [PATCH 08/20] Apply suggestions from code review

---
 src/wp-includes/class-wp-duotone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 28bd34af840c2..a91cbdb9e3219 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -1078,7 +1078,7 @@ private static function get_all_global_style_block_names() {
 	 *
 	 * @param  string $block_content Rendered block content.
 	 * @param  array  $block         Block object.
-	 * @param  WP_Block $wp_block      The block instance.
+	 * @param  WP_Block $wp_block    The block instance.
 	 * @return string                Filtered block content.
 	 */
 	public static function render_duotone_support( $block_content, $block, $wp_block ) {

From 1072db34c54563d5917b8d91e208ee864b347b51 Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:16:20 +0100
Subject: [PATCH 09/20] Apply suggestions from code review

Co-authored-by: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
---
 src/wp-includes/class-wp-duotone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index a91cbdb9e3219..089ccfa3b62ff 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -940,7 +940,7 @@ public static function register_duotone_support( $block_type ) {
 	 * This handles selectors defined in `color.__experimentalDuotone` support
 	 * if `filter.duotone` support is not defined.
 	 *
-	 * @param WP_Block_Type $block_type  Block type to check for support.
+	 * @param WP_Block_Type $block_type Block type to check for support.
 	 *
 	 * @internal
 	 *

From 20bc973990318bd122d4bd9b5654a7eced36501b Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 14:22:25 +0100
Subject: [PATCH 10/20] Fix alignment.

---
 src/wp-includes/class-wp-duotone.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 089ccfa3b62ff..1405baacea34b 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -1076,10 +1076,11 @@ private static function get_all_global_style_block_names() {
 	 *
 	 * @since 6.3.0
 	 *
-	 * @param  string $block_content Rendered block content.
-	 * @param  array  $block         Block object.
-	 * @param  WP_Block $wp_block    The block instance.
-	 * @return string                Filtered block content.
+	 * @param  string   $block_content Rendered block content.
+	 * @param  array    $block         Block object.
+	 * @param  WP_Block $wp_block      The block instance.
+	 *
+	 * @return string Filtered block content.
 	 */
 	public static function render_duotone_support( $block_content, $block, $wp_block ) {
 		if ( empty( $block_content ) || ! $block['blockName'] ) {

From ecd8e96024983e4f6b8f8328008d942620a8da65 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 14:24:48 +0100
Subject: [PATCH 11/20] Fix deprecated.

---
 src/wp-includes/deprecated.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php
index 74fdfb7887099..a3a25b598ba54 100644
--- a/src/wp-includes/deprecated.php
+++ b/src/wp-includes/deprecated.php
@@ -5215,7 +5215,8 @@ function wp_register_duotone_support( $block_type ) {
  */
 function wp_render_duotone_support( $block_content, $block ) {
 	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Duotone::render_duotone_support()' );
-	return WP_Duotone::render_duotone_support( $block_content, $block );
+	$wp_block = new WP_Block( $block );
+	return WP_Duotone::render_duotone_support( $block_content, $block, $wp_block );
 }
 
 /**

From 1aee453d3d66ac2be162b621010952018178da34 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 16:10:23 +0100
Subject: [PATCH 12/20] Add comment back.

---
 src/wp-includes/class-wp-duotone.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 1405baacea34b..e1235add59f7d 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -921,6 +921,10 @@ private static function enqueue_global_styles_preset( $filter_id, $duotone_selec
 	 * @param WP_Block_Type $block_type Block Type.
 	 */
 	public static function register_duotone_support( $block_type ) {
+		/*
+		 * Previous `color.__experimentalDuotone` support flag is migrated
+		 * to `filter.duotone` via `block_type_metadata_settings` filter.
+		 */
 		if ( block_has_support( $block_type, array( 'filter', 'duotone' ) ) ) {
 			if ( ! $block_type->attributes ) {
 				$block_type->attributes = array();

From 4df7f1819c48cc8b37f68a173fbfc06f2edf5182 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Wed, 12 Jul 2023 16:16:08 +0100
Subject: [PATCH 13/20] Merge methods.

---
 src/wp-includes/class-wp-duotone.php | 100 +++++++++++----------------
 1 file changed, 41 insertions(+), 59 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index e1235add59f7d..1ce80b98ca1bb 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -989,32 +989,23 @@ private static function get_selector( $block_type ) {
 	 * use duotone preset filters.
 	 *
 	 * @since 6.3.0
-	 */
-	public static function load_global_styles_presets() {
-		// Get the per block settings from the theme.json.
-		$tree              = wp_get_global_settings();
-		$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
-
-		self::$global_styles_presets = array();
-		foreach ( $presets_by_origin as $presets ) {
-			foreach ( $presets as $preset ) {
-				$filter_id = self::get_filter_id( _wp_to_kebab_case( $preset['slug'] ) );
-
-				self::$global_styles_presets[ $filter_id ] = $preset;
-			}
-		}
-	}
-
-	/**
-	 * Get global styles presets.
-	 *
-	 * @since 6.3.0
 	 *
-	 * @return array
+	 * @return array An array of global styles presets, keyed on the filter ID.
 	 */
 	private static function get_all_global_styles_presets() {
 		if ( ! isset( self::$global_styles_presets ) ) {
-			self::load_global_styles_presets();
+			// Get the per block settings from the theme.json.
+			$tree              = wp_get_global_settings();
+			$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
+
+			self::$global_styles_presets = array();
+			foreach ( $presets_by_origin as $presets ) {
+				foreach ( $presets as $preset ) {
+					$filter_id = self::get_filter_id( _wp_to_kebab_case( $preset['slug'] ) );
+
+					self::$global_styles_presets[ $filter_id ] = $preset;
+				}
+			}
 		}
 
 		return self::$global_styles_presets;
@@ -1027,47 +1018,38 @@ private static function get_all_global_styles_presets() {
 	 * duotone filters defined in the theme.json global styles.
 	 *
 	 * @since 6.3.0
-	 */
-	public static function load_global_style_block_names() {
-		// Get the per block settings from the theme.json.
-		$tree        = WP_Theme_JSON_Resolver::get_merged_data();
-		$block_nodes = $tree->get_styles_block_nodes();
-		$theme_json  = $tree->get_raw_data();
-
-		self::$global_styles_block_names = array();
-
-		foreach ( $block_nodes as $block_node ) {
-			// This block definition doesn't include any duotone settings. Skip it.
-			if ( empty( $block_node['duotone'] ) ) {
-				continue;
-			}
-
-			// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|blue-orange'.
-			$duotone_attr_path = array_merge( $block_node['path'], array( 'filter', 'duotone' ) );
-			$duotone_attr      = _wp_array_get( $theme_json, $duotone_attr_path, array() );
-
-			if ( empty( $duotone_attr ) ) {
-				continue;
-			}
-			// If it has a duotone filter preset, save the block name and the preset slug.
-			$slug = self::get_slug_from_attribute( $duotone_attr );
-
-			if ( $slug && $slug !== $duotone_attr ) {
-				self::$global_styles_block_names[ $block_node['name'] ] = $slug;
-			}
-		}
-	}
-
-	/**
-	 * Get global style block names.
 	 *
-	 * @since 6.3.0
-	 *
-	 * @return array
+	 * @return string[] An array of global style block slugs, keyed on the block name.
 	 */
 	private static function get_all_global_style_block_names() {
 		if ( ! isset( self::$global_styles_block_names ) ) {
-			self::load_global_style_block_names();
+			// Get the per block settings from the theme.json.
+			$tree        = WP_Theme_JSON_Resolver::get_merged_data();
+			$block_nodes = $tree->get_styles_block_nodes();
+			$theme_json  = $tree->get_raw_data();
+
+			self::$global_styles_block_names = array();
+
+			foreach ( $block_nodes as $block_node ) {
+				// This block definition doesn't include any duotone settings. Skip it.
+				if ( empty( $block_node['duotone'] ) ) {
+					continue;
+				}
+
+				// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|blue-orange'.
+				$duotone_attr_path = array_merge( $block_node['path'], array( 'filter', 'duotone' ) );
+				$duotone_attr      = _wp_array_get( $theme_json, $duotone_attr_path, array() );
+
+				if ( empty( $duotone_attr ) ) {
+					continue;
+				}
+				// If it has a duotone filter preset, save the block name and the preset slug.
+				$slug = self::get_slug_from_attribute( $duotone_attr );
+
+				if ( $slug && $slug !== $duotone_attr ) {
+					self::$global_styles_block_names[ $block_node['name'] ] = $slug;
+				}
+			}
 		}
 		return self::$global_styles_block_names;
 	}

From f10a53f1924e820a5b68d2fe30bea506fd385c02 Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@users.noreply.github.com>
Date: Wed, 12 Jul 2023 17:19:09 +0100
Subject: [PATCH 14/20] Apply suggestions from code review

Co-authored-by: Alex Lende <alex+github.com@lende.xyz>
---
 src/wp-includes/class-wp-duotone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 1ce80b98ca1bb..59d723c49b0c0 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -969,7 +969,7 @@ private static function get_selector( $block_type ) {
 		 * If the experimental duotone support was set, that value is to be
 		 * treated as a selector and requires scoping.
 		 */
-		$experimental_duotone = block_has_support( $block_type, array( 'color', '__experimentalDuotone' ) );
+		$experimental_duotone = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
 		if ( $experimental_duotone ) {
 			$root_selector = wp_get_block_css_selector( $block_type );
 			return is_string( $experimental_duotone )

From 56a068c82fedc057aa60ea6bdedd1b2ddff5e3ec Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@users.noreply.github.com>
Date: Wed, 12 Jul 2023 17:41:09 +0100
Subject: [PATCH 15/20] Apply suggestions from code review

---
 src/wp-includes/class-wp-duotone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 59d723c49b0c0..1cea5d8c82bc6 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -925,7 +925,7 @@ public static function register_duotone_support( $block_type ) {
 		 * Previous `color.__experimentalDuotone` support flag is migrated
 		 * to `filter.duotone` via `block_type_metadata_settings` filter.
 		 */
-		if ( block_has_support( $block_type, array( 'filter', 'duotone' ) ) ) {
+		if ( block_has_support( $block_type, array( 'filter', 'duotone' ), null ) ) {
 			if ( ! $block_type->attributes ) {
 				$block_type->attributes = array();
 			}

From 833227e55a21c2ab635a8a240437c584d1803f58 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Thu, 13 Jul 2023 00:17:36 +0100
Subject: [PATCH 16/20] Add a check for if input is `WP_Block_Type`.

---
 src/wp-includes/class-wp-duotone.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 1cea5d8c82bc6..c04754cc1f286 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -953,6 +953,10 @@ public static function register_duotone_support( $block_type ) {
 	 * @return string The CSS selector or null if there is no support.
 	 */
 	private static function get_selector( $block_type ) {
+		if ( ! ( $block_type instanceof WP_Block_Type ) ) {
+			return null;
+		}
+
 		/*
 		 * Backwards compatibility with `supports.color.__experimentalDuotone`
 		 * is provided via the `block_type_metadata_settings` filter. If

From d6648a38200b821b29d4f55ddd66b74c3de975ea Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Thu, 13 Jul 2023 00:25:52 +0100
Subject: [PATCH 17/20] Return early.

---
 src/wp-includes/class-wp-duotone.php | 80 ++++++++++++++--------------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index c04754cc1f286..61947e1726e16 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -997,18 +997,19 @@ private static function get_selector( $block_type ) {
 	 * @return array An array of global styles presets, keyed on the filter ID.
 	 */
 	private static function get_all_global_styles_presets() {
-		if ( ! isset( self::$global_styles_presets ) ) {
-			// Get the per block settings from the theme.json.
-			$tree              = wp_get_global_settings();
-			$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
-
-			self::$global_styles_presets = array();
-			foreach ( $presets_by_origin as $presets ) {
-				foreach ( $presets as $preset ) {
-					$filter_id = self::get_filter_id( _wp_to_kebab_case( $preset['slug'] ) );
-
-					self::$global_styles_presets[ $filter_id ] = $preset;
-				}
+		if ( isset( self::$global_styles_presets ) ) {
+			return self::$global_styles_presets;
+		}
+		// Get the per block settings from the theme.json.
+		$tree              = wp_get_global_settings();
+		$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
+
+		self::$global_styles_presets = array();
+		foreach ( $presets_by_origin as $presets ) {
+			foreach ( $presets as $preset ) {
+				$filter_id = self::get_filter_id( _wp_to_kebab_case( $preset['slug'] ) );
+
+				self::$global_styles_presets[ $filter_id ] = $preset;
 			}
 		}
 
@@ -1026,33 +1027,34 @@ private static function get_all_global_styles_presets() {
 	 * @return string[] An array of global style block slugs, keyed on the block name.
 	 */
 	private static function get_all_global_style_block_names() {
-		if ( ! isset( self::$global_styles_block_names ) ) {
-			// Get the per block settings from the theme.json.
-			$tree        = WP_Theme_JSON_Resolver::get_merged_data();
-			$block_nodes = $tree->get_styles_block_nodes();
-			$theme_json  = $tree->get_raw_data();
-
-			self::$global_styles_block_names = array();
-
-			foreach ( $block_nodes as $block_node ) {
-				// This block definition doesn't include any duotone settings. Skip it.
-				if ( empty( $block_node['duotone'] ) ) {
-					continue;
-				}
-
-				// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|blue-orange'.
-				$duotone_attr_path = array_merge( $block_node['path'], array( 'filter', 'duotone' ) );
-				$duotone_attr      = _wp_array_get( $theme_json, $duotone_attr_path, array() );
-
-				if ( empty( $duotone_attr ) ) {
-					continue;
-				}
-				// If it has a duotone filter preset, save the block name and the preset slug.
-				$slug = self::get_slug_from_attribute( $duotone_attr );
-
-				if ( $slug && $slug !== $duotone_attr ) {
-					self::$global_styles_block_names[ $block_node['name'] ] = $slug;
-				}
+		if ( isset( self::$global_styles_block_names ) ) {
+			return self::$global_styles_block_names;
+		}
+		// Get the per block settings from the theme.json.
+		$tree        = WP_Theme_JSON_Resolver::get_merged_data();
+		$block_nodes = $tree->get_styles_block_nodes();
+		$theme_json  = $tree->get_raw_data();
+
+		self::$global_styles_block_names = array();
+
+		foreach ( $block_nodes as $block_node ) {
+			// This block definition doesn't include any duotone settings. Skip it.
+			if ( empty( $block_node['duotone'] ) ) {
+				continue;
+			}
+
+			// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|blue-orange'.
+			$duotone_attr_path = array_merge( $block_node['path'], array( 'filter', 'duotone' ) );
+			$duotone_attr      = _wp_array_get( $theme_json, $duotone_attr_path, array() );
+
+			if ( empty( $duotone_attr ) ) {
+				continue;
+			}
+			// If it has a duotone filter preset, save the block name and the preset slug.
+			$slug = self::get_slug_from_attribute( $duotone_attr );
+
+			if ( $slug && $slug !== $duotone_attr ) {
+				self::$global_styles_block_names[ $block_node['name'] ] = $slug;
 			}
 		}
 		return self::$global_styles_block_names;

From a409693f13e13c2f5c17dc5565c27708d0b54510 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Thu, 13 Jul 2023 10:56:59 +0100
Subject: [PATCH 18/20] Fix comments.

---
 src/wp-includes/class-wp-duotone.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index c039ee3bb2db6..edbde490aae5b 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -1071,7 +1071,6 @@ private static function get_all_global_style_block_names() {
 	 * @param  string   $block_content Rendered block content.
 	 * @param  array    $block         Block object.
 	 * @param  WP_Block $wp_block      The block instance.
-	 *
 	 * @return string Filtered block content.
 	 */
 	public static function render_duotone_support( $block_content, $block, $wp_block ) {
@@ -1262,7 +1261,6 @@ public static function add_editor_settings( $settings ) {
 	 *
 	 * @param array $settings Current block type settings.
 	 * @param array $metadata Block metadata as read in via block.json.
-	 *
 	 * @return array Filtered block type settings.
 	 */
 	public static function migrate_experimental_duotone_support_flag( $settings, $metadata ) {

From 890182a6adbe35835f32d4897d7d4118cd8cc3e7 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Thu, 13 Jul 2023 11:32:37 +0100
Subject: [PATCH 19/20] Comment feedback @swissspidy.

---
 src/wp-includes/class-wp-duotone.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index edbde490aae5b..75836800e68d4 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -944,12 +944,9 @@ public static function register_duotone_support( $block_type ) {
 	 * This handles selectors defined in `color.__experimentalDuotone` support
 	 * if `filter.duotone` support is not defined.
 	 *
-	 * @param WP_Block_Type $block_type Block type to check for support.
-	 *
 	 * @internal
-	 *
 	 * @since 6.3.0
-	 *
+	 * @param WP_Block_Type $block_type Block type to check for support.
 	 * @return string The CSS selector or null if there is no support.
 	 */
 	private static function get_selector( $block_type ) {
@@ -958,7 +955,7 @@ private static function get_selector( $block_type ) {
 		}
 
 		/*
-		 * Backwards compatibility with `supports.color.__experimentalDuotone`
+		 * Backward compatibility with `supports.color.__experimentalDuotone`
 		 * is provided via the `block_type_metadata_settings` filter. If
 		 * `supports.filter.duotone` has not been set and the experimental
 		 * property has been, the experimental property value is copied into

From 31233bd8f10d6bdff22048c0ba61d1e87db6d405 Mon Sep 17 00:00:00 2001
From: Jonny Harris <spacedmonkey@users.noreply.github.com>
Date: Thu, 13 Jul 2023 12:17:30 +0100
Subject: [PATCH 20/20] Apply suggestions from code review

Co-authored-by: Pascal Birchler <pascal.birchler@gmail.com>
---
 src/wp-includes/class-wp-duotone.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 75836800e68d4..70d4798ba133b 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -946,8 +946,9 @@ public static function register_duotone_support( $block_type ) {
 	 *
 	 * @internal
 	 * @since 6.3.0
+	 *
 	 * @param WP_Block_Type $block_type Block type to check for support.
-	 * @return string The CSS selector or null if there is no support.
+	 * @return string|null The CSS selector or null if there is no support.
 	 */
 	private static function get_selector( $block_type ) {
 		if ( ! ( $block_type instanceof WP_Block_Type ) ) {