Remove jenssegers/date and solely use Carbon

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

View File

@@ -19,6 +19,7 @@ use CachetHQ\Cachet\Models\Incident;
use CachetHQ\Cachet\Models\Metric;
use CachetHQ\Cachet\Models\Schedule;
use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
use Carbon\Carbon;
use Exception;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Routing\Controller;
@@ -26,7 +27,6 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\View;
use Jenssegers\Date\Date;
use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
/**
@@ -45,14 +45,14 @@ class StatusPageController extends AbstractApiController
*/
public function showIndex()
{
$today = Date::now();
$startDate = Date::now();
$today = Carbon::now();
$startDate = Carbon::now();
// Check if we have another starting date
if (Binput::has('start_date')) {
try {
// If date provided is valid
$oldDate = Date::createFromFormat('Y-m-d', Binput::get('start_date'));
$oldDate = Carbon::createFromFormat('Y-m-d', Binput::get('start_date'));
// If trying to get a future date fallback to today
if ($today->gt($oldDate)) {