Skip to content

Update the WP_Theme_JSON_Gutenberg class to be like the core one #36973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oandregal merged 9 commits into from
Nov 29, 2021
Merged

Update the WP_Theme_JSON_Gutenberg class to be like the core one #36973

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5041be
Reorder constants and update constructor
oandregal Nov 29, 2021
122785d
Remove spaces from comment
oandregal Nov 29, 2021
c3df3b6
Update comments
oandregal Nov 29, 2021
2013188
Update comments
oandregal Nov 29, 2021
e368c8c
Reorder methods to follow WordPress core order so it is easier to bac…
oandregal Nov 29, 2021
47c15d3
Update comments
oandregal Nov 29, 2021
ae7a6c7
Port core changes to get_custom_templates and get_template_parts
oandregal Nov 29, 2021
37e60bc
Update comment
oandregal Nov 29, 2021
25bac06
Fix lint issues reported by the Gutenberg linter
oandregal Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix lint issues reported by the Gutenberg linter
  • Loading branch information
@oandregal
oandregal committed Nov 29, 2021
commit 25bac06ed49d6b06388ee989229c6745c1c17e3a
40 changes: 21 additions & 19 deletions lib/class-wp-theme-json-gutenberg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*
* @access private
*/

class WP_Theme_JSON_Gutenberg {

/**
Expand Down Expand Up @@ -320,17 +319,16 @@ class WP_Theme_JSON_Gutenberg {
/**
* Constructor.
*
* @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'.
* @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'.
*/
public function __construct( $theme_json = array(), $origin = 'theme' ) {
if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) {
$origin = 'theme';
}

$this->theme_json = WP_Theme_JSON_Schema_Gutenberg::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 );
Expand Down Expand Up @@ -486,7 +484,6 @@ private static function sanitize( $input, $valid_block_names, $valid_element_nam
* }
* }
*
*
* @return array Block metadata.
*/
private static function get_blocks_metadata() {
Expand Down Expand Up @@ -1059,11 +1056,12 @@ private static function replace_slug_in_string( $input, $slug ) {
* for the presets and adds them to the $declarations array
* following the format:
*
* array(
* 'name' => 'property_name',
* 'value' => 'property_value,
* )
*
* ```php
* array(
* 'name' => 'property_name',
* 'value' => 'property_value,
* )
* ```
*
* @param array $settings Settings to process.
* @param array $origins List of origins to process.
Expand All @@ -1089,10 +1087,12 @@ private static function compute_preset_vars( $settings, $origins ) {
* for the custom values and adds them to the $declarations
* array following the format:
*
* array(
* 'name' => 'property_name',
* 'value' => 'property_value,
* )
* ```php
* array(
* 'name' => 'property_name',
* 'value' => 'property_value,
* )
* ```
*
* @param array $settings Settings to process.
* @return array Returns the modified $declarations.
Expand Down Expand Up @@ -1172,10 +1172,12 @@ private static function flatten_tree( $tree, $prefix = '', $token = '--' ) {
* Given a styles array, it extracts the style properties
* and adds them to the $declarations array following the format:
*
* array(
* 'name' => 'property_name',
* 'value' => 'property_value,
* )
* ```php
* array(
* 'name' => 'property_name',
* 'value' => 'property_value,
* )
* ```
*
* @param array $styles Styles to process.
* @param array $settings Theme settings.
Expand Down