<!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>[51587] trunk/tests/phpunit/tests: Code Modernization: Replace `strftime()` and `gmstrftime()` usage in unit 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/51587">51587</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/51587","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>2021-08-09 19:08:09 +0000 (Mon, 09 Aug 2021)</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: Replace `strftime()` and `gmstrftime()` usage in unit tests.

Since PHP 8.1, the `strftime()` and `gmstrftime()` functions are deprecated:

> The `strftime()` and `gmstrftime()` functions exhibit similar issues as `strptime()`, in that the formats they support, as well as their behavior, is platform-dependent. Unlike `strptime()`, these functions are available on Windows, though with a different feature set than on Linux. Musl-based distributions like Alpine do not support timezone-related format specifiers correctly. These functions are also locale-based, and as such may exhibit thread-safety issues.

>

> `date()` or `DateTime::format()` provide portable alternatives, and `IntlDateFormatter::format()` provides a more sophisticated, localization-aware alternative.

Reference: [https://wiki.php.net/rfc/deprecations_php_8_1#strftime_and_gmstrftime PHP RFC: Deprecations for PHP 8.1: strftime() and gmstrftime()]

> The `strftime()` and `gmstrftime()` functions have been deprecated in favor of

> `date()/DateTime::format()` (for locale-independent formatting) or

> `IntlDateFormatter::format()` (for locale-dependent formatting).

Reference: [https://github.com/php/php-src/blob/1cf4fb739f7a4fa8404a4c0958f13d04eae519d4/UPGRADING#L379-L381 PHP 8.1 Upgrade Notes].

Aside from one instance in SimplePie, the `strftime()` and `gmstrftime()` functions are only used within the test suite of WordPress to create formatted timestamps.

As the function is used in test code, this leads to test warnings like this on PHP 8.1:

{{{

Deprecated: Function strftime() is deprecated in path/to/tests/phpunit/tests/canonical/postStatus.php on line 37

}}}

These calls can all be safely converted to use a pattern along the lines of:

{{{#!php

<?php

date_format( date_create( 'time phrase or timestamp' ), $format )

}}}

Other references:

* [https://www.php.net/manual/en/function.strftime.php PHP Manual: strftime()] (for the old format string characters)

* [https://www.php.net/manual/en/datetime.format.php PHP Manual: DateTime::format()] (for the new format string characters)

* [https://www.php.net/manual/en/datetime.construct.php PHP Manual: DateTime::__construct()] (see Example 2 for a Unix timestamp code sample)

Props jrf, SergeyBiryukov.

Fixes <a href="https://core.trac.wordpress.org/ticket/53897">#53897</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunktestsphpunittestscanonicalpostStatusphp">trunk/tests/phpunit/tests/canonical/postStatus.php</a></li>

<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>

<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>

<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitemsfilesrewritingphp">trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>

<li><a href="#trunktestsphpunittestsoembedgetResponseDataphp">trunk/tests/phpunit/tests/oembed/getResponseData.php</a></li>

<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPostStatusphp">trunk/tests/phpunit/tests/post/getPostStatus.php</a></li>

<li><a href="#trunktestsphpunittestspostisPostPubliclyViewablephp">trunk/tests/phpunit/tests/post/isPostPubliclyViewable.php</a></li>

<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>

<li><a href="#trunktestsphpunittestsuploadphp">trunk/tests/phpunit/tests/upload.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmweditPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwgetPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPagephp">trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPageListphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPageList.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPagesphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPages.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetUserphp">trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunktestsphpunittestscanonicalpostStatusphp"></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/canonical/postStatus.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/postStatus.php        2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/canonical/postStatus.php  2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $post_statuses as $post_status ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_date = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'future' === $post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $post_date = strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $post_date = date_format( date_create( '+1 year' ), 'Y-m-d H:i:s' );

</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">                        self::$posts[ $post_status ] = $factory->post->create_and_get(

</span></span></pre></div>

<a id="trunktestsphpunittestscommentphp"></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/comment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php     2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/comment.php       2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -857,8 +857,8 @@

<span class="cx" style="display: block; padding: 0 10px">                // Close comments more than one day old.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'close_comments_days_old', 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $old_date    = strtotime( '-25 hours' );

-               $old_post_id = self::factory()->post->create( array( 'post_date' => strftime( '%Y-%m-%d %H:%M:%S', $old_date ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $old_date    = date_create( '-25 hours' );

+               $old_post_id = self::factory()->post->create( array( 'post_date' => date_format( $old_date, 'Y-m-d H:i:s' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $old_post_comment_status = _close_comments_for_old_post( true, $old_post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $old_post_comment_status );

</span></span></pre></div>

<a id="trunktestsphpunittestslinkphp"></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/link.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link.php        2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/link.php  2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $p = self::factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'publish',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_date'   => date_format( date_create( '+1 day' ), 'Y-m-d H:i:s' ),

</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">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'future',

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'   => 'wptests_pt',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_date'   => date_format( date_create( '+1 day' ), 'Y-m-d H:i:s' ),

</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="trunktestsphpunittestsmediaphp"></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/media.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php       2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/media.php 2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $post_statuses as $post_status ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $date = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'future' === $post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         date_format( date_create( '+1 year' ), 'Y-m-d H:i:s' );

</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">                        self::$post_ids[ $post_status ] = $factory->post->create(

</span></span></pre></div>

<a id="trunktestsphpunittestsmultisitemsfilesrewritingphp"></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/multisite/ms-files-rewriting.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php        2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php  2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,21 +35,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_main_site() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $site = get_current_site();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $date = date_format( date_create( 'now' ), 'Y/m' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $user_id  = self::factory()->user->create( array( 'role' => 'administrator' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $blog_id2 = self::factory()->blog->create( array( 'user_id' => $user_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $info     = wp_upload_dir();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );

-                       $this->assertSame( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );

-                       $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );

+                       $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );

+                       $this->assertSame( '/' . $date, $info['subdir'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $info['error'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        switch_to_blog( $blog_id2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $info2 = wp_upload_dir();

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEquals( $info, $info2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertSame( get_option( 'siteurl' ) . '/wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime( '%Y/%m' ), $info2['url'] );

-                       $this->assertSame( ABSPATH . 'wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime( '%Y/%m' ), $info2['path'] );

-                       $this->assertSame( gmstrftime( '/%Y/%m' ), $info2['subdir'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( get_option( 'siteurl' ) . '/wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . $date, $info2['url'] );

+                       $this->assertSame( ABSPATH . 'wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . $date, $info2['path'] );

+                       $this->assertSame( '/' . $date, $info2['subdir'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $info2['error'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        restore_current_blog();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span></span></pre></div>

<a id="trunktestsphpunittestsmultisitesitephp"></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/multisite/site.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php      2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/multisite/site.php        2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -838,11 +838,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_main_site() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $site = get_current_site();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $date = date_format( date_create( 'now' ), 'Y/m' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $info = wp_upload_dir();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );

-                       $this->assertSame( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );

-                       $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );

+                       $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );

+                       $this->assertSame( '/' . $date, $info['subdir'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $info['error'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $blog_id = self::factory()->blog->create();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -849,16 +850,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        switch_to_blog( $blog_id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $info = wp_upload_dir();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/sites/' . get_current_blog_id() . '/' . gmstrftime( '%Y/%m' ), $info['url'] );

-                       $this->assertSame( ABSPATH . 'wp-content/uploads/sites/' . get_current_blog_id() . '/' . gmstrftime( '%Y/%m' ), $info['path'] );

-                       $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['url'] );

+                       $this->assertSame( ABSPATH . 'wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['path'] );

+                       $this->assertSame( '/' . $date, $info['subdir'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $info['error'] );

</span><span class="cx" style="display: block; padding: 0 10px">                        restore_current_blog();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $info = wp_upload_dir();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );

-                       $this->assertSame( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );

-                       $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );

+                       $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );

+                       $this->assertSame( '/' . $date, $info['subdir'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $info['error'] );

</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="trunktestsphpunittestsoembedgetResponseDataphp"></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/oembed/getResponseData.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/getResponseData.php      2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/oembed/getResponseData.php        2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post = self::factory()->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'future',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_date'   => date_format( date_create( '+1 day' ), 'Y-m-d H:i:s' ),

</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="trunktestsphpunittestsoembedtemplatephp"></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/oembed/template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/template.php     2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/oembed/template.php       2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => 'Foo Bar',

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_excerpt' => 'Bar Baz',

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status'  => 'future',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_date'    => date_format( date_create( '+1 day' ), 'Y-m-d H:i:s' ),

</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="trunktestsphpunittestspostgetPostStatusphp"></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/post/getPostStatus.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostStatus.php  2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/post/getPostStatus.php    2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $date          = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual_status = $post_status;

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'future' === $post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $date = strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $date = date_format( date_create( '+1 year' ), 'Y-m-d H:i:s' );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( in_array( $post_status, array( 'trash', 'delete' ), true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $actual_status = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span></span></pre></div>

<a id="trunktestsphpunittestspostisPostPubliclyViewablephp"></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/post/isPostPubliclyViewable.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/isPostPubliclyViewable.php 2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/post/isPostPubliclyViewable.php   2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $date          = '';

</span><span class="cx" style="display: block; padding: 0 10px">                        $actual_status = $post_status;

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'future' === $post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $date = strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $date = date_format( date_create( '+1 year' ), 'Y-m-d H:i:s' );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( in_array( $post_status, array( 'trash', 'delete' ), true ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $actual_status = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_is_post_publicly_viewable( $post_type, $post_status, $expected, $parent_key = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $date = '';

</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'future' === $post_status ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $date = strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $date = date_format( date_create( '+1 year' ), 'Y-m-d H:i:s' );

</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">                $post_id = $this->factory()->post->create(

</span></span></pre></div>

<a id="trunktestsphpunittestspostphp"></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/post.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php        2021-08-09 17:19:21 UTC (rev 51586)

+++ trunk/tests/phpunit/tests/post.php  2021-08-09 19:08:09 UTC (rev 51587)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_status'  => 'publish',

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_content' => rand_str(),

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title'   => rand_str(),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'post_date'    => strftime( '%Y-%m-%d %H:%M:%S', $future_date ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'post_date'    => date_format( date_create( "@{$future_date}" ), 'Y-m-d H:i:s' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 