Skip to content

Commit

Permalink
Plugin: require minimum WordPress 6.2 (#53451)
Browse files Browse the repository at this point in the history
* Initial commit

* Swapping `gutenberg_` functions for wp equivalents:
- wp_get_elements_class_name since 6.0.0
- _wp_get_presets_class_name since 6.2.0

Ensuring `build_query_vars_from_query_block` doesn't receive `gutenberg_` prefix during build

* - Remove compat/6.2 folder completely
- Add usages of wp_normalize_remote_block_pattern (since 6.2)

* - Using get_template_hierarchy (since 6.2)
- Removed tests already covered in Core

* Moving get_items() method from Gutenberg_REST_Block_Patterns_Controller_6_2 to Gutenberg_REST_Block_Patterns_Controller_6_3 because the following methods were updated in 6.3:

- gutenberg_load_remote_block_patterns
- gutenberg_load_remote_featured_patterns
- gutenberg_register_remote_theme_patterns

* Referencing private property

* Delete lib/compat/wordpress-6.3/class-gutenberg-rest-global-styles-controller-6-3.php because it wanted to live after a less than ideal rebase
  • Loading branch information
ramonjd authored Sep 1, 2023
1 parent f39b0d8 commit f454434
Show file tree
Hide file tree
Showing 28 changed files with 83 additions and 4,413 deletions.
2 changes: 1 addition & 1 deletion gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Gutenberg
* Plugin URI: https://github.com/WordPress/gutenberg
* Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
* Requires at least: 6.1
* Requires at least: 6.2
* Requires PHP: 7.0
* Version: 16.6.0-rc.1
* Author: Gutenberg Team
Expand Down
14 changes: 2 additions & 12 deletions lib/block-supports/elements.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
* @package gutenberg
*/

/**
* Get the elements class names.
*
* @param array $block Block object.
* @return string The unique class name.
*/
function gutenberg_get_elements_class_name( $block ) {
return 'wp-elements-' . md5( serialize( $block ) );
}

/**
* Update the block content with elements class names.
*
Expand Down Expand Up @@ -103,7 +93,7 @@ function gutenberg_render_elements_support( $block_content, $block ) {
// Add the class name to the first element, presuming it's the wrapper, if it exists.
$tags = new WP_HTML_Tag_Processor( $block_content );
if ( $tags->next_tag() ) {
$tags->add_class( gutenberg_get_elements_class_name( $block ) );
$tags->add_class( wp_get_elements_class_name( $block ) );
}

return $tags->get_updated_html();
Expand Down Expand Up @@ -140,7 +130,7 @@ function gutenberg_render_elements_support_styles( $pre_render, $block ) {
return null;
}

$class_name = gutenberg_get_elements_class_name( $block );
$class_name = wp_get_elements_class_name( $block );

$element_types = array(
'button' => array(
Expand Down
23 changes: 8 additions & 15 deletions lib/block-supports/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@
* @package gutenberg
*/

/**
* Get the class name used on block level presets.
*
* @access private
*
* @param array $block Block object.
* @return string The unique class name.
*/
function _gutenberg_get_presets_class_name( $block ) {
return 'wp-settings-' . md5( serialize( $block ) );
}

/**
* Update the block content with block level presets class name.
*
Expand Down Expand Up @@ -47,7 +35,7 @@ function _gutenberg_add_block_level_presets_class( $block_content, $block ) {
// Add the class name to the first element, presuming it's the wrapper, if it exists.
$tags = new WP_HTML_Tag_Processor( $block_content );
if ( $tags->next_tag() ) {
$tags->add_class( _gutenberg_get_presets_class_name( $block ) );
$tags->add_class( _wp_get_presets_class_name( $block ) );
}

return $tags->get_updated_html();
Expand Down Expand Up @@ -76,7 +64,7 @@ function _gutenberg_add_block_level_preset_styles( $pre_render, $block ) {
return null;
}

$class_name = '.' . _gutenberg_get_presets_class_name( $block );
$class_name = '.' . _wp_get_presets_class_name( $block );

// the root selector for preset variables needs to target every possible block selector
// in order for the general setting to override any bock specific setting of a parent block or
Expand Down Expand Up @@ -129,7 +117,12 @@ function _gutenberg_add_block_level_preset_styles( $pre_render, $block ) {
);

if ( ! empty( $styles ) ) {
gutenberg_enqueue_block_support_styles( $styles );
/*
* This method is deprecated since WordPress 6.2.
* We could enqueue these styles separately,
* or print them out with other settings presets.
*/
wp_enqueue_block_support_styles( $styles );
}

return null;
Expand Down
45 changes: 0 additions & 45 deletions lib/compat/wordpress-6.2/block-editor.php

This file was deleted.

Loading

0 comments on commit f454434

Please sign in to comment.