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

Timestamp:

06/06/2024 08:00:08 AM (7 months 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-schema.php (modified) (4 diffs)

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

@@ -36 +36 @@
      *
      * @since 5.9.0
-     * @since 6.6.0 Migrate up to v3.
+     * @since 6.6.0 Migrate up to v3 and add $origin parameter.
      *
      * @param array $theme_json The structure to migrate.
-     *
+     * @param string $origin    Optional. What source of data this object represents.
+     *                          One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
      * @return array The structure in the last version.
      */
-    public static function migrate( $theme_json ) {
+    public static function migrate( $theme_json, $origin = 'theme' ) {
         if ( ! isset( $theme_json['version'] ) ) {
             $theme_json = array(
@@ -55 +56 @@
                 // Deliberate fall through. Once migrated to v2, also migrate to v3.
             case 2:
-                $theme_json = self::migrate_v2_to_v3( $theme_json );
+                $theme_json = self::migrate_v2_to_v3( $theme_json, $origin );
         }
 
@@ -101 +102 @@
      * @since 6.6.0
      *
-     * @param array $old Data to migrate.
-     *
+     * @param array $old     Data to migrate.
+     * @param string $origin What source of data this object represents.
+     *                       One of 'blocks', 'default', 'theme', or 'custom'.
      * @return array Data with defaultFontSizes set to false.
      */
-    private static function migrate_v2_to_v3( $old ) {
+    private static function migrate_v2_to_v3( $old, $origin ) {
         // Copy everything.
         $new = $old;
@@ -116 +118 @@
          * as they should take on the value of the theme origin.
          */
-        if (
-            isset( $new['isGlobalStylesUserThemeJSON'] ) &&
-            true === $new['isGlobalStylesUserThemeJSON']
-        ) {
+        if ( 'custom' === $origin ) {
             return $new;
         }