Changeset 58354 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

06/06/2024 08:00:08 AM (2 years ago)

Author:

oandregal

Message:

Editor: code quality improvements for theme.json migrate API

Backports ​https://github.com/WordPress/gutenberg/pull/62305

Follow-up to [58328], #61282.

Props ajlende, oandregal, ramonopoly, mukesh27.
Fixes #61282.

File:

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

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

@@ -748 +748 @@
          * @param array  $theme_json A structure that follows the theme.json schema.
          * @param string $origin     Optional. What source of data this object represents.
-         *                           One of 'default', 'theme', or 'custom'. Default 'theme'.
+         *                           One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
          */
         public function __construct( $theme_json = array( 'version' => WP_Theme_JSON::LATEST_SCHEMA ), $origin = 'theme' ) {
@@ -755 +755 @@
                 }
 
-                $this->theme_json    = WP_Theme_JSON_Schema::migrate( $theme_json );
+                $this->theme_json    = WP_Theme_JSON_Schema::migrate( $theme_json, $origin );
                 $valid_block_names   = array_keys( static::get_blocks_metadata() );
                 $valid_element_names = array_keys( static::ELEMENTS );
@@ -3243 +3243 @@
          * @since 5.9.0
          * @since 6.3.2 Preserves global styles block variations when securing styles.
-         * @since 6.6.0 Updated to allow variation element styles.
+         * @since 6.6.0 Updated to allow variation element styles and $origin parameter.
          *
          * @param array $theme_json Structure to sanitize.
+         * @param string $origin    Optional. What source of data this object represents.
+         *                          One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
          * @return array Sanitized structure.
          */
-        public static function remove_insecure_properties( $theme_json ) {
+        public static function remove_insecure_properties( $theme_json, $origin = 'theme' ) {
+                if ( ! in_array( $origin, static::VALID_ORIGINS, true ) ) {
+                        $origin = 'theme';
+                }
+
                 $sanitized = array();
 
-                $theme_json = WP_Theme_JSON_Schema::migrate( $theme_json );
+                $theme_json = WP_Theme_JSON_Schema::migrate( $theme_json, $origin );
 
                 $valid_block_names   = array_keys( static::get_blocks_metadata() );