FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix time output bug

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-23 11:17:16 -06:00
parent 4d91c02a94
commit c42b920903
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Facades/Utils.php
View File

@@ -23,12 +23,16 @@ class Utils extends Facade
public static function minutesToTimeParts($minutes): array public static function minutesToTimeParts($minutes): array
{ {
return self::secondsToTimeParts(self::minutesToSeconds($minutes)); $hours = floor($minutes / 60);
$minutes %= 60;
return ['h' => $hours, 'm' => $minutes];
} }
public static function minutesToTimeString($minutes): string public static function minutesToTimeString($minutes): string
{ {
return self::secondsToTimeString(self::minutesToSeconds($minutes)); $hm = self::minutesToTimeParts($minutes);
return $hm['h']. 'h '. $hm['m'] . 'm';
} }
/** /**
@@ -38,8 +42,8 @@ class Utils extends Facade
*/ */
public static function secondsToTimeParts($seconds): array public static function secondsToTimeParts($seconds): array
{ {
$dtF = new \DateTime('@0'); $dtF = new \DateTime('@0', new \DateTimeZone('UTC'));
$dtT = new \DateTime("@$seconds"); $dtT = new \DateTime("@$seconds", new \DateTimeZone('UTC'));
$t = $dtF->diff($dtT); $t = $dtF->diff($dtT);

15
tests/UtilsTest.php
View File

@@ -25,7 +25,8 @@ class UtilsTest extends TestCase
$this->assertEquals(['h' => 0, 'm' => 1, 's' => 2], $t); $this->assertEquals(['h' => 0, 'm' => 1, 's' => 2], $t);
} }
public function testSecondsToTime() { public function testSecondsToTime()
{
$t = Utils::secondsToTimeString(3600); $t = Utils::secondsToTimeString(3600);
$this->assertEquals('1h 0m', $t); $this->assertEquals('1h 0m', $t);
@@ -38,4 +39,16 @@ class UtilsTest extends TestCase
$t = Utils::secondsToTimeString(3722, true); $t = Utils::secondsToTimeString(3722, true);
$this->assertEquals('1h 2m 2s', $t); $this->assertEquals('1h 2m 2s', $t);
} }
public function testMinutesToTime()
{
$t = Utils::minutesToTimeParts(65);
$this->assertEquals(['h' => 1, 'm' => 5], $t);
$t = Utils::minutesToTimeString(65);
$this->assertEquals('1h 5m', $t);
$t = Utils::minutesToTimeString(43200);
$this->assertEquals('720h 0m', $t);
}
} }