<!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>[40101] trunk: REST API: Fix multiple issues with setting dates of posts and comments.</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 { 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/40101">40101</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/40101","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jnylen0</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-21 18:17:32 +0000 (Tue, 21 Feb 2017)</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'>REST API: Fix multiple issues with setting dates of posts and comments.
This commit modifies the `rest_get_date_with_gmt` function to correctly parse local and UTC timestamps with or without timezone information.
It also ensures that the REST API can edit the dates of draft posts by setting the `edit_date` flag to `wp_update_post`.
Overall this commit ensures that post and comment dates can be set and updated as expected.
Fixes <a href="https://core.trac.wordpress.org/ticket/39256">#39256</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.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="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></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-posts-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-posts-controller.php 2017-02-21 07:04:34 UTC (rev 40100)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2017-02-21 18:17:32 UTC (rev 40101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1004,12 +1004,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $date_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prepared_post->edit_date = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $schema['properties']['date_gmt'] ) && ! empty( $request['date_gmt'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $date_data = rest_get_date_with_gmt( $request['date_gmt'], true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $date_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prepared_post->edit_date = 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">
</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 2017-02-21 07:04:34 UTC (rev 40100)
+++ trunk/src/wp-includes/rest-api.php 2017-02-21 18:17:32 UTC (rev 40101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -780,26 +780,40 @@
</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">- * Retrieves a local date with its GMT equivalent, in MySQL datetime format.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Parses a date into both its local and UTC equivalent, in MySQL datetime format.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see rest_parse_date()
</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 string $date RFC3339 timestamp.
- * @param bool $force_utc Whether a UTC timestamp should be forced. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $date RFC3339 timestamp.
+ * @param bool $is_utc Whether the provided date should be interpreted as UTC. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|null Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s),
</span><span class="cx" style="display: block; padding: 0 10px"> * null on failure.
</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_get_date_with_gmt( $date, $force_utc = false ) {
- $date = rest_parse_date( $date, $force_utc );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function rest_get_date_with_gmt( $date, $is_utc = false ) {
+ // Whether or not the original date actually has a timezone string
+ // changes the way we need to do timezone conversion. Store this info
+ // before parsing the date, and use it later.
+ $has_timezone = preg_match( '#(Z|[+-]\d{2}(:\d{2})?)$#', $date );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = rest_parse_date( $date );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $date ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</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">- $utc = date( 'Y-m-d H:i:s', $date );
- $local = get_date_from_gmt( $utc );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // At this point $date could either be a local date (if we were passed a
+ // *local* date without a timezone offset) or a UTC date (otherwise).
+ // Timezone conversion needs to be handled differently between these two
+ // cases.
+ if ( ! $is_utc && ! $has_timezone ) {
+ $local = date( 'Y-m-d H:i:s', $date );
+ $utc = get_gmt_from_date( $local );
+ } else {
+ $utc = date( 'Y-m-d H:i:s', $date );
+ $local = get_date_from_gmt( $utc );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array( $local, $utc );
</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 2017-02-21 07:04:34 UTC (rev 40100)
+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2017-02-21 18:17:32 UTC (rev 40101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,6 +960,84 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( self::$post_id, $data['post'] );
</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 comment_dates_provider() {
+ return array(
+ 'set date without timezone' => array(
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date' => '2016-12-12T14:00:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ 'set date_gmt without timezone' => array(
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ 'set date with timezone' => array(
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date' => '2016-12-12T18:00:00-01:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ 'set date_gmt with timezone' => array(
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date_gmt' => '2016-12-12T18:00:00-01:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider comment_dates_provider
+ */
+ public function test_create_comment_date( $params, $results ) {
+ wp_set_current_user( self::$admin_id );
+ update_option( 'timezone_string', $params['timezone_string'] );
+
+ $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
+ $request->set_param( 'content', 'not empty' );
+ $request->set_param( 'post', self::$post_id );
+ if ( isset( $params['date'] ) ) {
+ $request->set_param( 'date', $params['date'] );
+ }
+ if ( isset( $params['date_gmt'] ) ) {
+ $request->set_param( 'date_gmt', $params['date_gmt'] );
+ }
+ $response = $this->server->dispatch( $request );
+
+ update_option( 'timezone_string', '' );
+
+ $this->assertEquals( 201, $response->get_status() );
+ $data = $response->get_data();
+ $comment = get_comment( $data['id'] );
+
+ $this->assertEquals( $results['date'], $data['date'] );
+ $comment_date = str_replace( 'T', ' ', $results['date'] );
+ $this->assertEquals( $comment_date, $comment->comment_date );
+
+ $this->assertEquals( $results['date_gmt'], $data['date_gmt'] );
+ $comment_date_gmt = str_replace( 'T', ' ', $results['date_gmt'] );
+ $this->assertEquals( $comment_date_gmt, $comment->comment_date_gmt );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_using_accepted_content_raw_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1970,6 +2048,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '2014-11-07T10:14:25', $comment['date'] );
</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">+ /**
+ * @dataProvider comment_dates_provider
+ */
+ public function test_update_comment_date( $params, $results ) {
+ wp_set_current_user( self::$editor_id );
+ update_option( 'timezone_string', $params['timezone_string'] );
+
+ $comment_id = $this->factory->comment->create();
+
+ $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $comment_id ) );
+ if ( isset( $params['date'] ) ) {
+ $request->set_param( 'date', $params['date'] );
+ }
+ if ( isset( $params['date_gmt'] ) ) {
+ $request->set_param( 'date_gmt', $params['date_gmt'] );
+ }
+ $response = $this->server->dispatch( $request );
+
+ update_option( 'timezone_string', '' );
+
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $comment = get_comment( $data['id'] );
+
+ $this->assertEquals( $results['date'], $data['date'] );
+ $comment_date = str_replace( 'T', ' ', $results['date'] );
+ $this->assertEquals( $comment_date, $comment->comment_date );
+
+ $this->assertEquals( $results['date_gmt'], $data['date_gmt'] );
+ $comment_date_gmt = str_replace( 'T', ' ', $results['date_gmt'] );
+ $this->assertEquals( $comment_date_gmt, $comment->comment_date_gmt );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_no_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</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 2017-02-21 07:04:34 UTC (rev 40100)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2017-02-21 18:17:32 UTC (rev 40101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1152,7 +1152,111 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->check_create_post_response( $response );
</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 post_dates_provider() {
+ $all_statuses = array(
+ 'draft',
+ 'publish',
+ 'future',
+ 'pending',
+ 'private',
+ );
+
+ $cases_short = array(
+ 'set date without timezone' => array(
+ 'statuses' => $all_statuses,
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date' => '2016-12-12T14:00:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ 'set date_gmt without timezone' => array(
+ 'statuses' => $all_statuses,
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ 'set date with timezone' => array(
+ 'statuses' => array( 'draft', 'publish' ),
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date' => '2016-12-12T18:00:00-01:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ 'set date_gmt with timezone' => array(
+ 'statuses' => array( 'draft', 'publish' ),
+ 'params' => array(
+ 'timezone_string' => 'America/New_York',
+ 'date_gmt' => '2016-12-12T18:00:00-01:00',
+ ),
+ 'results' => array(
+ 'date' => '2016-12-12T14:00:00',
+ 'date_gmt' => '2016-12-12T19:00:00',
+ ),
+ ),
+ );
+
+ $cases = array();
+ foreach ( $cases_short as $description => $case ) {
+ foreach ( $case['statuses'] as $status ) {
+ $cases[ $description . ', status=' . $status ] = array(
+ $status,
+ $case['params'],
+ $case['results'],
+ );
+ }
+ }
+
+ return $cases;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider post_dates_provider
+ */
+ public function test_create_post_date( $status, $params, $results ) {
+ wp_set_current_user( self::$editor_id );
+ update_option( 'timezone_string', $params['timezone_string'] );
+
+ $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );
+ $request->set_param( 'status', $status );
+ $request->set_param( 'title', 'not empty' );
+ if ( isset( $params['date'] ) ) {
+ $request->set_param( 'date', $params['date'] );
+ }
+ if ( isset( $params['date_gmt'] ) ) {
+ $request->set_param( 'date_gmt', $params['date_gmt'] );
+ }
+ $response = $this->server->dispatch( $request );
+
+ update_option( 'timezone_string', '' );
+
+ $this->assertEquals( 201, $response->get_status() );
+ $data = $response->get_data();
+ $post = get_post( $data['id'] );
+
+ $this->assertEquals( $results['date'], $data['date'] );
+ $post_date = str_replace( 'T', ' ', $results['date'] );
+ $this->assertEquals( $post_date, $post->post_date );
+
+ $this->assertEquals( $results['date_gmt'], $data['date_gmt'] );
+ // TODO expect null here for drafts (see https://core.trac.wordpress.org/ticket/5698#comment:14)
+ $post_date_gmt = str_replace( 'T', ' ', $results['date_gmt'] );
+ $this->assertEquals( $post_date_gmt, $post->post_date_gmt );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38698
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_with_template() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1985,6 +2089,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( date( 'Y-m-d', strtotime( $expected_modified ) ), date( 'Y-m-d', strtotime( $new_post->post_modified ) ) );
</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">+ /**
+ * @dataProvider post_dates_provider
+ */
+ public function test_update_post_date( $status, $params, $results ) {
+ wp_set_current_user( self::$editor_id );
+ update_option( 'timezone_string', $params['timezone_string'] );
+
+ $post_id = $this->factory->post->create( array( 'post_status' => $status ) );
+
+ $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', $post_id ) );
+ if ( isset( $params['date'] ) ) {
+ $request->set_param( 'date', $params['date'] );
+ }
+ if ( isset( $params['date_gmt'] ) ) {
+ $request->set_param( 'date_gmt', $params['date_gmt'] );
+ }
+ $response = $this->server->dispatch( $request );
+
+ update_option( 'timezone_string', '' );
+
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $post = get_post( $data['id'] );
+
+ $this->assertEquals( $results['date'], $data['date'] );
+ $post_date = str_replace( 'T', ' ', $results['date'] );
+ $this->assertEquals( $post_date, $post->post_date );
+
+ $this->assertEquals( $results['date_gmt'], $data['date_gmt'] );
+ // TODO expect null here for drafts (see https://core.trac.wordpress.org/ticket/5698#comment:14)
+ $post_date_gmt = str_replace( 'T', ' ', $results['date_gmt'] );
+ $this->assertEquals( $post_date_gmt, $post->post_date_gmt );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_update_post_with_invalid_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api.php 2017-02-21 07:04:34 UTC (rev 40100)
+++ trunk/tests/phpunit/tests/rest-api.php 2017-02-21 18:17:32 UTC (rev 40101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,4 +383,67 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $valid, wp_check_jsonp_callback( $callback ) );
</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 rest_date_provider() {
+ return array(
+ // Valid dates with timezones
+ array( '2017-01-16T11:30:00-05:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5 * HOUR_IN_SECONDS ),
+ array( '2017-01-16T11:30:00-05:30', gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5.5 * HOUR_IN_SECONDS ),
+ array( '2017-01-16T11:30:00-05' , gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5 * HOUR_IN_SECONDS ),
+ array( '2017-01-16T11:30:00+05' , gmmktime( 11, 30, 0, 1, 16, 2017 ) - 5 * HOUR_IN_SECONDS ),
+ array( '2017-01-16T11:30:00-00' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00+00' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00Z' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+
+ // Valid dates without timezones
+ array( '2017-01-16T11:30:00' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+
+ // Invalid dates (TODO: support parsing partial dates as ranges, see #38641)
+ array( '2017-01-16T11:30:00-5', false ),
+ array( '2017-01-16T11:30', false ),
+ array( '2017-01-16T11', false ),
+ array( '2017-01-16T', false ),
+ array( '2017-01-16', false ),
+ array( '2017-01', false ),
+ array( '2017', false ),
+ );
+ }
+
+ /**
+ * @dataProvider rest_date_provider
+ */
+ public function test_rest_parse_date( $string, $value ) {
+ $this->assertEquals( $value, rest_parse_date( $string ) );
+ }
+
+ public function rest_date_force_utc_provider() {
+ return array(
+ // Valid dates with timezones
+ array( '2017-01-16T11:30:00-05:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00-05:30', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00-05' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00+05' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00-00' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00+00' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+ array( '2017-01-16T11:30:00Z' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+
+ // Valid dates without timezones
+ array( '2017-01-16T11:30:00' , gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
+
+ // Invalid dates (TODO: support parsing partial dates as ranges, see #38641)
+ array( '2017-01-16T11:30:00-5', false ),
+ array( '2017-01-16T11:30', false ),
+ array( '2017-01-16T11', false ),
+ array( '2017-01-16T', false ),
+ array( '2017-01-16', false ),
+ array( '2017-01', false ),
+ array( '2017', false ),
+ );
+ }
+
+ /**
+ * @dataProvider rest_date_force_utc_provider
+ */
+ public function test_rest_parse_date_force_utc( $string, $value ) {
+ $this->assertEquals( $value, rest_parse_date( $string, true ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>