Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix pb in date format %a %b when using a negative timezone

Browse Source 
Enhance date management and unit tests.
This commit is contained in:
Laurent Destailleur
2021-04-19 12:48:08 +02:00
parent 23b11491d2
commit 61df76dd9a
7 changed files with 202 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/phpunit/DateLibTest.php
View File

@@ -36,6 +36,10 @@ if (empty($user->id)) {
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
print "\n".$langs->trans("CurrentHour").' : '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver');
print "\n";
/**
* Class for PHPUnit tests
@@ -72,9 +76,6 @@ class DateLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." db->type=".$db->type." user->id=".$user->id;
print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
print "\n".$langs->trans("CurrentHour").' : '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver');
//print " - db ".$db->db;
print "\n";
}
@@ -490,5 +491,30 @@ class DateLibTest extends PHPUnit\Framework\TestCase
$conf->global->MAIN_START_WEEK = 0; // start on sunday
$prev = dol_get_first_day_week($day, $month, $year);
$this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st
return 1;
}
/**
* testDolGetFirstHour
*
* @return int
*/
public function testDolGetFirstHour()
{
global $conf;
$now = 1800 + (24 * 3600 * 10); // The 11th of january 1970 at 0:30 in UTC
$result = dol_get_first_hour($now, 'gmt');
print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
$now = 23.5 * 3600 + (24 * 3600 * 10); // The 11th of january 1970 at 23:30 in UTC
$result = dol_get_first_hour($now, 'gmt');
print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
return 1;
}
}