mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 07:58:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13216] Use gmdate() instead of date() in datetime tests
This commit is contained in:
Nils Adermann 2014-10-25 21:27:02 -07:00
commit 5b42bcfe62
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/datetime/from_format_test.php
View File

@ -60,44 +60,44 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
// If the current time is too close to the testing time, // If the current time is too close to the testing time,
// the relative time will use "x minutes ago" instead of "today ..." // the relative time will use "x minutes ago" instead of "today ..."
// So we use 18:01 in the morning and 06:01 in the afternoon. // So we use 18:01 in the morning and 06:01 in the afternoon.
$testing_time = date('H') <= 12 ? '18:01' : '06:01'; $testing_time = gmdate('H') <= 12 ? '18:01' : '06:01';
return array( return array(
array( array(
date('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, false, gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, false,
date('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time,
), ),
array( array(
date('Y-m-d', time() + 86400) . ' ' . $testing_time, false, gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, false,
'Tomorrow ' . $testing_time, 'Tomorrow ' . $testing_time,
), ),
array( array(
date('Y-m-d', time() + 86400) . ' ' . $testing_time, true, gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, true,
date('Y-m-d', time() + 86400) . ' ' . $testing_time, gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time,
), ),
array( array(
date('Y-m-d') . ' ' . $testing_time, false, gmdate('Y-m-d') . ' ' . $testing_time, false,
'Today ' . $testing_time, 'Today ' . $testing_time,
), ),
array( array(
date('Y-m-d') . ' ' . $testing_time, true, gmdate('Y-m-d') . ' ' . $testing_time, true,
date('Y-m-d') . ' ' . $testing_time, gmdate('Y-m-d') . ' ' . $testing_time,
), ),
array( array(
date('Y-m-d', time() - 86400) . ' ' . $testing_time, false, gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, false,
'Yesterday ' . $testing_time, 'Yesterday ' . $testing_time,
), ),
array( array(
date('Y-m-d', time() - 86400) . ' ' . $testing_time, true, gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, true,
date('Y-m-d', time() - 86400) . ' ' . $testing_time, gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time,
), ),
array( array(
date('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false, gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false,
date('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time,
), ),
); );
} }