devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

TimeUtil 리팩토링

Browse Source
This commit is contained in:
Hide_D
2018-09-16 04:14:22 +09:00
parent 469330f270
commit 35728c7911
32 changed files with 165 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sammo/Session.php
+2 -2
View File
@@ -280,7 +280,7 @@ class Session
$db->update('general', [
'logcnt' => $db->sqleval('logcnt+1'),
'ip' => Util::get_client_ip(true),
'lastConnect' => date('Y-m-d H:i:s')
'lastConnect' => TimeUtil::now()
], 'owner = %i', $userID);
$this->set($serverID.static::GAME_KEY_DATE, $now);
@@ -344,7 +344,7 @@ class Session
if(!$this->tokenValidUntil){
return false;
}
$now = TimeUtil::DatetimeNow();
$now = TimeUtil::now();
if($this->tokenValidUntil < $now){
return false;
}
src/sammo/TimeUtil.php
+27 -34
View File
@@ -3,13 +3,13 @@ namespace sammo;
class TimeUtil
{
public static function DateToday()
public static function today()
{
$obj = new \DateTime();
return $obj->format('Y-m-d');
}
public static function DatetimeNow(bool $withFraction=false)
public static function now(bool $withFraction=false)
{
$obj = new \DateTime();
if(!$withFraction){
@@ -18,67 +18,47 @@ class TimeUtil
return $obj->format('Y-m-d H:i:s.u');
}
public static function DatetimeFromNowDay($day, bool $withFraction=false)
public static function nowAddDays($day, bool $withFraction=false)
{
$obj = new \DateTime();
$obj->modify("{$day} days");
$obj->add(static::secondsToDateInterval($day * 3600 * 24));
if(!$withFraction){
return $obj->format('Y-m-d H:i:s');
}
return $obj->format('Y-m-d H:i:s.u');
}
public static function DatetimeFromNowHour($hour, bool $withFraction=false)
public static function nowAddHours($hour, bool $withFraction=false)
{
$obj = new \DateTime();
$obj->modify("{$hour} hours");
$obj->add(static::secondsToDateInterval($hour * 3600));
if(!$withFraction){
return $obj->format('Y-m-d H:i:s');
}
return $obj->format('Y-m-d H:i:s.u');
}
public static function DatetimeFromNowMinute($minute, bool $withFraction=false)
public static function nowAddMinutes($minute, bool $withFraction=false)
{
$obj = new \DateTime();
$obj->modify("{$minute} minutes");
$obj->add(static::secondsToDateInterval($minute * 60));
if(!$withFraction){
return $obj->format('Y-m-d H:i:s');
}
return $obj->format('Y-m-d H:i:s.u');
}
public static function DatetimeFromNowSecond($second, bool $withFraction=false)
public static function nowAddSeconds($second, bool $withFraction=false)
{
$obj = new \DateTime();
$obj->modify("{$second} seconds");
$obj->add(static::secondsToDateInterval($second));
if(!$withFraction){
return $obj->format('Y-m-d H:i:s');
}
return $obj->format('Y-m-d H:i:s.u');
}
public static function DatetimeFromMinute($date, $minute, bool $withFraction=false)
{
$obj = new \DateTime($date);
$obj->modify("{$minute} minutes");
if(!$withFraction){
return $obj->format('Y-m-d H:i:s');
}
return $obj->format('Y-m-d H:i:s.u');
}
public static function DatetimeFromSecond($date, $second, bool $withFraction=false)
{
$obj = new \DateTime($date);
$obj->modify("{$second} seconds");
if(!$withFraction){
return $obj->format('Y-m-d H:i:s');
}
return $obj->format('Y-m-d H:i:s.u');
}
public static function SecondsToDateInterval(float $fullSeconds): \DateInterval{
public static function secondsToDateTime(float $fullSeconds): \DateTime{
$seconds = floor($fullSeconds);
$fraction = $fullSeconds - $seconds;
@@ -86,10 +66,21 @@ class TimeUtil
$interval->s = $seconds;
$interval->f = $fraction;
$d0 = new \DateTimeImmutable("@0");
$d1 = $d0->add($interval);
$dateTime = new \DateTime("@0");
$dateTime->add($interval);
return $dateTime;
}
return $d1->diff($d0);
public static function secondsToDateInterval(float $fullSeconds): \DateInterval{
$dateBase = new \DateTime("@0");
return static::secondsToDateTime($fullSeconds)->diff($d0);
}
public static function DateTimeToSeconds(\DateTime $dateTime): float{
$dateBase = new \DateTime("@0");
return static::DateIntervalToSeconds($dateTime->diff($dateBase));
}
public static function DateIntervalToSeconds(\DateInterval $interval): float{
@@ -112,4 +103,6 @@ class TimeUtil
return $seconds;
}
}