Icons: Override WP_Icons_Registry singleton with Gutenberg icons registry

lib/compat/wordpress-7.1/class-gutenberg-icons-registry-7-1.php → lib/class-wp-icons-registry-gutenberg.php

@@ -1,6 +1,6 @@
 <?php
 
-class Gutenberg_Icons_Registry_7_1 extends WP_Icons_Registry {
+class WP_Icons_Registry_Gutenberg extends WP_Icons_Registry {
 	/**
 	 * Modified to point $manifest_path to Gutenberg packages
 	 */
@@ -87,3 +87,39 @@ public static function get_instance() {
 		return self::$instance;
 	}
 }
+
+/**
+ * Forces WP_Icons_Registry_Gutenberg instantiation and overrides WP_Icons_Registry
+ * so that all code using WP_Icons_Registry::{method_name}() receives the Gutenberg
+ * registry.
+ */
+function gutenberg_override_wp_icons_registry() {
+	$reflection = new ReflectionClass( WP_Icons_Registry::class );
+	$property   = $reflection->getProperty( 'instance' );
+	$property->setAccessible( true );
+	$original_registry  = $property->getValue( null );
+	$gutenberg_registry = WP_Icons_Registry_Gutenberg::get_instance();
+
+	// If the original registry was already instantiated, replay any icons outside
+	// the `core/` namespace onto the Gutenberg registry so they are not lost.
+	if ( null !== $original_registry ) {
+		$register_method = new ReflectionMethod( WP_Icons_Registry_Gutenberg::class, 'register' );
+		$register_method->setAccessible( true );
+		foreach ( $original_registry->get_registered_icons() as $icon ) {
+			if ( strpos( $icon['name'], 'core/' ) === 0 ) {
+				continue;
+			}
+			$icon_properties = array( 'label' => $icon['label'] );
+			if ( ! empty( $icon['content'] ) ) {
+				$icon_properties['content'] = $icon['content'];
+			} elseif ( ! empty( $icon['filePath'] ) ) {
+				$icon_properties['filePath'] = $icon['filePath'];
+			} else {
+				continue;
+			}
+			$register_method->invoke( $gutenberg_registry, $icon['name'], $icon_properties );
+		}
+	}
+	$property->setValue( null, $gutenberg_registry );
+}
+add_action( 'init', 'gutenberg_override_wp_icons_registry', 1 );

lib/class-wp-rest-icons-controller-gutenberg.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * REST API: Bundle WP_Icons_Registry_Gutenberg class instead of inheriting per WordPress version class
+ *
+ * Changes to this class should be synced to the corresponding class
+ * in WordPress core: src/wp-includes/rest-api/endpoints/class-wp-rest-icons-controller.php.
+ *
+ * @package    gutenberg
+ * @subpackage REST_API
+ */
+
+/**
+ * Gutenberg Icons REST API Controller.
+ *
+ * @since 7.1.0
+ */
+class WP_REST_Icons_Controller_Gutenberg extends WP_REST_Icons_Controller {
+}

lib/load.php

@@ -79,14 +79,11 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/compat/wordpress-7.0/class-wp-connector-registry.php';
 	require __DIR__ . '/compat/wordpress-7.0/connectors.php';
 
-	// WordPress 7.1 compat.
-	require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-icons-registry-7-1.php';
-	require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-icons-controller-7-1.php';
-	require __DIR__ . '/compat/wordpress-7.1/rest-api.php';
-
 	// Plugin specific code.
 	require_once __DIR__ . '/class-wp-rest-global-styles-controller-gutenberg.php';
 	require_once __DIR__ . '/class-wp-rest-edit-site-export-controller-gutenberg.php';
+	require_once __DIR__ . '/class-wp-icons-registry-gutenberg.php';
+	require_once __DIR__ . '/class-wp-rest-icons-controller-gutenberg.php';
 	require_once __DIR__ . '/rest-api.php';
 
 	// Experimental autosaves controller override for real-time collaboration.

lib/rest-api.php

@@ -41,7 +41,7 @@ function gutenberg_register_edit_site_export_controller_endpoints() {
  * Registers the Icons Registry REST API routes.
  */
 function gutenberg_register_icon_controller_endpoints() {
-	$icons_registry = new WP_REST_Icons_Controller();
-	$icons_registry->register_routes();
+	$icons_controller = new WP_REST_Icons_Controller_Gutenberg();
+	$icons_controller->register_routes();
 }
 add_action( 'rest_api_init', 'gutenberg_register_icon_controller_endpoints' );