mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/e107inc/e107-test

Browse Source
This commit is contained in:
Cameron
2018-05-25 08:49:12 -07:00
parent f120fbac7e 3a05a1d829
commit 3e19cca607
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107

Submodule e107 updated: 1494c18660...78213c4a31

11
tests/unit/e_dateTest.php
View File

@@ -177,7 +177,12 @@
'tm_year' => 118, 'tm_year' => 118,
'tm_mon' => 4, 'tm_mon' => 4,
'tm_mday' => 13, 'tm_mday' => 13,
'tm_sec' => 0,
'tm_min' => 0,
'tm_hour' => 0,
'unparsed' => '',
'tm_fmon' => 'May', 'tm_fmon' => 'May',
'tm_amon' => 'May',
'tm_wday' => 0, 'tm_wday' => 0,
'tm_yday' => 132, 'tm_yday' => 132,
); );
@@ -190,6 +195,9 @@
'tm_mday' => 13, 'tm_mday' => 13,
'tm_hour' => 20, 'tm_hour' => 20,
'tm_min' => 10, 'tm_min' => 10,
'tm_sec' => 0,
'unparsed' => '',
'tm_amon' => 'May',
'tm_fmon' => 'May', 'tm_fmon' => 'May',
'tm_wday' => 0, 'tm_wday' => 0,
'tm_yday' => 132, 'tm_yday' => 132,
@@ -200,6 +208,9 @@
public function testConvert_date() public function testConvert_date()
{ {
// Expected values made using the C locale
setlocale(LC_TIME, 'C');
// will probably fail on windows // will probably fail on windows
$actual = $this->dateObj->convert_date(mktime(12, 45, 03, 2, 5, 2018), 'long'); $actual = $this->dateObj->convert_date(mktime(12, 45, 03, 2, 5, 2018), 'long');
$expected = 'Monday 05 February 2018 - 12:45:03'; $expected = 'Monday 05 February 2018 - 12:45:03';