<!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>[55102] trunk/tests/phpunit/tests/rest-api: Tests: Correct `additional_field_get_callback()` parameters in some REST API tests.</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/55102">55102</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/55102","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-19 21:46:58 +0000 (Thu, 19 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'>Tests: Correct `additional_field_get_callback()` parameters in some REST API tests.
The second parameter passed to `get_callback` in `WP_REST_Controller::add_additional_fields_to_object()` is the field name, not the request details.
Includes moving the `get_callback` and `update_callback` helper functions next to the tests they are used in.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/38832">[38832]</a>, <a href="https://core.trac.wordpress.org/changeset/43768">[43768]</a>.
See <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#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="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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1678,6 +1678,16 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $object, $field_name ) {
+ return 123;
+ }
+
+ public function additional_field_update_callback( $value, $attachment ) {
+ if ( 'returnError' === $value ) {
+ return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_search_item_by_filename() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> self::$test_file,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1706,16 +1716,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'image/png', $data[0]['mime_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">- public function additional_field_get_callback( $object, $request ) {
- return 123;
- }
-
- public function additional_field_update_callback( $value, $attachment ) {
- if ( 'returnError' === $value ) {
- return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_links_exist() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-autosaves-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,12 +514,12 @@
</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 ) {
- return get_post_meta( $object['id'], 'my_custom_int', true );
</del><ins style="background-color: #dfd; 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 );
</ins><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_update_callback( $value, $post ) {
- update_post_meta( $post->ID, 'my_custom_int', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_update_callback( $value, $post, $field_name ) {
+ update_post_meta( $post->ID, $field_name, $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"> protected function check_get_autosave_response( $response, $autosave ) {
</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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</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, $request ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $object, $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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3298,15 +3298,15 @@
</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 ) {
- return get_comment_meta( $object['id'], 'my_custom_int', true );
</del><ins style="background-color: #dfd; 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 );
</ins><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_update_callback( $value, $comment ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_update_callback( $value, $comment, $field_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'returnError' === $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_comment_meta( $comment->comment_ID, 'my_custom_int', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_comment_meta( $comment->comment_ID, $field_name, $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"> protected function check_comment_data( $data, $context, $links ) {
</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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4586,15 +4586,15 @@
</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 ) {
- return get_post_meta( $object['id'], 'my_custom_int', true );
</del><ins style="background-color: #dfd; 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 );
</ins><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_update_callback( $value, $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_update_callback( $value, $post, $field_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'returnError' === $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $post->ID, 'my_custom_int', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $post->ID, $field_name, $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"> public function test_publish_action_ldo_registered() {
</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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,12 +402,12 @@
</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 ) {
- return get_post_meta( $object['id'], 'my_custom_int', true );
</del><ins style="background-color: #dfd; 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 );
</ins><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_update_callback( $value, $post ) {
- update_post_meta( $post->ID, 'my_custom_int', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_update_callback( $value, $post, $field_name ) {
+ update_post_meta( $post->ID, $field_name, $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"> protected function check_get_revision_response( $response, $revision ) {
</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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1324,6 +1324,16 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function additional_field_get_callback( $object, $field_name ) {
+ return 123;
+ }
+
+ public function additional_field_update_callback( $value, $tag ) {
+ if ( 'returnError' === $value ) {
+ return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38504
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1396,16 +1406,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( $view_field, $data );
</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, $request ) {
- return 123;
- }
-
- public function additional_field_update_callback( $value, $tag ) {
- if ( 'returnError' === $value ) {
- return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> protected function check_get_taxonomy_terms_response( $response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</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 17:39:10 UTC (rev 55101)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2023-01-19 21:46:58 UTC (rev 55102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2825,6 +2825,17 @@
</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><ins style="background-color: #dfd; 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 );
+ }
+
+ public function additional_field_update_callback( $value, $user, $field_name ) {
+ if ( 'returnError' === $value ) {
+ return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
+ }
+ update_user_meta( $user->ID, $field_name, $value );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39701
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3072,17 +3083,6 @@
</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">- public function additional_field_get_callback( $object ) {
- return get_user_meta( $object['id'], 'my_custom_int', true );
- }
-
- public function additional_field_update_callback( $value, $user ) {
- if ( 'returnError' === $value ) {
- return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
- }
- update_user_meta( $user->ID, 'my_custom_int', $value );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> protected function check_user_data( $user, $data, $context, $links ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $user->ID, $data['id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $user->display_name, $data['name'] );
</span></span></pre>
</div>
</div>
</body>
</html>