<!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>[55104] trunk: Code Modernization: Rename parameters that use reserved keywords in `phpunit/tests/rest-api/rest-*-controller.php`.</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/55104">55104</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/55104","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-01-20 00:19:09 +0000 (Fri, 20 Jan 2023)</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'>Code Modernization: Rename parameters that use reserved keywords in `phpunit/tests/rest-api/rest-*-controller.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit:
* Renames the `$object` parameter to `$response_data` in:
* `WP_Test_REST_Attachments_Controller::additional_field_get_callback()`
* `WP_Test_REST_Autosaves_Controller::additional_field_get_callback()`
* `WP_Test_REST_Categories_Controller::additional_field_get_callback()`
* `WP_Test_REST_Comments_Controller::additional_field_get_callback()`
* `WP_Test_REST_Post_Statuses_Controller::additional_field_get_callback()`
* `WP_Test_REST_Post_Types_Controller::additional_field_get_callback()`
* `WP_Test_REST_Posts_Controller::additional_field_get_callback()`
* `WP_Test_REST_Revisions_Controller::additional_field_get_callback()`
* `WP_Test_REST_Tags_Controller::additional_field_get_callback()`
* `WP_Test_REST_Users_Controller::additional_field_get_callback()`
* Amends the `$data` and `$prepared` parameters for consistency in:
* `WP_REST_Controller::add_additional_fields_to_object()`
* `WP_REST_Controller::filter_response_by_context()`
* `rest_filter_response_by_context()`
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52946">[52946]</a>, <a href="https://core.trac.wordpress.org/changeset/52996">[52996]</a>, <a href="https://core.trac.wordpress.org/changeset/52997">[52997]</a>, <a href="https://core.trac.wordpress.org/changeset/52998">[52998]</a>, <a href="https://core.trac.wordpress.org/changeset/53003">[53003]</a>, <a href="https://core.trac.wordpress.org/changeset/53014">[53014]</a>, <a href="https://core.trac.wordpress.org/changeset/53029">[53029]</a>, <a href="https://core.trac.wordpress.org/changeset/53039">[53039]</a>, <a href="https://core.trac.wordpress.org/changeset/53116">[53116]</a>, <a href="https://core.trac.wordpress.org/changeset/53117">[53117]</a>, <a href="https://core.trac.wordpress.org/changeset/53137">[53137]</a>, <a href="https://core.trac.wordpress.org/changeset/53174">[53174]</a>, <a href="https://core.trac.wordpress.org/changeset/53184">[53184]</a>, <a href="https://core.trac.wordpress.org/changeset/53185">[531
85]</a>, <a href="https://core.trac.wordpress.org/changeset/53192">[53192]</a>, <a href="https://core.trac.wordpress.org/changeset/53193">[53193]</a>, <a href="https://core.trac.wordpress.org/changeset/53198">[53198]</a>, <a href="https://core.trac.wordpress.org/changeset/53203">[53203]</a>, <a href="https://core.trac.wordpress.org/changeset/53207">[53207]</a>, <a href="https://core.trac.wordpress.org/changeset/53215">[53215]</a>, <a href="https://core.trac.wordpress.org/changeset/53216">[53216]</a>, <a href="https://core.trac.wordpress.org/changeset/53220">[53220]</a>, <a href="https://core.trac.wordpress.org/changeset/53230">[53230]</a>, <a href="https://core.trac.wordpress.org/changeset/53232">[53232]</a>, <a href="https://core.trac.wordpress.org/changeset/53236">[53236]</a>, <a href="https://core.trac.wordpress.org/changeset/53239">[53239]</a>, <a href="https://core.trac.wordpress.org/changeset/53240">[53240]</a>, <a href="https://core.trac.wordpress.org/changeset/53242">[53242]
</a>, <a href="https://core.trac.wordpress.org/changeset/53243">[53243]</a>, <a href="https://core.trac.wordpress.org/changeset/53245">[53245]</a>, <a href="https://core.trac.wordpress.org/changeset/53246">[53246]</a>, <a href="https://core.trac.wordpress.org/changeset/53257">[53257]</a>, <a href="https://core.trac.wordpress.org/changeset/53269">[53269]</a>, <a href="https://core.trac.wordpress.org/changeset/53270">[53270]</a>, <a href="https://core.trac.wordpress.org/changeset/53271">[53271]</a>, <a href="https://core.trac.wordpress.org/changeset/53272">[53272]</a>, <a href="https://core.trac.wordpress.org/changeset/53273">[53273]</a>, <a href="https://core.trac.wordpress.org/changeset/53274">[53274]</a>, <a href="https://core.trac.wordpress.org/changeset/53275">[53275]</a>, <a href="https://core.trac.wordpress.org/changeset/53276">[53276]</a>, <a href="https://core.trac.wordpress.org/changeset/53277">[53277]</a>, <a href="https://core.trac.wordpress.org/changeset/53281">[53281]</a
>, <a href="https://core.trac.wordpress.org/changeset/53283">[53283]</a>, <a href="https://core.trac.wordpress.org/changeset/53284">[53284]</a>, <a href="https://core.trac.wordpress.org/changeset/53285">[53285]</a>, <a href="https://core.trac.wordpress.org/changeset/53287">[53287]</a>, <a href="https://core.trac.wordpress.org/changeset/53364">[53364]</a>, <a href="https://core.trac.wordpress.org/changeset/53365">[53365]</a>, <a href="https://core.trac.wordpress.org/changeset/54927">[54927]</a>, <a href="https://core.trac.wordpress.org/changeset/54929">[54929]</a>, <a href="https://core.trac.wordpress.org/changeset/54930">[54930]</a>, <a href="https://core.trac.wordpress.org/changeset/54931">[54931]</a>, <a href="https://core.trac.wordpress.org/changeset/54932">[54932]</a>, <a href="https://core.trac.wordpress.org/changeset/54933">[54933]</a>, <a href="https://core.trac.wordpress.org/changeset/54938">[54938]</a>, <a href="https://core.trac.wordpress.org/changeset/54943">[54943]</a>,
<a href="https://core.trac.wordpress.org/changeset/54944">[54944]</a>, <a href="https://core.trac.wordpress.org/changeset/54945">[54945]</a>, <a href="https://core.trac.wordpress.org/changeset/54946">[54946]</a>, <a href="https://core.trac.wordpress.org/changeset/54947">[54947]</a>, <a href="https://core.trac.wordpress.org/changeset/54948">[54948]</a>, <a href="https://core.trac.wordpress.org/changeset/54950">[54950]</a>, <a href="https://core.trac.wordpress.org/changeset/54951">[54951]</a>, <a href="https://core.trac.wordpress.org/changeset/54952">[54952]</a>, <a href="https://core.trac.wordpress.org/changeset/54956">[54956]</a>, <a href="https://core.trac.wordpress.org/changeset/54959">[54959]</a>, <a href="https://core.trac.wordpress.org/changeset/54960">[54960]</a>, <a href="https://core.trac.wordpress.org/changeset/54961">[54961]</a>, <a href="https://core.trac.wordpress.org/changeset/54962">[54962]</a>, <a href="https://core.trac.wordpress.org/changeset/54964">[54964]</a>, <a
href="https://core.trac.wordpress.org/changeset/54965">[54965]</a>, <a href="https://core.trac.wordpress.org/changeset/54969">[54969]</a>, <a href="https://core.trac.wordpress.org/changeset/54970">[54970]</a>, <a href="https://core.trac.wordpress.org/changeset/54971">[54971]</a>, <a href="https://core.trac.wordpress.org/changeset/54972">[54972]</a>, <a href="https://core.trac.wordpress.org/changeset/54996">[54996]</a>, <a href="https://core.trac.wordpress.org/changeset/55000">[55000]</a>, <a href="https://core.trac.wordpress.org/changeset/55011">[55011]</a>, <a href="https://core.trac.wordpress.org/changeset/55013">[55013]</a>, <a href="https://core.trac.wordpress.org/changeset/55014">[55014]</a>, <a href="https://core.trac.wordpress.org/changeset/55015">[55015]</a>, <a href="https://core.trac.wordpress.org/changeset/55016">[55016]</a>, <a href="https://core.trac.wordpress.org/changeset/55017">[55017]</a>, <a href="https://core.trac.wordpress.org/changeset/55020">[55020]</a>, <a hre
f="https://core.trac.wordpress.org/changeset/55021">[55021]</a>, <a href="https://core.trac.wordpress.org/changeset/55023">[55023]</a>, <a href="https://core.trac.wordpress.org/changeset/55027">[55027]</a>, <a href="https://core.trac.wordpress.org/changeset/55028">[55028]</a>, <a href="https://core.trac.wordpress.org/changeset/55034">[55034]</a>, <a href="https://core.trac.wordpress.org/changeset/55036">[55036]</a>, <a href="https://core.trac.wordpress.org/changeset/55037">[55037]</a>, <a href="https://core.trac.wordpress.org/changeset/55038">[55038]</a>, <a href="https://core.trac.wordpress.org/changeset/55039">[55039]</a>, <a href="https://core.trac.wordpress.org/changeset/55049">[55049]</a>, <a href="https://core.trac.wordpress.org/changeset/55050">[55050]</a>, <a href="https://core.trac.wordpress.org/changeset/55060">[55060]</a>, <a href="https://core.trac.wordpress.org/changeset/55062">[55062]</a>, <a href="https://core.trac.wordpress.org/changeset/55064">[55064]</a>, <a href="
https://core.trac.wordpress.org/changeset/55065">[55065]</a>, <a href="https://core.trac.wordpress.org/changeset/55076">[55076]</a>, <a href="https://core.trac.wordpress.org/changeset/55077">[55077]</a>, <a href="https://core.trac.wordpress.org/changeset/55078">[55078]</a>, <a href="https://core.trac.wordpress.org/changeset/55081">[55081]</a>, <a href="https://core.trac.wordpress.org/changeset/55090">[55090]</a>, <a href="https://core.trac.wordpress.org/changeset/55100">[55100]</a>.
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/56788">#56788</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestcontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestautosavescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-autosaves-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestcategoriescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestcommentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpoststatusescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestposttypescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestrevisionscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswprestcontrollerphp"></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/rest-api/endpoints/class-wp-rest-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,15 +289,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.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">- * @param array $data Response data to filter.
- * @param string $context Context defined in the schema.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $response_data Response data to filter.
+ * @param string $context Context defined in the schema.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Filtered response.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function filter_response_by_context( $data, $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_response_by_context( $response_data, $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $this->get_item_schema();
</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 rest_filter_response_by_context( $data, $schema, $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return rest_filter_response_by_context( $response_data, $schema, $context );
</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">@@ -412,11 +412,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.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">- * @param array $prepared Prepared response array.
- * @param WP_REST_Request $request Full details about the request.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $response_data Prepared response array.
+ * @param WP_REST_Request $request Full details about the request.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Modified data object with additional fields.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function add_additional_fields_to_object( $prepared, $request ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected function add_additional_fields_to_object( $response_data, $request ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $additional_fields = $this->get_additional_fields();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,9 +431,9 @@
</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">- $prepared[ $field_name ] = call_user_func(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data[ $field_name ] = call_user_func(
</ins><span class="cx" style="display: block; padding: 0 10px"> $field_options['get_callback'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prepared,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data,
</ins><span class="cx" style="display: block; padding: 0 10px"> $field_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $request,
</span><span class="cx" style="display: block; padding: 0 10px"> $this->get_object_type()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +440,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $prepared;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $response_data;
</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></pre></div>
<a id="trunksrcwpincludesrestapiphp"></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/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/src/wp-includes/rest-api.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2934,36 +2934,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0 Support the "patternProperties" keyword for objects.
</span><span class="cx" style="display: block; padding: 0 10px"> * Support the "anyOf" and "oneOf" keywords.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array|object $data The response data to modify.
- * @param array $schema The schema for the endpoint used to filter the response.
- * @param string $context The requested context.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|object $response_data The response data to modify.
+ * @param array $schema The schema for the endpoint used to filter the response.
+ * @param string $context The requested context.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|object The filtered response data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function rest_filter_response_by_context( $data, $schema, $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function rest_filter_response_by_context( $response_data, $schema, $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $schema['anyOf'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $matching_schema = rest_find_any_matching_schema( $data, $schema, '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $matching_schema = rest_find_any_matching_schema( $response_data, $schema, '' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $matching_schema ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $schema['type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema['type'] = $matching_schema['type'];
</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">- $data = rest_filter_response_by_context( $data, $matching_schema, $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data = rest_filter_response_by_context( $response_data, $matching_schema, $context );
</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="cx" style="display: block; padding: 0 10px"> if ( isset( $schema['oneOf'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $matching_schema = rest_find_one_matching_schema( $data, $schema, '', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $matching_schema = rest_find_one_matching_schema( $response_data, $schema, '', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $matching_schema ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $schema['type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema['type'] = $matching_schema['type'];
</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">- $data = rest_filter_response_by_context( $data, $matching_schema, $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data = rest_filter_response_by_context( $response_data, $matching_schema, $context );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_array( $data ) && ! is_object( $data ) ) {
- return $data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $response_data ) && ! is_object( $response_data ) ) {
+ return $response_data;
</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"> if ( isset( $schema['type'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2971,7 +2971,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $schema['properties'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'object'; // Back compat if a developer accidentally omitted the type.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $response_data;
</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"> $is_array_type = 'array' === $type || ( is_array( $type ) && in_array( 'array', $type, true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2978,7 +2978,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_object_type = 'object' === $type || ( is_array( $type ) && in_array( 'object', $type, true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_array_type && $is_object_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( rest_is_array( $data ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( rest_is_array( $response_data ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_object_type = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_array_type = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2987,7 +2987,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $has_additional_properties = $is_object_type && isset( $schema['additionalProperties'] ) && is_array( $schema['additionalProperties'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $data as $key => $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $response_data as $key => $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $check = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_array_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3012,27 +3012,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $context, $check['context'], true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_array_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // All array items share schema, so there's no need to check each one.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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">- if ( is_object( $data ) ) {
- unset( $data->$key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $response_data ) ) {
+ unset( $response_data->$key );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $data[ $key ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $response_data[ $key ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $value ) || is_object( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_value = rest_filter_response_by_context( $value, $check, $context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_object( $data ) ) {
- $data->$key = $new_value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $response_data ) ) {
+ $response_data->$key = $new_value;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data[ $key ] = $new_value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_data[ $key ] = $new_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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $response_data;
</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></pre></div>
<a id="trunktestsphpunittestsrestapirestattachmentscontrollerphp"></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/rest-api/rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1678,7 +1678,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 123;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestautosavescontrollerphp"></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/rest-api/rest-autosaves-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-autosaves-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-autosaves-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,8 +514,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
- return get_post_meta( $object['id'], $field_name, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
+ return get_post_meta( $response_data['id'], $field_name, true );
</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"> public function additional_field_update_callback( $value, $post, $field_name ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestcategoriescontrollerphp"></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/rest-api/rest-categories-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 123;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestcommentscontrollerphp"></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/rest-api/rest-comments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3298,8 +3298,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
- return get_comment_meta( $object['id'], $field_name, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
+ return get_comment_meta( $response_data['id'], $field_name, true );
</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"> public function additional_field_update_callback( $value, $comment, $field_name ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpoststatusescontrollerphp"></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/rest-api/rest-post-statuses-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 123;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestposttypescontrollerphp"></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/rest-api/rest-post-types-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 123;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></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/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4586,8 +4586,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
- return get_post_meta( $object['id'], $field_name, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
+ return get_post_meta( $response_data['id'], $field_name, true );
</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"> public function additional_field_update_callback( $value, $post, $field_name ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestrevisionscontrollerphp"></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/rest-api/rest-revisions-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,8 +402,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
- return get_post_meta( $object['id'], $field_name, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
+ return get_post_meta( $response_data['id'], $field_name, true );
</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"> public function additional_field_update_callback( $value, $post, $field_name ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></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/rest-api/rest-tags-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1324,7 +1324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 123;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestuserscontrollerphp"></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/rest-api/rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2023-01-19 22:55:10 UTC (rev 55103)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2023-01-20 00:19:09 UTC (rev 55104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2825,8 +2825,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rest_additional_fields = array();
</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">- public function additional_field_get_callback( $object, $field_name ) {
- return get_user_meta( $object['id'], $field_name, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $response_data, $field_name ) {
+ return get_user_meta( $response_data['id'], $field_name, true );
</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"> public function additional_field_update_callback( $value, $user, $field_name ) {
</span></span></pre>
</div>
</div>
</body>
</html>