lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove jenssegers/date and solely use Carbon

Browse Source
This commit is contained in:
James Brooks
2017-01-02 16:11:15 +00:00
parent a2bbb18f79
commit 2b75eca7d0
11 changed files with 25 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Dates/DateFactory.php
+5 -5
View File
@@ -11,8 +11,8 @@
namespace CachetHQ\Cachet\Dates;
use Carbon\Carbon;
use DateTimeZone;
use Jenssegers\Date\Date;
/**
* This is the date factory class.
@@ -62,7 +62,7 @@ class DateFactory
*/
public function create($format, $time)
{
return Date::createFromFormat($format, $time, $this->cachetTimezone)->setTimezone($this->appTimezone);
return Carbon::createFromFormat($format, $time, $this->cachetTimezone)->setTimezone($this->appTimezone);
}
/**
@@ -79,7 +79,7 @@ class DateFactory
*/
public function createNormalized($format, $time)
{
return Date::createFromFormat($format, $time)->setTimezone($this->appTimezone);
return Carbon::createFromFormat($format, $time)->setTimezone($this->appTimezone);
}
/**
@@ -93,7 +93,7 @@ class DateFactory
*/
public function make($time = null)
{
return (new Date($time))->setTimezone($this->cachetTimezone);
return Carbon::parse($time)->setTimezone($this->cachetTimezone);
}
/**
@@ -103,7 +103,7 @@ class DateFactory
*/
public function getTimezone()
{
$dateTime = new Date();
$dateTime = new Carbon();
$dateTime->setTimeZone(new DateTimeZone($this->cachetTimezone));
return $dateTime->format('T');