mirrored from git://develop.git.wordpress.org/
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
Block Bindings: Refactor the way sources are handled #6016
Closed
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
790b93f
Block Bindings: Refactor the way sources are handled
gziolo ee90d24
Fix spacing issues
gziolo ca739e6
Reorder require entries in wp-settings.php
gziolo 4c7d13c
Rename test file from block-bindings.php to render.php
gziolo 2f1b107
Update src/wp-includes/class-wp-block.php
gziolo b337f01
Use get_block_bindings_source as public API
gziolo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
<?php | ||
/** | ||
* Pattern Overrides source for the Block Bindings. | ||
* | ||
* @since 6.5.0 | ||
* @package WordPress | ||
* @subpackage Block Bindings | ||
*/ | ||
|
||
/** | ||
* Gets value for the Pattern Overrides source. | ||
* | ||
* @since 6.5.0 | ||
* @access private | ||
* | ||
* @param array $source_args Array containing source arguments used to look up the override value. | ||
* Example: array( "key" => "foo" ). | ||
* @param WP_Block $block_instance The block instance. | ||
* @param string $attribute_name The name of the target attribute. | ||
* @return mixed The value computed for the source. | ||
*/ | ||
function _block_bindings_pattern_overrides_get_value( array $source_args, $block_instance, string $attribute_name ) { | ||
if ( empty( $block_instance->attributes['metadata']['id'] ) ) { | ||
return null; | ||
} | ||
$block_id = $block_instance->attributes['metadata']['id']; | ||
return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null ); | ||
} | ||
|
||
/** | ||
* Registers Pattern Overrides source in the Block Bindings registry. | ||
* | ||
* @since 6.5.0 | ||
* @access private | ||
*/ | ||
function _register_block_bindings_pattern_overrides_source() { | ||
register_block_bindings_source( | ||
'core/pattern-overrides', | ||
array( | ||
'label' => _x( 'Pattern Overrides', 'block bindings source' ), | ||
'get_value_callback' => '_block_bindings_pattern_overrides_get_value', | ||
) | ||
); | ||
} | ||
|
||
add_action( 'init', '_register_block_bindings_pattern_overrides_source' ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
/** | ||
* Post Meta source for the block bindings. | ||
* | ||
* @since 6.5.0 | ||
* @package WordPress | ||
* @subpackage Block Bindings | ||
*/ | ||
|
||
/** | ||
* Gets value for Post Meta source. | ||
* | ||
* @since 6.5.0 | ||
* @access private | ||
* | ||
* @param array $source_args Array containing source arguments used to look up the override value. | ||
* Example: array( "key" => "foo" ). | ||
* @return mixed The value computed for the source. | ||
*/ | ||
function _block_bindings_post_meta_get_value( array $source_args ) { | ||
if ( ! isset( $source_args['key'] ) ) { | ||
return null; | ||
} | ||
|
||
// Use the postId attribute if available. | ||
if ( isset( $source_args['postId'] ) ) { | ||
$post_id = $source_args['postId']; | ||
} else { | ||
// $block_instance->context['postId'] is not available in the Image block. | ||
$post_id = get_the_ID(); | ||
} | ||
|
||
// If a post isn't public, we need to prevent unauthorized users from accessing the post meta. | ||
$post = get_post( $post_id ); | ||
if ( ( ! is_post_publicly_viewable( $post ) && ! current_user_can( 'read_post', $post_id ) ) || post_password_required( $post ) ) { | ||
return null; | ||
} | ||
|
||
return get_post_meta( $post_id, $source_args['key'], true ); | ||
} | ||
|
||
/** | ||
* Registers Post Meta source in the block bindings registry. | ||
* | ||
* @since 6.5.0 | ||
* @access private | ||
*/ | ||
function _register_block_bindings_post_meta_source() { | ||
register_block_bindings_source( | ||
'core/post-meta', | ||
array( | ||
'label' => _x( 'Post Meta', 'block bindings source' ), | ||
'get_value_callback' => '_block_bindings_post_meta_get_value', | ||
) | ||
); | ||
} | ||
|
||
add_action( 'init', '_register_block_bindings_post_meta_source' ); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This kind of private function is in general better as inline functions/closures. I think these are not authorized in Core yet right? Do you know more about the reasoning...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was thinking about it, too. I’ll ask around and check the codebase. The only benefit of using another regular function like at the moment is the PHPDoc included.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You definitely can find places where inline functions are defined as params passed. You shouldn't use them when passing the callback to WP hooks, but here, it would make perfect sense. I'll confirm that and refactor the code, if possible, after adding more unit tests.