<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57562] trunk: Editor: Introduce WP_Block_Bindings_Source class</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57562">57562</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57562","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-08 08:55:18 +0000 (Thu, 08 Feb 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Introduce WP_Block_Bindings_Source class
Abstracts the block bindings source array into a well-defined object.
Fixes <a href="https://core.trac.wordpress.org/ticket/60447">#60447</a>.
See <a href="https://core.trac.wordpress.org/ticket/60282">#60282</a>.
Follow-up <a href="https://core.trac.wordpress.org/changeset/57373">[57373]</a>.
Props czapla, santosguillamot, gziolo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockbindingsphp">trunk/src/wp-includes/block-bindings.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblockbindingsregistryphp">trunk/src/wp-includes/class-wp-block-bindings-registry.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblockphp">trunk/src/wp-includes/class-wp-block.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunittestsblockbindingsregisterphp">trunk/tests/phpunit/tests/block-bindings/register.php</a></li>
<li><a href="#trunktestsphpunittestsblockbindingswpBlockBindingsRegistryphp">trunk/tests/phpunit/tests/block-bindings/wpBlockBindingsRegistry.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpblockbindingssourcephp">trunk/src/wp-includes/class-wp-block-bindings-source.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblockbindingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-bindings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-bindings.php 2024-02-08 08:40:37 UTC (rev 57561)
+++ trunk/src/wp-includes/block-bindings.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The callback has a mixed return type; it may return a string to override
</span><span class="cx" style="display: block; padding: 0 10px"> * the block's original value, null, false to remove an attribute, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|false Source when the registration was successful, or `false` on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source|false Source when the registration was successful, or `false` on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_block_bindings_source( string $source_name, array $source_properties ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_Block_Bindings_Registry::get_instance()->register( $source_name, $source_properties );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $source_name Block bindings source name including namespace.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|false The unregistered block bindings source on success and `false` otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source|false The unregistered block bindings source on success and `false` otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function unregister_block_bindings_source( string $source_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_Block_Bindings_Registry::get_instance()->unregister( $source_name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array The array of registered block bindings sources.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source[] The array of registered block bindings sources.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_all_registered_block_bindings_sources() {
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_Block_Bindings_Registry::get_instance()->get_all_registered();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $source_name The name of the source.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|null The registered block bindings source, or `null` if it is not registered.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source|null The registered block bindings source, or `null` if it is not registered.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_block_bindings_source( string $source_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_Block_Bindings_Registry::get_instance()->get_registered( $source_name );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblockbindingsregistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-block-bindings-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-bindings-registry.php 2024-02-08 08:40:37 UTC (rev 57561)
+++ trunk/src/wp-includes/class-wp-block-bindings-registry.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Holds the registered block bindings sources, keyed by source identifier.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var WP_Block_Bindings_Source[]
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private $sources = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The callback has a mixed return type; it may return a string to override
</span><span class="cx" style="display: block; padding: 0 10px"> * the block's original value, null, false to remove an attribute, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|false Source when the registration was successful, or `false` on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source|false Source when the registration was successful, or `false` on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function register( string $source_name, array $source_properties ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $source_name ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +107,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source = array_merge(
- array( 'name' => $source_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Validate that the source properties contain the label */
+ if ( ! isset( $source_properties['label'] ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'The $source_properties must contain a "label".' ),
+ '6.5.0'
+ );
+ return false;
+ }
+
+ /* Validate that the source properties contain the get_value_callback */
+ if ( ! isset( $source_properties['get_value_callback'] ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'The $source_properties must contain a "get_value_callback".' ),
+ '6.5.0'
+ );
+ return false;
+ }
+
+ /* Validate that the get_value_callback is a valid callback */
+ if ( ! is_callable( $source_properties['get_value_callback'] ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'The "get_value_callback" parameter must be a valid callback.' ),
+ '6.5.0'
+ );
+ return false;
+ }
+
+ $source = new WP_Block_Bindings_Source(
+ $source_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $source_properties
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $source_name Block bindings source name including namespace.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|false The unregistered block bindings source on success and `false` otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source|false The unregistered block bindings source on success and `false` otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function unregister( string $source_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->is_registered( $source_name ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array The array of registered sources.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source[] The array of registered sources.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_all_registered() {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->sources;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $source_name The name of the source.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|null The registered block bindings source, or `null` if it is not registered.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Block_Bindings_Source|null The registered block bindings source, or `null` if it is not registered.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_registered( string $source_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->is_registered( $source_name ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblockbindingssourcephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/class-wp-block-bindings-source.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-bindings-source.php (rev 0)
+++ trunk/src/wp-includes/class-wp-block-bindings-source.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,88 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Block Bindings API: WP_Block_Bindings_Source class.
+ *
+ *
+ * @package WordPress
+ * @subpackage Block Bindings
+ * @since 6.5.0
+ */
+
+/**
+ * Class representing block bindings source.
+ *
+ * This class is designed for internal use by the Block Bindings registry.
+ *
+ * @since 6.5.0
+ * @access private
+ *
+ * @see WP_Block_Bindings_Registry
+ */
+final class WP_Block_Bindings_Source {
+
+ /**
+ * The name of the source.
+ *
+ * @since 6.5.0
+ * @var string
+ */
+ public $name;
+
+ /**
+ * The label of the source.
+ *
+ * @since 6.5.0
+ * @var string
+ */
+ public $label;
+
+
+ /**
+ * The function used to get the value from the source.
+ *
+ * @since 6.5.0
+ * @var callable
+ */
+ private $get_value_callback;
+
+ /**
+ * Constructor.
+ *
+ * Do not use this constructor directly. Instead, use the
+ * `WP_Block_Bindings_Registry::register` method or the `register_block_bindings_source` function.
+ *
+ * @since 6.5.0
+ *
+ * @param string $name The name of the source.
+ * @param array $source_properties The properties of the source.
+ */
+ public function __construct( string $name, array $source_properties ) {
+ $this->name = $name;
+ $this->label = $source_properties['label'];
+ $this->get_value_callback = $source_properties['get_value_callback'];
+ }
+
+ /**
+ * Retrieves the value from the source.
+ *
+ * @since 6.5.0
+ *
+ * @param array $source_args Array containing source arguments used to look up the override value, i.e. {"key": "foo"}.
+ * @param WP_Block $block_instance The block instance.
+ * @param string $attribute_name The name of the target attribute.
+ *
+ * @return mixed The value of the source.
+ */
+ public function get_value( array $source_args, $block_instance, string $attribute_name ) {
+ return call_user_func_array( $this->get_value_callback, array( $source_args, $block_instance, $attribute_name ) );
+ }
+
+ /**
+ * Wakeup magic method.
+ *
+ * @since 6.5.0
+ */
+ public function __wakeup() {
+ throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/class-wp-block-bindings-source.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesclasswpblockphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-block.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block.php 2024-02-08 08:40:37 UTC (rev 57561)
+++ trunk/src/wp-includes/class-wp-block.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,9 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_callback = $block_binding_source['get_value_callback'];
- $source_args = ! empty( $block_binding['args'] ) && is_array( $block_binding['args'] ) ? $block_binding['args'] : array();
- $source_value = call_user_func_array( $source_callback, array( $source_args, $this, $attribute_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_args = ! empty( $block_binding['args'] ) && is_array( $block_binding['args'] ) ? $block_binding['args'] : array();
+ $source_value = $block_binding_source->get_value( $source_args, $this, $attribute_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the value is not null, process the HTML based on the block and the attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $source_value ) ) {
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2024-02-08 08:40:37 UTC (rev 57561)
+++ trunk/src/wp-settings.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,6 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-posts.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-taxonomies.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-users.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require ABSPATH . WPINC . '/class-wp-block-bindings-source.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/class-wp-block-bindings-registry.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/class-wp-block-editor-context.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/class-wp-block-type.php';
</span></span></pre></div>
<a id="trunktestsphpunittestsblockbindingsregisterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-bindings/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-bindings/register.php 2024-02-08 08:40:37 UTC (rev 57561)
+++ trunk/tests/phpunit/tests/block-bindings/register.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,12 +11,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Block_Bindings_Register extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const TEST_SOURCE_NAME = 'test/source';
- const TEST_SOURCE_PROPERTIES = array(
- 'label' => 'Test source',
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static $test_source_name = 'test/source';
+ public static $test_source_properties = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Set up before each test.
+ *
+ * @since 6.5.0
+ */
+ public function set_up() {
+ parent::set_up();
+
+ self::$test_source_properties = array(
+ 'label' => 'Test source',
+ 'get_value_callback' => function () {
+ return 'test-value';
+ },
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Tear down after each test.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,24 +53,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_block_bindings_source
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_all_registered_block_bindings_sources
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_block_bindings_source
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Block_Bindings_Source::__construct
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_all_registered() {
</span><span class="cx" style="display: block; padding: 0 10px"> $source_one_name = 'test/source-one';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_one_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_one_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_bindings_source( $source_one_name, $source_one_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source_two_name = 'test/source-two';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_two_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_two_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_bindings_source( $source_two_name, $source_two_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source_three_name = 'test/source-three';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_three_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_three_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_bindings_source( $source_three_name, $source_three_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_one_name => array_merge( array( 'name' => $source_one_name ), $source_one_properties ),
- $source_two_name => array_merge( array( 'name' => $source_two_name ), $source_two_properties ),
- $source_three_name => array_merge( array( 'name' => $source_three_name ), $source_three_properties ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_one_name => new WP_Block_Bindings_Source( $source_one_name, $source_one_properties ),
+ $source_two_name => new WP_Block_Bindings_Source( $source_two_name, $source_two_properties ),
+ $source_three_name => new WP_Block_Bindings_Source( $source_three_name, $source_three_properties ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'core/post-meta' => get_block_bindings_source( 'core/post-meta' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/pattern-overrides' => get_block_bindings_source( 'core/pattern-overrides' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,15 +87,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::register_block_bindings_source
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::unregister_block_bindings_source
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Block_Bindings_Source::__construct
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unregister_block_source() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_block_bindings_source( self::TEST_SOURCE_NAME, self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_block_bindings_source( self::$test_source_name, self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = unregister_block_bindings_source( self::TEST_SOURCE_NAME );
- $this->assertSame(
- array_merge(
- array( 'name' => self::TEST_SOURCE_NAME ),
- self::TEST_SOURCE_PROPERTIES
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = unregister_block_bindings_source( self::$test_source_name );
+ $this->assertEquals(
+ new WP_Block_Bindings_Source(
+ self::$test_source_name,
+ self::$test_source_properties
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $result
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsblockbindingswpBlockBindingsRegistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-bindings/wpBlockBindingsRegistry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-bindings/wpBlockBindingsRegistry.php 2024-02-08 08:40:37 UTC (rev 57561)
+++ trunk/tests/phpunit/tests/block-bindings/wpBlockBindingsRegistry.php 2024-02-08 08:55:18 UTC (rev 57562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,10 +13,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Blocks_wpBlockBindingsRegistry extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const TEST_SOURCE_NAME = 'test/source';
- const TEST_SOURCE_PROPERTIES = array(
- 'label' => 'Test source',
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static $test_source_name = 'test/source';
+ public static $test_source_properties = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fake block bindings registry.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +33,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->registry = new WP_Block_Bindings_Registry();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ self::$test_source_properties = array(
+ 'label' => 'Test source',
+ 'get_value_callback' => function () {
+ return 'test-value';
+ },
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage WP_Block_Bindings_Registry::register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_invalid_non_string_names() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->register( 1, self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->registry->register( 1, self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage WP_Block_Bindings_Registry::register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_invalid_names_without_namespace() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->register( 'post-meta', self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->registry->register( 'post-meta', self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,23 +105,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedIncorrectUsage WP_Block_Bindings_Registry::register
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_invalid_uppercase_characters() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->register( 'Core/PostMeta', self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->registry->register( 'Core/PostMeta', self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Should reject block bindings registration without a label.
+ *
+ * @ticket 60282
+ *
+ * @covers WP_Block_Bindings_Registry::register
+ *
+ * @expectedIncorrectUsage WP_Block_Bindings_Registry::register
+ */
+ public function test_register_invalid_missing_label() {
+
+ // Remove the label from the properties.
+ unset( self::$test_source_properties['label'] );
+
+ $result = $this->registry->register( self::$test_source_name, self::$test_source_properties );
+ $this->assertFalse( $result );
+ }
+
+ /**
+ * Should reject block bindings registration without a get_value_callback.
+ *
+ * @ticket 60282
+ *
+ * @covers WP_Block_Bindings_Registry::register
+ *
+ * @expectedIncorrectUsage WP_Block_Bindings_Registry::register
+ */
+ public function test_register_invalid_missing_get_value_callback() {
+
+ // Remove the get_value_callback from the properties.
+ unset( self::$test_source_properties['get_value_callback'] );
+
+ $result = $this->registry->register( self::$test_source_name, self::$test_source_properties );
+ $this->assertFalse( $result );
+ }
+
+ /**
+ * Should reject block bindings registration if `get_value_callback` is not a callable.
+ *
+ * @ticket 60282
+ *
+ * @covers WP_Block_Bindings_Registry::register
+ *
+ * @expectedIncorrectUsage WP_Block_Bindings_Registry::register
+ */
+ public function test_register_invalid_incorrect_callback_type() {
+
+ self::$test_source_properties['get_value_callback'] = 'not-a-callback';
+
+ $result = $this->registry->register( self::$test_source_name, self::$test_source_properties );
+ $this->assertFalse( $result );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Should accept valid block binding source.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 60282
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::register
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Block_Bindings_Source::__construct
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_block_binding_source() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->register( self::TEST_SOURCE_NAME, self::TEST_SOURCE_PROPERTIES );
- $this->assertSame(
- array_merge(
- array( 'name' => self::TEST_SOURCE_NAME ),
- self::TEST_SOURCE_PROPERTIES
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->registry->register( self::$test_source_name, self::$test_source_properties );
+ $this->assertEquals(
+ new WP_Block_Bindings_Source(
+ self::$test_source_name,
+ self::$test_source_properties
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $result
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,15 +202,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::register
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::unregister
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * WP_Block_Bindings_Source::__construct
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unregister_block_source() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->registry->register( self::TEST_SOURCE_NAME, self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->registry->register( self::$test_source_name, self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->unregister( self::TEST_SOURCE_NAME );
- $this->assertSame(
- array_merge(
- array( 'name' => self::TEST_SOURCE_NAME ),
- self::TEST_SOURCE_PROPERTIES
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->registry->unregister( self::$test_source_name );
+ $this->assertEquals(
+ new WP_Block_Bindings_Source(
+ self::$test_source_name,
+ self::$test_source_properties
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $result
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,28 +224,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::register
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::get_all_registered
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * WP_Block_Bindings_Source::__construct
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_all_registered() {
</span><span class="cx" style="display: block; padding: 0 10px"> $source_one_name = 'test/source-one';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_one_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_one_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( $source_one_name, $source_one_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source_two_name = 'test/source-two';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_two_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_two_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( $source_two_name, $source_two_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source_three_name = 'test/source-three';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_three_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_three_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( $source_three_name, $source_three_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_one_name => array_merge( array( 'name' => $source_one_name ), $source_one_properties ),
- $source_two_name => array_merge( array( 'name' => $source_two_name ), $source_two_properties ),
- $source_three_name => array_merge( array( 'name' => $source_three_name ), $source_three_properties ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_one_name => new WP_Block_Bindings_Source( $source_one_name, $source_one_properties ),
+ $source_two_name => new WP_Block_Bindings_Source( $source_two_name, $source_two_properties ),
+ $source_three_name => new WP_Block_Bindings_Source( $source_three_name, $source_three_properties ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $registered = $this->registry->get_all_registered();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $expected, $registered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $expected, $registered );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::get_registered
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_registered_rejects_unknown_source_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->registry->register( self::TEST_SOURCE_NAME, self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->registry->register( self::$test_source_name, self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source = $this->registry->get_registered( 'test/unknown-source' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $source );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,26 +271,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::register
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::get_registered
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Block_Bindings_Source::__construct
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_registered() {
</span><span class="cx" style="display: block; padding: 0 10px"> $source_one_name = 'test/source-one';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_one_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_one_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( $source_one_name, $source_one_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source_two_name = 'test/source-two';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_two_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_two_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( $source_two_name, $source_two_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $source_three_name = 'test/source-three';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_three_properties = self::TEST_SOURCE_PROPERTIES;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_three_properties = self::$test_source_properties;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->registry->register( $source_three_name, $source_three_properties );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->get_registered( 'test/source-two' );
- $this->assertSame(
- array_merge(
- array( 'name' => $source_two_name ),
- $source_two_properties
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = new WP_Block_Bindings_Source( $source_two_name, $source_two_properties );
+ $result = $this->registry->get_registered( 'test/source-two' );
+
+ $this->assertEquals(
+ $expected,
</ins><span class="cx" style="display: block; padding: 0 10px"> $result
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,9 +316,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Block_Bindings_Registry::is_registered
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_registered_for_known_source() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->registry->register( self::TEST_SOURCE_NAME, self::TEST_SOURCE_PROPERTIES );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->registry->register( self::$test_source_name, self::$test_source_properties );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = $this->registry->is_registered( self::TEST_SOURCE_NAME );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = $this->registry->is_registered( self::$test_source_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>