Changeset 52746

Timestamp:

02/17/2022 11:13:09 AM (3 years ago)

Author:

audrasjb

Message:

Themes: Allow extending WP_Theme_JSON and WP_Theme_JSON_Resolver classes.

This change updates methods visibility from private to protected and adds late static binding.

Original PRs from Gutenberg repository:

• ​https://github.com/WordPress/gutenberg/pull/38625
• ​https://github.com/WordPress/gutenberg/pull/38671

Props oandregal, Mamaduka, kapilpaul.
Merges [52744] to the 5.9 branch.
Fixes #55178.
See #55179.

Location:

branches/5.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-theme-json-resolver.php (modified) (19 diffs)
• src/wp-includes/class-wp-theme-json.php (modified) (64 diffs)

branches/5.9/src/wp-includes/class-wp-theme-json-resolver.php

@@ -26 +26 @@
      * @var WP_Theme_JSON
      */
-    private static $core = null;
+    protected static $core = null;
 
     /**
@@ -34 +34 @@
      * @var WP_Theme_JSON
      */
-    private static $theme = null;
+    protected static $theme = null;
 
     /**
@@ -42 +42 @@
      * @var bool
      */
-    private static $theme_has_support = null;
+    protected static $theme_has_support = null;
 
     /**
@@ -50 +50 @@
      * @var WP_Theme_JSON
      */
-    private static $user = null;
+    protected static $user = null;
 
     /**
@@ -59 +59 @@
      * @var int
      */
-    private static $user_custom_post_type_id = null;
+    protected static $user_custom_post_type_id = null;
 
     /**
@@ -68 +68 @@
      * @var array
      */
-    private static $i18n_schema = null;
+    protected static $i18n_schema = null;
 
     /**
@@ -79 +79 @@
      * @return array Contents that adhere to the theme.json schema.
      */
-    private static function read_json_file( $file_path ) {
+    protected static function read_json_file( $file_path ) {
         $config = array();
         if ( $file_path ) {
@@ -114 +114 @@
      * @return array Returns the modified $theme_json_structure.
      */
-    private static function translate( $theme_json, $domain = 'default' ) {
-        if ( null === self::$i18n_schema ) {
-            $i18n_schema       = wp_json_file_decode( __DIR__ . '/theme-i18n.json' );
-            self::$i18n_schema = null === $i18n_schema ? array() : $i18n_schema;
-        }
-
-        return translate_settings_using_i18n_schema( self::$i18n_schema, $theme_json, $domain );
+    protected static function translate( $theme_json, $domain = 'default' ) {
+        if ( null === static::$i18n_schema ) {
+            $i18n_schema         = wp_json_file_decode( __DIR__ . '/theme-i18n.json' );
+            static::$i18n_schema = null === $i18n_schema ? array() : $i18n_schema;
+        }
+
+        return translate_settings_using_i18n_schema( static::$i18n_schema, $theme_json, $domain );
     }
 
@@ -131 +131 @@
      */
     public static function get_core_data() {
-        if ( null !== self::$core ) {
-            return self::$core;
-        }
-
-        $config     = self::read_json_file( __DIR__ . '/theme.json' );
-        $config     = self::translate( $config );
-        self::$core = new WP_Theme_JSON( $config, 'default' );
-
-        return self::$core;
+        if ( null !== static::$core ) {
+            return static::$core;
+        }
+
+        $config       = static::read_json_file( __DIR__ . '/theme.json' );
+        $config       = static::translate( $config );
+        static::$core = new WP_Theme_JSON( $config, 'default' );
+
+        return static::$core;
     }
 
@@ -160 +160 @@
             _deprecated_argument( __METHOD__, '5.9.0' );
         }
-        if ( null === self::$theme ) {
-            $theme_json_data = self::read_json_file( self::get_file_path_from_theme( 'theme.json' ) );
-            $theme_json_data = self::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
-            self::$theme     = new WP_Theme_JSON( $theme_json_data );
+        if ( null === static::$theme ) {
+            $theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json' ) );
+            $theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
+            static::$theme   = new WP_Theme_JSON( $theme_json_data );
 
             if ( wp_get_theme()->parent() ) {
                 // Get parent theme.json.
-                $parent_theme_json_data = self::read_json_file( self::get_file_path_from_theme( 'theme.json', true ) );
-                $parent_theme_json_data = self::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) );
+                $parent_theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json', true ) );
+                $parent_theme_json_data = static::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) );
                 $parent_theme           = new WP_Theme_JSON( $parent_theme_json_data );
 
                 // Merge the child theme.json into the parent theme.json.
                 // The child theme takes precedence over the parent.
-                $parent_theme->merge( self::$theme );
-                self::$theme = $parent_theme;
+                $parent_theme->merge( static::$theme );
+                static::$theme = $parent_theme;
             }
         }
@@ -182 +182 @@
          * to override the ones declared via theme supports.
          * So we take theme supports, transform it to theme.json shape
-         * and merge the self::$theme upon that.
+         * and merge the static::$theme upon that.
          */
         $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
-        if ( ! self::theme_has_support() ) {
+        if ( ! static::theme_has_support() ) {
             if ( ! isset( $theme_support_data['settings']['color'] ) ) {
                 $theme_support_data['settings']['color'] = array();
@@ -211 +211 @@
         }
         $with_theme_supports = new WP_Theme_JSON( $theme_support_data );
-        $with_theme_supports->merge( self::$theme );
+        $with_theme_supports->merge( static::$theme );
 
         return $with_theme_supports;
@@ -300 +300 @@
      */
     public static function get_user_data() {
-        if ( null !== self::$user ) {
-            return self::$user;
+        if ( null !== static::$user ) {
+            return static::$user;
         }
 
         $config   = array();
-        $user_cpt = self::get_user_data_from_wp_global_styles( wp_get_theme() );
+        $user_cpt = static::get_user_data_from_wp_global_styles( wp_get_theme() );
 
         if ( array_key_exists( 'post_content', $user_cpt ) ) {
@@ -327 +327 @@
             }
         }
-        self::$user = new WP_Theme_JSON( $config, 'custom' );
-
-        return self::$user;
+        static::$user = new WP_Theme_JSON( $config, 'custom' );
+
+        return static::$user;
     }
 
@@ -364 +364 @@
 
         $result = new WP_Theme_JSON();
-        $result->merge( self::get_core_data() );
-        $result->merge( self::get_theme_data() );
+        $result->merge( static::get_core_data() );
+        $result->merge( static::get_theme_data() );
 
         if ( 'custom' === $origin ) {
-            $result->merge( self::get_user_data() );
+            $result->merge( static::get_user_data() );
         }
 
@@ -383 +383 @@
      */
     public static function get_user_global_styles_post_id() {
-        if ( null !== self::$user_custom_post_type_id ) {
-            return self::$user_custom_post_type_id;
-        }
-
-        $user_cpt = self::get_user_data_from_wp_global_styles( wp_get_theme(), true );
+        if ( null !== static::$user_custom_post_type_id ) {
+            return static::$user_custom_post_type_id;
+        }
+
+        $user_cpt = static::get_user_data_from_wp_global_styles( wp_get_theme(), true );
 
         if ( array_key_exists( 'ID', $user_cpt ) ) {
-            self::$user_custom_post_type_id = $user_cpt['ID'];
-        }
-
-        return self::$user_custom_post_type_id;
+            static::$user_custom_post_type_id = $user_cpt['ID'];
+        }
+
+        return static::$user_custom_post_type_id;
     }
 
@@ -405 +405 @@
      */
     public static function theme_has_support() {
-        if ( ! isset( self::$theme_has_support ) ) {
-            self::$theme_has_support = (
-                is_readable( self::get_file_path_from_theme( 'theme.json' ) ) ||
-                is_readable( self::get_file_path_from_theme( 'theme.json', true ) )
+        if ( ! isset( static::$theme_has_support ) ) {
+            static::$theme_has_support = (
+                is_readable( static::get_file_path_from_theme( 'theme.json' ) ) ||
+                is_readable( static::get_file_path_from_theme( 'theme.json', true ) )
             );
         }
 
-        return self::$theme_has_support;
+        return static::$theme_has_support;
     }
 
@@ -427 +427 @@
      * @return string The whole file path or empty if the file doesn't exist.
      */
-    private static function get_file_path_from_theme( $file_name, $template = false ) {
+    protected static function get_file_path_from_theme( $file_name, $template = false ) {
         $path      = $template ? get_template_directory() : get_stylesheet_directory();
         $candidate = $path . '/' . $file_name;
@@ -442 +442 @@
      */
     public static function clean_cached_data() {
-        self::$core                     = null;
-        self::$theme                    = null;
-        self::$user                     = null;
-        self::$user_custom_post_type_id = null;
-        self::$theme_has_support        = null;
-        self::$i18n_schema              = null;
+        static::$core                     = null;
+        static::$theme                    = null;
+        static::$user                     = null;
+        static::$user_custom_post_type_id = null;
+        static::$theme_has_support        = null;
+        static::$i18n_schema              = null;
     }
 

branches/5.9/src/wp-includes/class-wp-theme-json.php

@@ -25 +25 @@
      * @var array
      */
-    private $theme_json = null;
+    protected $theme_json = null;
 
     /**
@@ -35 +35 @@
      * @var array
      */
-    private static $blocks_metadata = null;
+    protected static $blocks_metadata = null;
 
     /**
@@ -367 +367 @@
      */
     public function __construct( $theme_json = array(), $origin = 'theme' ) {
-        if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) {
+        if ( ! in_array( $origin, static::VALID_ORIGINS, true ) ) {
             $origin = 'theme';
         }
 
         $this->theme_json    = WP_Theme_JSON_Schema::migrate( $theme_json );
-        $valid_block_names   = array_keys( self::get_blocks_metadata() );
-        $valid_element_names = array_keys( self::ELEMENTS );
-        $theme_json          = self::sanitize( $this->theme_json, $valid_block_names, $valid_element_names );
-        $this->theme_json    = self::maybe_opt_in_into_settings( $theme_json );
+        $valid_block_names   = array_keys( static::get_blocks_metadata() );
+        $valid_element_names = array_keys( static::ELEMENTS );
+        $theme_json          = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names );
+        $this->theme_json    = static::maybe_opt_in_into_settings( $theme_json );
 
         // Internally, presets are keyed by origin.
-        $nodes = self::get_setting_nodes( $this->theme_json );
+        $nodes = static::get_setting_nodes( $this->theme_json );
         foreach ( $nodes as $node ) {
-            foreach ( self::PRESETS_METADATA as $preset_metadata ) {
+            foreach ( static::PRESETS_METADATA as $preset_metadata ) {
                 $path   = array_merge( $node['path'], $preset_metadata['path'] );
                 $preset = _wp_array_get( $this->theme_json, $path, null );
@@ -401 +401 @@
      * @return array The modified theme.json structure.
      */
-    private static function maybe_opt_in_into_settings( $theme_json ) {
+    protected static function maybe_opt_in_into_settings( $theme_json ) {
         $new_theme_json = $theme_json;
 
@@ -408 +408 @@
             true === $new_theme_json['settings']['appearanceTools']
         ) {
-            self::do_opt_in_into_settings( $new_theme_json['settings'] );
+            static::do_opt_in_into_settings( $new_theme_json['settings'] );
         }
 
@@ -414 +414 @@
             foreach ( $new_theme_json['settings']['blocks'] as &$block ) {
                 if ( isset( $block['appearanceTools'] ) && ( true === $block['appearanceTools'] ) ) {
-                    self::do_opt_in_into_settings( $block );
+                    static::do_opt_in_into_settings( $block );
                 }
             }
@@ -429 +429 @@
      * @param array $context The context to which the settings belong.
      */
-    private static function do_opt_in_into_settings( &$context ) {
+    protected static function do_opt_in_into_settings( &$context ) {
         $to_opt_in = array(
             array( 'border', 'color' ),
@@ -464 +464 @@
      * @return array The sanitized output.
      */
-    private static function sanitize( $input, $valid_block_names, $valid_element_names ) {
+    protected static function sanitize( $input, $valid_block_names, $valid_element_names ) {
         $output = array();
 
@@ -471 +471 @@
         }
 
-        $output = array_intersect_key( $input, array_flip( self::VALID_TOP_LEVEL_KEYS ) );
+        $output = array_intersect_key( $input, array_flip( static::VALID_TOP_LEVEL_KEYS ) );
 
         // Some styles are only meant to be available at the top-level (e.g.: blockGap),
         // hence, the schema for blocks & elements should not have them.
-        $styles_non_top_level = self::VALID_STYLES;
+        $styles_non_top_level = static::VALID_STYLES;
         foreach ( array_keys( $styles_non_top_level ) as $section ) {
             foreach ( array_keys( $styles_non_top_level[ $section ] ) as $prop ) {
@@ -493 +493 @@
         $schema_settings_blocks = array();
         foreach ( $valid_block_names as $block ) {
-            $schema_settings_blocks[ $block ]           = self::VALID_SETTINGS;
+            $schema_settings_blocks[ $block ]           = static::VALID_SETTINGS;
             $schema_styles_blocks[ $block ]             = $styles_non_top_level;
             $schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements;
         }
-        $schema['styles']             = self::VALID_STYLES;
+        $schema['styles']             = static::VALID_STYLES;
         $schema['styles']['blocks']   = $schema_styles_blocks;
         $schema['styles']['elements'] = $schema_styles_elements;
-        $schema['settings']           = self::VALID_SETTINGS;
+        $schema['settings']           = static::VALID_SETTINGS;
         $schema['settings']['blocks'] = $schema_settings_blocks;
 
@@ -514 +514 @@
             }
 
-            $result = self::remove_keys_not_in_schema( $input[ $subtree ], $schema[ $subtree ] );
+            $result = static::remove_keys_not_in_schema( $input[ $subtree ], $schema[ $subtree ] );
 
             if ( empty( $result ) ) {
@@ -555 +555 @@
      * @return array Block metadata.
      */
-    private static function get_blocks_metadata() {
-        if ( null !== self::$blocks_metadata ) {
-            return self::$blocks_metadata;
-        }
-
-        self::$blocks_metadata = array();
+    protected static function get_blocks_metadata() {
+        if ( null !== static::$blocks_metadata ) {
+            return static::$blocks_metadata;
+        }
+
+        static::$blocks_metadata = array();
 
         $registry = WP_Block_Type_Registry::get_instance();
@@ -569 +569 @@
                 is_string( $block_type->supports['__experimentalSelector'] )
             ) {
-                self::$blocks_metadata[ $block_name ]['selector'] = $block_type->supports['__experimentalSelector'];
+                static::$blocks_metadata[ $block_name ]['selector'] = $block_type->supports['__experimentalSelector'];
             } else {
-                self::$blocks_metadata[ $block_name ]['selector'] = '.wp-block-' . str_replace( '/', '-', str_replace( 'core/', '', $block_name ) );
+                static::$blocks_metadata[ $block_name ]['selector'] = '.wp-block-' . str_replace( '/', '-', str_replace( 'core/', '', $block_name ) );
             }
 
@@ -578 +578 @@
                 is_string( $block_type->supports['color']['__experimentalDuotone'] )
             ) {
-                self::$blocks_metadata[ $block_name ]['duotone'] = $block_type->supports['color']['__experimentalDuotone'];
+                static::$blocks_metadata[ $block_name ]['duotone'] = $block_type->supports['color']['__experimentalDuotone'];
             }
 
@@ -584 +584 @@
             // If the block selector is compounded, will append the element to each
             // individual block selector.
-            $block_selectors = explode( ',', self::$blocks_metadata[ $block_name ]['selector'] );
-            foreach ( self::ELEMENTS as $el_name => $el_selector ) {
+            $block_selectors = explode( ',', static::$blocks_metadata[ $block_name ]['selector'] );
+            foreach ( static::ELEMENTS as $el_name => $el_selector ) {
                 $element_selector = array();
                 foreach ( $block_selectors as $selector ) {
                     $element_selector[] = $selector . ' ' . $el_selector;
                 }
-                self::$blocks_metadata[ $block_name ]['elements'][ $el_name ] = implode( ',', $element_selector );
-            }
-        }
-
-        return self::$blocks_metadata;
+                static::$blocks_metadata[ $block_name ]['elements'][ $el_name ] = implode( ',', $element_selector );
+            }
+        }
+
+        return static::$blocks_metadata;
     }
 
@@ -608 +608 @@
      * @return array Returns the modified $tree.
      */
-    private static function remove_keys_not_in_schema( $tree, $schema ) {
+    protected static function remove_keys_not_in_schema( $tree, $schema ) {
         $tree = array_intersect_key( $tree, $schema );
 
@@ -617 +617 @@
 
             if ( is_array( $schema[ $key ] ) && is_array( $tree[ $key ] ) ) {
-                $tree[ $key ] = self::remove_keys_not_in_schema( $tree[ $key ], $schema[ $key ] );
+                $tree[ $key ] = static::remove_keys_not_in_schema( $tree[ $key ], $schema[ $key ] );
 
                 if ( empty( $tree[ $key ] ) ) {
@@ -671 +671 @@
      *                       - `styles`: only the styles section in theme.json.
      *                       - `presets`: only the classes for the presets.
-     * @param array $origins A list of origins to include. By default it includes `self::VALID_ORIGINS`.
+     * @param array $origins A list of origins to include. By default it includes VALID_ORIGINS.
      * @return string Stylesheet.
      */
-    public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = self::VALID_ORIGINS ) {
+    public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null ) {
+        if ( null === $origins ) {
+            $origins = static::VALID_ORIGINS;
+        }
+
         if ( is_string( $types ) ) {
             // Dispatch error and map old arguments to new ones.
@@ -687 +691 @@
         }
 
-        $blocks_metadata = self::get_blocks_metadata();
-        $style_nodes     = self::get_style_nodes( $this->theme_json, $blocks_metadata );
-        $setting_nodes   = self::get_setting_nodes( $this->theme_json, $blocks_metadata );
+        $blocks_metadata = static::get_blocks_metadata();
+        $style_nodes     = static::get_style_nodes( $this->theme_json, $blocks_metadata );
+        $setting_nodes   = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
 
         $stylesheet = '';
@@ -776 +780 @@
      * @return string The new stylesheet.
      */
-    private function get_block_classes( $style_nodes ) {
+    protected function get_block_classes( $style_nodes ) {
         $block_rules = '';
 
@@ -787 +791 @@
             $selector     = $metadata['selector'];
             $settings     = _wp_array_get( $this->theme_json, array( 'settings' ) );
-            $declarations = self::compute_style_properties( $node, $settings );
+            $declarations = static::compute_style_properties( $node, $settings );
 
             // 1. Separate the ones who use the general selector
@@ -807 +811 @@
              * @link https://github.com/WordPress/gutenberg/issues/36147.
              */
-            if ( self::ROOT_BLOCK_SELECTOR === $selector ) {
+            if ( static::ROOT_BLOCK_SELECTOR === $selector ) {
                 $block_rules .= 'body { margin: 0; }';
             }
 
             // 2. Generate the rules that use the general selector.
-            $block_rules .= self::to_ruleset( $selector, $declarations );
+            $block_rules .= static::to_ruleset( $selector, $declarations );
 
             // 3. Generate the rules that use the duotone selector.
             if ( isset( $metadata['duotone'] ) && ! empty( $declarations_duotone ) ) {
-                $selector_duotone = self::scope_selector( $metadata['selector'], $metadata['duotone'] );
-                $block_rules     .= self::to_ruleset( $selector_duotone, $declarations_duotone );
-            }
-
-            if ( self::ROOT_BLOCK_SELECTOR === $selector ) {
+                $selector_duotone = static::scope_selector( $metadata['selector'], $metadata['duotone'] );
+                $block_rules     .= static::to_ruleset( $selector_duotone, $declarations_duotone );
+            }
+
+            if ( static::ROOT_BLOCK_SELECTOR === $selector ) {
                 $block_rules .= '.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }';
                 $block_rules .= '.wp-site-blocks > .alignright { float: right; margin-left: 2em; }';
@@ -865 +869 @@
      * @return string The new stylesheet.
      */
-    private function get_preset_classes( $setting_nodes, $origins ) {
+    protected function get_preset_classes( $setting_nodes, $origins ) {
         $preset_rules = '';
 
@@ -875 +879 @@
             $selector      = $metadata['selector'];
             $node          = _wp_array_get( $this->theme_json, $metadata['path'], array() );
-            $preset_rules .= self::compute_preset_classes( $node, $selector, $origins );
+            $preset_rules .= static::compute_preset_classes( $node, $selector, $origins );
         }
 
@@ -902 +906 @@
      * @return string The new stylesheet.
      */
-    private function get_css_variables( $nodes, $origins ) {
+    protected function get_css_variables( $nodes, $origins ) {
         $stylesheet = '';
         foreach ( $nodes as $metadata ) {
@@ -912 +916 @@
 
             $node         = _wp_array_get( $this->theme_json, $metadata['path'], array() );
-            $declarations = array_merge( self::compute_preset_vars( $node, $origins ), self::compute_theme_vars( $node ) );
-
-            $stylesheet .= self::to_ruleset( $selector, $declarations );
+            $declarations = array_merge( static::compute_preset_vars( $node, $origins ), static::compute_theme_vars( $node ) );
+
+            $stylesheet .= static::to_ruleset( $selector, $declarations );
         }
 
@@ -930 +934 @@
      * @return string CSS ruleset.
      */
-    private static function to_ruleset( $selector, $declarations ) {
+    protected static function to_ruleset( $selector, $declarations ) {
         if ( empty( $declarations ) ) {
             return '';
@@ -958 +962 @@
      * @return string
      */
-    private static function append_to_selector( $selector, $to_append ) {
+    protected static function append_to_selector( $selector, $to_append ) {
         $new_selectors = array();
         $selectors     = explode( ',', $selector );
@@ -980 +984 @@
      * @return string The result of processing the presets.
      */
-    private static function compute_preset_classes( $settings, $selector, $origins ) {
-        if ( self::ROOT_BLOCK_SELECTOR === $selector ) {
+    protected static function compute_preset_classes( $settings, $selector, $origins ) {
+        if ( static::ROOT_BLOCK_SELECTOR === $selector ) {
             // Classes at the global level do not need any CSS prefixed,
             // and we don't want to increase its specificity.
@@ -988 +992 @@
 
         $stylesheet = '';
-        foreach ( self::PRESETS_METADATA as $preset_metadata ) {
-            $slugs = self::get_settings_slugs( $settings, $preset_metadata, $origins );
+        foreach ( static::PRESETS_METADATA as $preset_metadata ) {
+            $slugs = static::get_settings_slugs( $settings, $preset_metadata, $origins );
             foreach ( $preset_metadata['classes'] as $class => $property ) {
                 foreach ( $slugs as $slug ) {
-                    $css_var     = self::replace_slug_in_string( $preset_metadata['css_vars'], $slug );
-                    $class_name  = self::replace_slug_in_string( $class, $slug );
-                    $stylesheet .= self::to_ruleset(
-                        self::append_to_selector( $selector, $class_name ),
+                    $css_var     = static::replace_slug_in_string( $preset_metadata['css_vars'], $slug );
+                    $class_name  = static::replace_slug_in_string( $class, $slug );
+                    $stylesheet .= static::to_ruleset(
+                        static::append_to_selector( $selector, $class_name ),
                         array(
                             array(
@@ -1027 +1031 @@
      * @return string Scoped selector.
      */
-    private static function scope_selector( $scope, $selector ) {
+    protected static function scope_selector( $scope, $selector ) {
         $scopes    = explode( ',', $scope );
         $selectors = explode( ',', $selector );
@@ -1077 +1081 @@
      * @return array Array of presets where each key is a slug and each value is the preset value.
      */
-    private static function get_settings_values_by_slug( $settings, $preset_metadata, $origins ) {
+    protected static function get_settings_values_by_slug( $settings, $preset_metadata, $origins ) {
         $preset_per_origin = _wp_array_get( $settings, $preset_metadata['path'], array() );
 
@@ -1119 +1123 @@
      * @return array Array of presets where the key and value are both the slug.
      */
-    private static function get_settings_slugs( $settings, $preset_metadata, $origins = self::VALID_ORIGINS ) {
+    protected static function get_settings_slugs( $settings, $preset_metadata, $origins = null ) {
+        if ( null === $origins ) {
+            $origins = static::VALID_ORIGINS;
+        }
+
         $preset_per_origin = _wp_array_get( $settings, $preset_metadata['path'], array() );
 
@@ -1146 +1154 @@
      * @return string The CSS Custom Property. Something along the lines of `--wp--preset--color--black`.
      */
-    private static function replace_slug_in_string( $input, $slug ) {
+    protected static function replace_slug_in_string( $input, $slug ) {
         return strtr( $input, array( '$slug' => $slug ) );
     }
@@ -1167 +1175 @@
      * @return array Returns the modified $declarations.
      */
-    private static function compute_preset_vars( $settings, $origins ) {
+    protected static function compute_preset_vars( $settings, $origins ) {
         $declarations = array();
-        foreach ( self::PRESETS_METADATA as $preset_metadata ) {
-            $values_by_slug = self::get_settings_values_by_slug( $settings, $preset_metadata, $origins );
+        foreach ( static::PRESETS_METADATA as $preset_metadata ) {
+            $values_by_slug = static::get_settings_values_by_slug( $settings, $preset_metadata, $origins );
             foreach ( $values_by_slug as $slug => $value ) {
                 $declarations[] = array(
-                    'name'  => self::replace_slug_in_string( $preset_metadata['css_vars'], $slug ),
+                    'name'  => static::replace_slug_in_string( $preset_metadata['css_vars'], $slug ),
                     'value' => $value,
                 );
@@ -1197 +1205 @@
      * @return array Returns the modified $declarations.
      */
-    private static function compute_theme_vars( $settings ) {
+    protected static function compute_theme_vars( $settings ) {
         $declarations  = array();
         $custom_values = _wp_array_get( $settings, array( 'custom' ), array() );
-        $css_vars      = self::flatten_tree( $custom_values );
+        $css_vars      = static::flatten_tree( $custom_values );
         foreach ( $css_vars as $key => $value ) {
             $declarations[] = array(
@@ -1248 +1256 @@
      * @return array The flattened tree.
      */
-    private static function flatten_tree( $tree, $prefix = '', $token = '--' ) {
+    protected static function flatten_tree( $tree, $prefix = '', $token = '--' ) {
         $result = array();
         foreach ( $tree as $property => $value ) {
@@ -1261 +1269 @@
                 $result     = array_merge(
                     $result,
-                    self::flatten_tree( $value, $new_prefix, $token )
+                    static::flatten_tree( $value, $new_prefix, $token )
                 );
             } else {
@@ -1287 +1295 @@
      * @return array Returns the modified $declarations.
      */
-    private static function compute_style_properties( $styles, $settings = array(), $properties = self::PROPERTIES_METADATA ) {
+    protected static function compute_style_properties( $styles, $settings = array(), $properties = null ) {
+        if ( null === $properties ) {
+            $properties = static::PROPERTIES_METADATA;
+        }
+
         $declarations = array();
         if ( empty( $styles ) ) {
@@ -1294 +1306 @@
 
         foreach ( $properties as $css_property => $value_path ) {
-            $value = self::get_property_value( $styles, $value_path );
+            $value = static::get_property_value( $styles, $value_path );
 
             // Look up protected properties, keyed by value path.
@@ -1301 +1313 @@
                 $path_string = implode( '.', $value_path );
                 if (
-                    array_key_exists( $path_string, self::PROTECTED_PROPERTIES ) &&
-                    _wp_array_get( $settings, self::PROTECTED_PROPERTIES[ $path_string ], null ) === null
+                    array_key_exists( $path_string, static::PROTECTED_PROPERTIES ) &&
+                    _wp_array_get( $settings, static::PROTECTED_PROPERTIES[ $path_string ], null ) === null
                 ) {
                     continue;
@@ -1337 +1349 @@
      * @return string|array Style property value.
      */
-    private static function get_property_value( $styles, $path ) {
+    protected static function get_property_value( $styles, $path ) {
         $value = _wp_array_get( $styles, $path, '' );
 
@@ -1380 +1392 @@
      * @return array
      */
-    private static function get_setting_nodes( $theme_json, $selectors = array() ) {
+    protected static function get_setting_nodes( $theme_json, $selectors = array() ) {
         $nodes = array();
         if ( ! isset( $theme_json['settings'] ) ) {
@@ -1389 +1401 @@
         $nodes[] = array(
             'path'     => array( 'settings' ),
-            'selector' => self::ROOT_BLOCK_SELECTOR,
+            'selector' => static::ROOT_BLOCK_SELECTOR,
         );
 
@@ -1434 +1446 @@
      * @return array
      */
-    private static function get_style_nodes( $theme_json, $selectors = array() ) {
+    protected static function get_style_nodes( $theme_json, $selectors = array() ) {
         $nodes = array();
         if ( ! isset( $theme_json['styles'] ) ) {
@@ -1443 +1455 @@
         $nodes[] = array(
             'path'     => array( 'styles' ),
-            'selector' => self::ROOT_BLOCK_SELECTOR,
+            'selector' => static::ROOT_BLOCK_SELECTOR,
         );
 
@@ -1450 +1462 @@
                 $nodes[] = array(
                     'path'     => array( 'styles', 'elements', $element ),
-                    'selector' => self::ELEMENTS[ $element ],
+                    'selector' => static::ELEMENTS[ $element ],
                 );
             }
@@ -1524 +1536 @@
          * we remove it from the theme presets.
          */
-        $nodes        = self::get_setting_nodes( $incoming_data );
-        $slugs_global = self::get_default_slugs( $this->theme_json, array( 'settings' ) );
+        $nodes        = static::get_setting_nodes( $incoming_data );
+        $slugs_global = static::get_default_slugs( $this->theme_json, array( 'settings' ) );
         foreach ( $nodes as $node ) {
-            $slugs_node = self::get_default_slugs( $this->theme_json, $node['path'] );
+            $slugs_node = static::get_default_slugs( $this->theme_json, $node['path'] );
             $slugs      = array_merge_recursive( $slugs_global, $slugs_node );
 
@@ -1538 +1550 @@
 
             // Replace the presets.
-            foreach ( self::PRESETS_METADATA as $preset ) {
-                $override_preset = self::should_override_preset( $this->theme_json, $node['path'], $preset['override'] );
-
-                foreach ( self::VALID_ORIGINS as $origin ) {
+            foreach ( static::PRESETS_METADATA as $preset ) {
+                $override_preset = static::should_override_preset( $this->theme_json, $node['path'], $preset['override'] );
+
+                foreach ( static::VALID_ORIGINS as $origin ) {
                     $base_path = array_merge( $node['path'], $preset['path'] );
                     $path      = array_merge( $base_path, array( $origin ) );
@@ -1552 +1564 @@
                         foreach ( $content as &$item ) {
                             if ( ! array_key_exists( 'name', $item ) ) {
-                                $name = self::get_name_from_defaults( $item['slug'], $base_path );
+                                $name = static::get_name_from_defaults( $item['slug'], $base_path );
                                 if ( null !== $name ) {
                                     $item['name'] = $name;
@@ -1567 +1579 @@
                     } else {
                         $slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() );
-                        $content          = self::filter_slugs( $content, $slugs_for_preset );
+                        $content          = static::filter_slugs( $content, $slugs_for_preset );
                         _wp_array_set( $this->theme_json, $path, $content );
                     }
@@ -1585 +1597 @@
      * @return boolean
      */
-    private static function should_override_preset( $theme_json, $path, $override ) {
+    protected static function should_override_preset( $theme_json, $path, $override ) {
         if ( is_bool( $override ) ) {
             return $override;
@@ -1637 +1649 @@
      * @return array
      */
-    private static function get_default_slugs( $data, $node_path ) {
+    protected static function get_default_slugs( $data, $node_path ) {
         $slugs = array();
 
-        foreach ( self::PRESETS_METADATA as $metadata ) {
+        foreach ( static::PRESETS_METADATA as $metadata ) {
             $path   = array_merge( $node_path, $metadata['path'], array( 'default' ) );
             $preset = _wp_array_get( $data, $path, null );
@@ -1669 +1681 @@
      * @return string|null
      */
-    private function get_name_from_defaults( $slug, $base_path ) {
+    protected function get_name_from_defaults( $slug, $base_path ) {
         $path            = array_merge( $base_path, array( 'default' ) );
         $default_content = _wp_array_get( $this->theme_json, $path, null );
@@ -1692 +1704 @@
      * @return array The new node.
      */
-    private static function filter_slugs( $node, $slugs ) {
+    protected static function filter_slugs( $node, $slugs ) {
         if ( empty( $slugs ) ) {
             return $node;
@@ -1720 +1732 @@
         $theme_json = WP_Theme_JSON_Schema::migrate( $theme_json );
 
-        $valid_block_names   = array_keys( self::get_blocks_metadata() );
-        $valid_element_names = array_keys( self::ELEMENTS );
-        $theme_json          = self::sanitize( $theme_json, $valid_block_names, $valid_element_names );
-
-        $blocks_metadata = self::get_blocks_metadata();
-        $style_nodes     = self::get_style_nodes( $theme_json, $blocks_metadata );
+        $valid_block_names   = array_keys( static::get_blocks_metadata() );
+        $valid_element_names = array_keys( static::ELEMENTS );
+        $theme_json          = static::sanitize( $theme_json, $valid_block_names, $valid_element_names );
+
+        $blocks_metadata = static::get_blocks_metadata();
+        $style_nodes     = static::get_style_nodes( $theme_json, $blocks_metadata );
         foreach ( $style_nodes as $metadata ) {
             $input = _wp_array_get( $theme_json, $metadata['path'], array() );
@@ -1732 +1744 @@
             }
 
-            $output = self::remove_insecure_styles( $input );
+            $output = static::remove_insecure_styles( $input );
             if ( ! empty( $output ) ) {
                 _wp_array_set( $sanitized, $metadata['path'], $output );
@@ -1738 +1750 @@
         }
 
-        $setting_nodes = self::get_setting_nodes( $theme_json );
+        $setting_nodes = static::get_setting_nodes( $theme_json );
         foreach ( $setting_nodes as $metadata ) {
             $input = _wp_array_get( $theme_json, $metadata['path'], array() );
@@ -1745 +1757 @@
             }
 
-            $output = self::remove_insecure_settings( $input );
+            $output = static::remove_insecure_settings( $input );
             if ( ! empty( $output ) ) {
                 _wp_array_set( $sanitized, $metadata['path'], $output );
@@ -1775 +1787 @@
      * @return array
      */
-    private static function remove_insecure_settings( $input ) {
+    protected static function remove_insecure_settings( $input ) {
         $output = array();
-        foreach ( self::PRESETS_METADATA as $preset_metadata ) {
-            foreach ( self::VALID_ORIGINS as $origin ) {
+        foreach ( static::PRESETS_METADATA as $preset_metadata ) {
+            foreach ( static::VALID_ORIGINS as $origin ) {
                 $path_with_origin = array_merge( $preset_metadata['path'], array( $origin ) );
                 $presets          = _wp_array_get( $input, $path_with_origin, null );
@@ -1803 +1815 @@
                         $preset_is_valid = true;
                         foreach ( $preset_metadata['properties'] as $property ) {
-                            if ( ! self::is_safe_css_declaration( $property, $value ) ) {
+                            if ( ! static::is_safe_css_declaration( $property, $value ) ) {
                                 $preset_is_valid = false;
                                 break;
@@ -1832 +1844 @@
      * @return array
      */
-    private static function remove_insecure_styles( $input ) {
+    protected static function remove_insecure_styles( $input ) {
         $output       = array();
-        $declarations = self::compute_style_properties( $input );
+        $declarations = static::compute_style_properties( $input );
 
         foreach ( $declarations as $declaration ) {
-            if ( self::is_safe_css_declaration( $declaration['name'], $declaration['value'] ) ) {
-                $path = self::PROPERTIES_METADATA[ $declaration['name'] ];
+            if ( static::is_safe_css_declaration( $declaration['name'], $declaration['value'] ) ) {
+                $path = static::PROPERTIES_METADATA[ $declaration['name'] ];
 
                 // Check the value isn't an array before adding so as to not
@@ -1860 +1872 @@
      * @return bool
      */
-    private static function is_safe_css_declaration( $property_name, $property_value ) {
+    protected static function is_safe_css_declaration( $property_name, $property_value ) {
         $style_to_validate = $property_name . ': ' . $property_value;
         $filtered          = esc_html( safecss_filter_attr( $style_to_validate ) );
@@ -1888 +1900 @@
     public static function get_from_editor_settings( $settings ) {
         $theme_settings = array(
-            'version'  => self::LATEST_SCHEMA,
+            'version'  => static::LATEST_SCHEMA,
             'settings' => array(),
         );