Changeset 58185

Timestamp:

05/23/2024 04:12:31 PM (5 months ago)

Author:

joemcgill

Message:

Editor: Remove additional calls to WP_Theme_JSON::_construct.

This improves performance of the WP_Theme_JSON_Resolver class by avoiding redundant construction of WP_Theme_JSON objects for each origin.

Props thekt12, joemcgill, swissspidy, audrasjb, oandregal.
Fixes #61112.

Location:

trunk/src/wp-includes

Files:

• class-wp-theme-json-data.php (modified) (1 diff)
• class-wp-theme-json-resolver.php (modified) (5 diffs)

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

@@ -70 +70 @@
         return $this->theme_json->get_raw_data();
     }
+
+    /**
+     * Returns theme JSON object.
+     *
+     * @since 6.6.0
+     *
+     * @return WP_Theme_JSON The theme JSON structure stored in this data object.
+     */
+    public function get_theme_json() {
+        return $this->theme_json;
+    }
 }

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

@@ -174 +174 @@
          */
         $theme_json   = apply_filters( 'wp_theme_json_data_default', new WP_Theme_JSON_Data( $config, 'default' ) );
-        $config       = $theme_json->get_data();
-        static::$core = new WP_Theme_JSON( $config, 'default' );
+        static::$core = $theme_json->get_theme_json();
 
         return static::$core;
@@ -256 +255 @@
              */
             $theme_json      = apply_filters( 'wp_theme_json_data_theme', new WP_Theme_JSON_Data( $theme_json_data, 'theme' ) );
-            $theme_json_data = $theme_json->get_data();
-            static::$theme   = new WP_Theme_JSON( $theme_json_data );
+            static::$theme   = $theme_json->get_theme_json();
 
             if ( $wp_theme->parent() ) {
@@ -388 +386 @@
          */
         $theme_json = apply_filters( 'wp_theme_json_data_blocks', new WP_Theme_JSON_Data( $config, 'blocks' ) );
-        $config     = $theme_json->get_data();
-
-        static::$blocks = new WP_Theme_JSON( $config, 'blocks' );
+        static::$blocks = $theme_json->get_theme_json();
         return static::$blocks;
     }
@@ -524 +520 @@
                  */
                 $theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
-                $config     = $theme_json->get_data();
-                return new WP_Theme_JSON( $config, 'custom' );
+                return $theme_json->get_theme_json();
             }
 
@@ -544 +539 @@
         /** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */
         $theme_json   = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
-        $config       = $theme_json->get_data();
-        static::$user = new WP_Theme_JSON( $config, 'custom' );
+        static::$user = $theme_json->get_theme_json();
 
         return static::$user;