Merge pull request #1443 from CachetHQ/stuffs

Working on datetime mess

app/Dates/DateFactory.php

@@ -74,4 +74,18 @@ class DateFactory
     {
         return Date::createFromFormat($format, $time)->setTimezone($this->appTimezone);
     }
+
+    /**
+     * Make a Carbon instance from a string.
+     *
+     * @param string|null $time
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return \Carbon\Carbon
+     */
+    public function make($time = null)
+    {
+        return (new Date($time))->setTimezone($this->cachetTimezone);
+    }
 }

app/GitHub/Release.php

@@ -18,14 +18,14 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
 class Release
 {
     /**
-     * Cache instance.
+     * The cache repository instance.
      *
      * @var \Illuminate\Contracts\Cache\Repository
      */
     protected $cache;
 
     /**
-     * Config repository.
+     * The config repository instance.
      *
      * @var \Illuminate\Contracts\Config\Repository
      */

app/Http/Controllers/StatusPageController.php

@@ -11,6 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Models\Incident;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -54,27 +55,19 @@ class StatusPageController extends Controller
         } else {
             $incidentDays = range(0, $daysToShow);
         }
-        $dateTimeZone = Config::get('cachet.timezone');
 
         $incidentVisibility = Auth::check() ? 0 : 1;
 
         $allIncidents = Incident::notScheduled()->where('visible', '>=', $incidentVisibility)->whereBetween('created_at', [
             $startDate->copy()->subDays($daysToShow)->format('Y-m-d').' 00:00:00',
             $startDate->format('Y-m-d').' 23:59:59',
-        ])->orderBy('scheduled_at', 'desc')->orderBy('created_at', 'desc')->get()->groupBy(function (Incident $incident) use ($dateTimeZone) {
-            // If it's scheduled, get the scheduled at date.
-            if ($incident->is_scheduled) {
-                return (new Date($incident->scheduled_at))
-                    ->setTimezone($dateTimeZone)->toDateString();
-            }
-
-            return (new Date($incident->created_at))
-                ->setTimezone($dateTimeZone)->toDateString();
+        ])->orderBy('scheduled_at', 'desc')->orderBy('created_at', 'desc')->get()->groupBy(function (Incident $incident) {
+            return app(DateFactory::class)->make($incident->is_scheduled ? $incident->scheduled_at : $incident->created_at)->toDateString();
         });
 
         // Add in days that have no incidents
         foreach ($incidentDays as $i) {
-            $date = (new Date($startDate))->setTimezone($dateTimeZone)->subDays($i);
+            $date = app(DateFactory::class)->make($startDate)->subDays($i);
 
             if (!isset($allIncidents[$date->toDateString()])) {
                 $allIncidents[$date->toDateString()] = [];

app/Http/Middleware/Admin.php

@@ -28,6 +28,8 @@ class Admin
      * Create a new admin middleware instance.
      *
      * @param \Illuminate\Contracts\Auth\Guard $auth
+     *
+     * @return void
      */
     public function __construct(Guard $auth)
     {

app/Http/Middleware/Localize.php

@@ -25,7 +25,7 @@ class Localize
     protected $langs;
 
     /**
-     * Config repository.
+     * The config repository instance.
      *
      * @var \Illuminate\Config\Repository
      */

app/Http/Middleware/Timezone.php

@@ -12,9 +12,29 @@
 namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
+use Illuminate\Contracts\Config\Repository;
 
 class Timezone
 {
+    /**
+     * The config repository instance.
+     *
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * Creates a new release instance.
+     *
+     * @param \Illuminate\Contracts\Config\Repository $config
+     *
+     * @return void
+     */
+    public function __construct(Repository $config)
+    {
+        $this->config = $config;
+    }
+
     /**
      * Handle an incoming request.
      *
@@ -26,7 +46,7 @@ class Timezone
     public function handle($request, Closure $next)
     {
         if ($tz = $request->header('Time-Zone')) {
-            app('config')->set('cachet.timezone', $tz);
+            $this->config->set('cachet.timezone', $tz);
         }
 
         return $next($request);

app/Presenters/IncidentPresenter.php

@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Cachet\Presenters;
 
+use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait;
 use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Config;
-use Jenssegers\Date\Date;
 use McCool\LaravelAutoPresenter\BasePresenter;
 
 class IncidentPresenter extends BasePresenter implements Arrayable
@@ -39,9 +39,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
      */
     public function created_at_diff()
     {
-        return (new Date($this->wrappedObject->created_at))
-            ->setTimezone(Config::get('cachet.timezone'))
-            ->diffForHumans();
+        return app(DateFactory::class)->make($this->wrappedObject->created_at)->diffForHumans();
     }
 
     /**
@@ -51,9 +49,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
      */
     public function created_at_formatted()
     {
-        return ucfirst((new Date($this->wrappedObject->created_at))
-            ->setTimezone(Config::get('cachet.timezone'))
-            ->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
+        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->created_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
     }
 
     /**
@@ -83,8 +79,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
      */
     public function scheduled_at()
     {
-        return (new Date($this->wrappedObject->scheduled_at))
-            ->setTimezone(Config::get('cachet.timezone'))->toDateTimeString();
+        return app(DateFactory::class)->make($this->wrappedObject->scheduled_at)->toDateTimeString();
     }
 
     /**
@@ -94,9 +89,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
      */
     public function scheduled_at_diff()
     {
-        return (new Date($this->wrappedObject->scheduled_at))
-            ->setTimezone(Config::get('cachet.timezone'))
-            ->diffForHumans();
+        return app(DateFactory::class)->make($this->wrappedObject->scheduled_at)->diffForHumans();
     }
 
     /**
@@ -106,9 +99,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
      */
     public function scheduled_at_formatted()
     {
-        return ucfirst((new Date($this->wrappedObject->scheduled_at))
-            ->setTimezone(Config::get('cachet.timezone'))
-            ->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
+        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->created_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
     }
 
     /**
@@ -140,9 +131,9 @@ class IncidentPresenter extends BasePresenter implements Arrayable
     {
         if ($this->wrappedObject->is_scheduled) {
             return $this->scheduled_at_formatted;
-        } else {
-            return $this->created_at_formatted;
         }
+
+        return $this->created_at_formatted;
     }
 
     /**
@@ -154,9 +145,9 @@ class IncidentPresenter extends BasePresenter implements Arrayable
     {
         if ($this->wrappedObject->is_scheduled) {
             return $this->scheduled_at_iso;
-        } else {
-            return $this->created_at_iso;
         }
+
+        return $this->created_at_iso;
     }
 
     /**

app/Presenters/SubscriberPresenter.php

@@ -11,10 +11,9 @@
 
 namespace CachetHQ\Cachet\Presenters;
 
+use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait;
 use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Facades\Config;
-use Jenssegers\Date\Date;
 use McCool\LaravelAutoPresenter\BasePresenter;
 
 class SubscriberPresenter extends BasePresenter implements Arrayable
@@ -28,8 +27,7 @@ class SubscriberPresenter extends BasePresenter implements Arrayable
      */
     public function verified_at()
     {
-        return (new Date($this->wrappedObject->verified_at))
-            ->setTimezone(Config::get('cachet.timezone'))->toDateTimeString();
+        return app(DateFactory::class)->make($this->wrappedObject->verified_at)->toDateTimeString();
     }
 
     /**

app/Presenters/Traits/TimestampsTrait.php

@@ -11,8 +11,7 @@
 
 namespace CachetHQ\Cachet\Presenters\Traits;
 
-use Illuminate\Support\Facades\Config;
-use Jenssegers\Date\Date;
+use CachetHQ\Cachet\Dates\DateFactory;
 
 trait TimestampsTrait
 {
@@ -23,8 +22,7 @@ trait TimestampsTrait
      */
     public function created_at()
     {
-        return (new Date($this->wrappedObject->created_at))
-            ->setTimezone(Config::get('cachet.timezone'))->toDateTimeString();
+        return app(DateFactory::class)->make($this->wrappedObject->created_at)->toDateTimeString();
     }
 
     /**
@@ -34,8 +32,7 @@ trait TimestampsTrait
      */
     public function updated_at()
     {
-        return (new Date($this->wrappedObject->updated_at))
-            ->setTimezone(Config::get('cachet.timezone'))->toDateTimeString();
+        return app(DateFactory::class)->make($this->wrappedObject->updated_at)->toDateTimeString();
     }
 
     /**
@@ -45,7 +42,6 @@ trait TimestampsTrait
      */
     public function deleted_at()
     {
-        return (new Date($this->wrappedObject->deleted_at))
-            ->setTimezone(Config::get('cachet.timezone'))->toDateTimeString();
+        return app(DateFactory::class)->make($this->wrappedObject->deleted_at)->toDateTimeString();
     }
 }

app/Repositories/Metric/MetricRepository.php

@@ -11,10 +11,9 @@
 
 namespace CachetHQ\Cachet\Repositories\Metric;
 
+use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Models\Metric;
 use DateInterval;
-use Illuminate\Support\Facades\Config;
-use Jenssegers\Date\Date;
 
 class MetricRepository
 {
@@ -26,21 +25,24 @@ class MetricRepository
     protected $repository;
 
     /**
-     * The timezone the status page is showing in.
+     * The date factory instance.
      *
-     * @var string
+     * @var \CachetHQ\Cachet\Dates\DateFactory
      */
-    protected $dateTimeZone;
+    protected $dates;
 
     /**
      * Create a new metric repository class.
      *
      * @param \CachetHQ\Cachet\Repositories\Metric\MetricInterface $repository
+     * @param \CachetHQ\Cachet\Dates\DateFactory                   $dates
+     *
+     * @return void
      */
-    public function __construct(MetricInterface $repository)
+    public function __construct(MetricInterface $repository, DateFactory $dates)
     {
         $this->repository = $repository;
-        $this->dateTimeZone = Config::get('cachet.timezone');
+        $this->dates = $dates;
     }
 
     /**
@@ -52,10 +54,12 @@ class MetricRepository
      */
     public function listPointsLastHour(Metric $metric)
     {
-        $dateTime = (new Date())->setTimezone($this->dateTimeZone);
+        $dateTime = $this->dates->make();
+
         $points = [];
 
         $pointKey = $dateTime->format('H:i');
+
         for ($i = 0; $i <= 60; $i++) {
             $points[$pointKey] = $this->repository->getPointsLastHour($metric, 0, $i);
             $pointKey = $dateTime->sub(new DateInterval('PT1M'))->format('H:i');
@@ -74,10 +78,12 @@ class MetricRepository
      */
     public function listPointsToday(Metric $metric, $hours = 12)
     {
-        $dateTime = (new Date())->setTimezone($this->dateTimeZone);
+        $dateTime = $this->dates->make();
+
         $points = [];
 
         $pointKey = $dateTime->format('H:00');
+
         for ($i = 0; $i <= $hours; $i++) {
             $points[$pointKey] = $this->repository->getPointsByHour($metric, $i);
             $pointKey = $dateTime->sub(new DateInterval('PT1H'))->format('H:00');
@@ -95,10 +101,12 @@ class MetricRepository
      */
     public function listPointsForWeek(Metric $metric)
     {
-        $dateTime = (new Date())->setTimezone($this->dateTimeZone);
+        $dateTime = $this->dates->make();
+
         $points = [];
 
         $pointKey = $dateTime->format('jS M');
+
         for ($i = 0; $i <= 7; $i++) {
             $points[$pointKey] = $this->repository->getPointsForDayInWeek($metric, $i);
             $pointKey = $dateTime->sub(new DateInterval('P1D'))->format('D jS M');
@@ -116,11 +124,14 @@ class MetricRepository
      */
     public function listPointsForMonth(Metric $metric)
     {
-        $dateTime = (new Date())->setTimezone($this->dateTimeZone);
+        $dateTime = $this->dates->make();
+
         $daysInMonth = $dateTime->format('t');
+
         $points = [];
 
         $pointKey = $dateTime->format('jS M');
+
         for ($i = 0; $i <= $daysInMonth; $i++) {
             $points[$pointKey] = $this->repository->getPointsForDayInWeek($metric, $i);
             $pointKey = $dateTime->sub(new DateInterval('P1D'))->format('jS M');