Changeset 59338

Timestamp:

11/04/2024 02:32:25 AM (5 months ago)

Author:

ramonopoly

Message:

Theme JSON Resolver: remove theme json merge in resolve_theme_file_uris

This commit affects WP_Theme_JSON_Resolver::resolve_theme_file_uris().

When setting resolved URIs in an incoming theme json object, this commit removes the unnecessary call to WP_Theme_JSON->merge().

Why? WP_Theme_JSON_Resolver::resolve_theme_file_uris() only needs to set values for paths in the raw theme json object. It can then return a new theme object based on the updated JSON source. There's no need for a full and possibly expensive merge.

Follow-up to [61588].

Props ramonopoly, aaronrobertshaw, andrewserong.
Fixes #62329.

File:

• trunk/src/wp-includes/class-wp-theme-json-resolver.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -934 +934 @@
         }
 
-        $resolved_theme_json_data = array(
-            'version' => WP_Theme_JSON::LATEST_SCHEMA,
-        );
+        $resolved_theme_json_data = $theme_json->get_raw_data();
 
         foreach ( $resolved_urls as $resolved_url ) {
@@ -943 +941 @@
         }
 
-        $theme_json->merge( new WP_Theme_JSON( $resolved_theme_json_data ) );
-
-        return $theme_json;
+        return new WP_Theme_JSON( $resolved_theme_json_data );
     }