<!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>[54230] trunk/tests/phpunit/tests: Tests: Add tests with deprecated timezone strings.</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/54230">54230</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/54230","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>2022-09-19 23:51:20 +0000 (Mon, 19 Sep 2022)</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: Add tests with deprecated timezone strings.
This commit adds tests in select places to ensure that these date/time related functions continue to behave as expected when the `timezone_string` option is set to an outdated/deprecated timezone name.
The timezone string used in these tests, `America/Buenos_Aires`, is a timezone string which was already deprecated in PHP 5.6.20 (the current minimum PHP version), so using this timezone string, we can safely test the handling of deprecated timezone names on all supported PHP versions.
See: [https://3v4l.org/Holsr#v5.6.20 timezone_identifiers_list() output for PHP 5.6.20].
Follow-up to <a href="https://core.trac.wordpress.org/changeset/54207">[54207]</a>, <a href="https://core.trac.wordpress.org/changeset/54217">[54217]</a>, <a href="https://core.trac.wordpress.org/changeset/54227">[54227]</a>, <a href="https://core.trac.wordpress.org/changeset/54229">[54229]</a>.
Props jrf, costdev.
See <a href="https://core.trac.wordpress.org/ticket/56468">#56468</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsdatecurrentTimephp">trunk/tests/phpunit/tests/date/currentTime.php</a></li>
<li><a href="#trunktestsphpunittestsdatedateI18nphp">trunk/tests/phpunit/tests/date/dateI18n.php</a></li>
<li><a href="#trunktestsphpunittestsdatemysql2datephp">trunk/tests/phpunit/tests/date/mysql2date.php</a></li>
<li><a href="#trunktestsphpunittestsdatewpTimezonephp">trunk/tests/phpunit/tests/date/wpTimezone.php</a></li>
<li><a href="#trunktestsphpunittestsformattingdatephp">trunk/tests/phpunit/tests/formatting/date.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsdatecurrentTimephp"></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/date/currentTime.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/currentTime.php 2022-09-19 23:46:26 UTC (rev 54229)
+++ trunk/tests/phpunit/tests/date/currentTime.php 2022-09-19 23:51:20 UTC (rev 54230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,4 +128,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualsWithDelta( strtotime( $datetime_local->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C ) ), 2, 'The dates should be equal' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualsWithDelta( strtotime( $datetime_utc->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C, true ) ), 2, 'The dates should be equal' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Ensures that deprecated timezone strings are handled correctly.
+ *
+ * @ticket 56468
+ */
+ public function test_should_work_with_deprecated_timezone() {
+ $format = 'Y-m-d H:i';
+ $timezone_string = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
+ update_option( 'timezone_string', $timezone_string );
+ $datetime = new DateTime( 'now', new DateTimeZone( $timezone_string ) );
+
+ // phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+ date_default_timezone_set( $timezone_string );
+
+ $current_time_custom_timezone_gmt = current_time( $format, true );
+ $current_time_custom_timezone = current_time( $format );
+
+ // phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+ date_default_timezone_set( 'UTC' );
+
+ $current_time_gmt = current_time( $format, true );
+ $current_time = current_time( $format );
+
+ $this->assertSame( gmdate( $format ), $current_time_custom_timezone_gmt, 'The dates should be equal [1]' );
+ $this->assertSame( $datetime->format( $format ), $current_time_custom_timezone, 'The dates should be equal [2]' );
+ $this->assertSame( gmdate( $format ), $current_time_gmt, 'The dates should be equal [3]' );
+ $this->assertSame( $datetime->format( $format ), $current_time, 'The dates should be equal [4]' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsdatedateI18nphp"></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/date/dateI18n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/dateI18n.php 2022-09-19 23:46:26 UTC (rev 54229)
+++ trunk/tests/phpunit/tests/date/dateI18n.php 2022-09-19 23:51:20 UTC (rev 54230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,6 +109,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensures that deprecated timezone strings are handled correctly.
+ *
+ * @ticket 56468
+ */
+ public function test_adjusts_format_based_on_deprecated_timezone_string() {
+ update_option( 'timezone_string', 'America/Buenos_Aires' ); // This timezone was deprecated pre-PHP 5.6.
+
+ $expected = '2022-08-01 00:00:00 -03 -03:00 America/Buenos_Aires';
+ if ( PHP_VERSION_ID < 70000 ) {
+ // PHP 5.6.
+ $expected = '2022-08-01 00:00:00 ART -03:00 America/Buenos_Aires';
+ }
+
+ $this->assertSame( $expected, date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2022-08-01 00:00:00' ) ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34835
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_gmt_offset_should_output_correct_timezone() {
</span></span></pre></div>
<a id="trunktestsphpunittestsdatemysql2datephp"></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/date/mysql2date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/mysql2date.php 2022-09-19 23:46:26 UTC (rev 54229)
+++ trunk/tests/phpunit/tests/date/mysql2date.php 2022-09-19 23:51:20 UTC (rev 54230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +63,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensures that deprecated timezone strings are handled correctly.
+ *
+ * @ticket 56468
+ */
+ public function test_mysql2date_should_format_time_with_deprecated_time_zone() {
+ $timezone = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
+ update_option( 'timezone_string', $timezone );
+ $datetime = new DateTime( 'now', new DateTimeZone( $timezone ) );
+ $rfc3339 = $datetime->format( DATE_RFC3339 );
+ $mysql = $datetime->format( 'Y-m-d H:i:s' );
+
+ $this->assertSame( $rfc3339, mysql2date( DATE_RFC3339, $mysql ) );
+ $this->assertSame( $rfc3339, mysql2date( DATE_RFC3339, $mysql, false ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28992
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_mysql2date_should_return_wp_timestamp() {
</span></span></pre></div>
<a id="trunktestsphpunittestsdatewpTimezonephp"></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/date/wpTimezone.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/wpTimezone.php 2022-09-19 23:46:26 UTC (rev 54229)
+++ trunk/tests/phpunit/tests/date/wpTimezone.php 2022-09-19 23:51:20 UTC (rev 54230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensures that deprecated timezone strings are handled correctly.
+ *
+ * @ticket 56468
+ */
+ public function test_should_return_deprecated_timezone_string() {
+ $tz_string = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
+ update_option( 'timezone_string', $tz_string );
+
+ $this->assertSame( $tz_string, wp_timezone_string() );
+
+ $timezone = wp_timezone();
+
+ $this->assertSame( $tz_string, $timezone->getName() );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Data provider to test numeric offset conversion.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingdatephp"></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/formatting/date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/date.php 2022-09-19 23:46:26 UTC (rev 54229)
+++ trunk/tests/phpunit/tests/formatting/date.php 2022-09-19 23:51:20 UTC (rev 54230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,6 +240,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone_string' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'gmt_offset' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @ticket 56468.
+ 'deprecated timezone string and no GMT offset set' => array(
+ 'timezone_string' => 'America/Buenos_Aires',
+ 'gmt_offset' => 0,
+ ),
</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>
</div>
</body>
</html>