mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
Merge branch '3.3.x'
This commit is contained in:
@@ -58,7 +58,6 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
|
||||
$this->assertEquals($expected, $user->format_date($timestamp, $format, true));
|
||||
}
|
||||
|
||||
|
||||
public function relative_format_date_data()
|
||||
{
|
||||
// If the current time is too close to the testing time,
|
||||
@@ -103,6 +102,20 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
|
||||
gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false,
|
||||
gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time,
|
||||
),
|
||||
|
||||
// Test edge cases: Yesterday 00:00, Today 00:00, Tomorrow 00:00
|
||||
array(
|
||||
gmdate('Y-m-d', strtotime('yesterday')) . ' 00:00', false,
|
||||
'Yesterday 00:00',
|
||||
),
|
||||
array(
|
||||
gmdate('Y-m-d', strtotime('today')) . ' 00:00', false,
|
||||
'Today 00:00',
|
||||
),
|
||||
array(
|
||||
gmdate('Y-m-d', strtotime('tomorrow')) . ' 00:00', false,
|
||||
'Tomorrow 00:00',
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user