Bumped version

Fixes #1237

.env.example

@@ -12,6 +12,7 @@ DB_PASSWORD=secret
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=database
+CACHET_EMOJI=false
 
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
@@ -20,7 +21,10 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ADDRESS=null
 MAIL_NAME=null
+MAIL_ENCRYPTION=tls
 
 REDIS_HOST=null
 REDIS_DATABASE=null
 REDIS_PORT=null
+
+GITHUB_TOKEN=null

.gitattributes

@@ -1,3 +1,3 @@
 * text=auto
 *.css linguist-vendored
-*.less linguist-vendored
+*.scss linguist-vendored

.travis.yml

@@ -1,19 +1,21 @@
 language: php
 
 php:
-  - 5.5.9
-  - 5.5
+  - 7.0
   - 5.6
+  - 5.5
+  - 5.5.9
   - hhvm
 
 sudo: false
 
-install: travis_retry composer install --no-interaction --ignore-platform-reqs --no-scripts --prefer-source
+install:
+  - travis_retry composer install --no-interaction --no-scripts --prefer-source
 
 script:
-  - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then vendor/bin/phpunit; fi;'
-  - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi;'
+  - if [ "$TRAVIS_PHP_VERSION" != "5.5.9" ] && [ "$TRAVIS_PHP_VERSION" != "5.5" ] && [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then vendor/bin/phpunit; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
 
 after_script:
-  - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
-  - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi;'
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi

CONTRIBUTING.md

@@ -59,7 +59,7 @@ class Foo extends Bar
 
 If you're still unsure, then take a look at existing code.
 
-## Introduction into to Git and GitHub
+## Introduction into Git and GitHub
 
 If you are new to Git, GitHub and the whole open source software community, welcome! Here are some resources for getting started and understanding what it's all about.
 

README.md

@@ -21,6 +21,10 @@
 - Subscriber notifications via Email
 - Two factor authentication, with Google Authenticator
 
+## Usage in production
+
+The `master` branch of this repository is a development branch and **should not** be used in production. Instead, please check out the latest tag release.
+
 ## Requirements
 
 - PHP 5.5.9+ or newer
@@ -28,7 +32,7 @@
 
 ### Development Requirements
 
-Theses extra dependencies are required to develop Cachet:
+These extra dependencies are required to develop Cachet:
 
 - Node.js
 - Bower
@@ -54,3 +58,7 @@ The demo is reset every half hour.
 ## Translations
 
 A special thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world. If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).
+
+## Security Vulnerabilities
+
+If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. All security vulnerabilities will be promptly addressed.

VERSION

@@ -0,0 +1 @@
+2.0.5-dev

app/Commands/Component/AddComponentCommand.php

@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Component;
+
+final class AddComponentCommand
+{
+    /**
+     * The component name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The component description.
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * The component status.
+     *
+     * @var int
+     */
+    public $status;
+
+    /**
+     * The component link.
+     *
+     * @var string
+     */
+    public $link;
+
+    /**
+     * The component order.
+     *
+     * @var int
+     */
+    public $order;
+
+    /**
+     * The component group.
+     *
+     * @var int
+     */
+    public $group_id;
+
+    /**
+     * Is the component enabled?
+     *
+     * @var bool
+     */
+    public $enabled;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'        => 'required|string',
+        'description' => 'string',
+        'status'      => 'int|min:1|max:4',
+        'link'        => 'url',
+        'order'       => 'int',
+        'group_id'    => 'int',
+        'enabled'     => 'bool',
+    ];
+
+    /**
+     * Create a new add component command instance.
+     *
+     * @param string $name
+     * @param string $description
+     * @param int    $status
+     * @param string $link
+     * @param int    $order
+     * @param int    $group_id
+     * @param bool   $enabled
+     *
+     * @return void
+     */
+    public function __construct($name, $description, $status, $link, $order, $group_id, $enabled)
+    {
+        $this->name = $name;
+        $this->description = $description;
+        $this->status = (int) $status;
+        $this->link = $link;
+        $this->order = $order;
+        $this->group_id = $group_id;
+        $this->enabled = $enabled;
+    }
+}

app/Commands/Component/RemoveComponentCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+final class RemoveComponentCommand
+{
+    /**
+     * The component to remove.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new remove component command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Commands/Component/UpdateComponentCommand.php

@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+final class UpdateComponentCommand
+{
+    /**
+     * The component to update.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * The component name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The component description.
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * The component status.
+     *
+     * @var int
+     */
+    public $status;
+
+    /**
+     * The component link.
+     *
+     * @var string
+     */
+    public $link;
+
+    /**
+     * The component order.
+     *
+     * @var int
+     */
+    public $order;
+
+    /**
+     * The component group.
+     *
+     * @var int
+     */
+    public $group_id;
+
+    /**
+     * Is the component enabled?
+     *
+     * @var bool
+     */
+    public $enabled;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'        => 'string',
+        'description' => 'string',
+        'status'      => 'int|min:1|max:4',
+        'link'        => 'url',
+        'order'       => 'int',
+        'group_id'    => 'int',
+        'enabled'     => 'bool',
+    ];
+
+    /**
+     * Create a new update component command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     * @param string                            $name
+     * @param string                            $description
+     * @param int                               $status
+     * @param string                            $link
+     * @param int                               $order
+     * @param int                               $group_id
+     * @param bool                              $enabled
+     *
+     * @return void
+     */
+    public function __construct(Component $component, $name, $description, $status, $link, $order, $group_id, $enabled)
+    {
+        $this->component = $component;
+        $this->name = $name;
+        $this->description = $description;
+        $this->status = (int) $status;
+        $this->link = $link;
+        $this->order = $order;
+        $this->group_id = $group_id;
+        $this->enabled = $enabled;
+    }
+}

app/Commands/ComponentGroup/AddComponentGroupCommand.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\ComponentGroup;
+
+final class AddComponentGroupCommand
+{
+    /**
+     * The component group name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The component group description.
+     *
+     * @var int
+     */
+    public $order;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'  => 'required|string',
+        'order' => 'int',
+    ];
+
+    /**
+     * Create a add component group command instance.
+     *
+     * @param string $name
+     * @param int    $order
+     *
+     * @return void
+     */
+    public function __construct($name, $order)
+    {
+        $this->name = $name;
+        $this->order = (int) $order;
+    }
+}

app/Commands/ComponentGroup/RemoveComponentGroupCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+final class RemoveComponentGroupCommand
+{
+    /**
+     * The component group to remove.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new remove component group command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Commands/ComponentGroup/UpdateComponentGroupCommand.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+final class UpdateComponentGroupCommand
+{
+    /**
+     * The component group.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * The component group name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The component group description.
+     *
+     * @var int
+     */
+    public $order;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'  => 'string',
+        'order' => 'int',
+    ];
+
+    /**
+     * Create a add component group command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     * @param string                                 $name
+     * @param int                                    $order
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group, $name, $order)
+    {
+        $this->group = $group;
+        $this->name = $name;
+        $this->order = (int) $order;
+    }
+}

app/Commands/Incident/RemoveIncidentCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Incident;
+
+use CachetHQ\Cachet\Models\Incident;
+
+final class RemoveIncidentCommand
+{
+    /**
+     * The incident to remove.
+     *
+     * @var \CachetHQ\Cachet\Models\Incident
+     */
+    public $incident;
+
+    /**
+     * Create a new remove incident command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Incident $incident
+     *
+     * @return void
+     */
+    public function __construct(Incident $incident)
+    {
+        $this->incident = $incident;
+    }
+}

app/Commands/Incident/ReportIncidentCommand.php

@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Incident;
+
+final class ReportIncidentCommand
+{
+    /**
+     * The incident name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The incident status.
+     *
+     * @var int
+     */
+    public $status;
+
+    /**
+     * The incident message.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * The incident visibility.
+     *
+     * @var int
+     */
+    public $visible;
+
+    /**
+     * The incident component.
+     *
+     * @var int
+     */
+    public $component_id;
+
+    /**
+     * The component status.
+     *
+     * @var int
+     */
+    public $component_status;
+
+    /**
+     * Whether to notify about the incident or not.
+     *
+     * @var bool
+     */
+    public $notify;
+
+    /**
+     * The date at which the incident occurred.
+     *
+     * @var string|null
+     */
+    public $incident_date;
+
+    /**
+     * A given incident template.
+     *
+     * @var string|null
+     */
+    public $template;
+
+    /**
+     * Variables for the incident template.
+     *
+     * @var string[]|null
+     */
+    public $template_vars;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'             => 'required|string',
+        'status'           => 'required|int|min:0|max:4',
+        'message'          => 'string',
+        'visible'          => 'bool',
+        'component_id'     => 'int',
+        'component_status' => 'int|min:1|max:4|required_with:component_id',
+        'notify'           => 'bool',
+        'incident_date'    => 'string',
+        'template'         => 'string',
+    ];
+
+    /**
+     * Create a new report incident command instance.
+     *
+     * @param string      $name
+     * @param int         $status
+     * @param string      $message
+     * @param int         $visible
+     * @param int         $component_id
+     * @param int         $component_status
+     * @param bool        $notify
+     * @param string|null $incident_date
+     * @param string|null $template
+     * @param array|null  $template_vars
+     *
+     * @return void
+     */
+    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $incident_date, $template, $template_vars)
+    {
+        $this->name = $name;
+        $this->status = $status;
+        $this->message = $message;
+        $this->visible = $visible;
+        $this->component_id = $component_id;
+        $this->component_status = $component_status;
+        $this->notify = $notify;
+        $this->incident_date = $incident_date;
+        $this->template = $template;
+        $this->template_vars = $template_vars;
+    }
+}

app/Commands/Incident/ReportMaintenanceCommand.php

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Incident;
+
+final class ReportMaintenanceCommand
+{
+    /**
+     * The maintenance name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The maintenance message.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * Whether to notify about the maintenance or not.
+     *
+     * @var bool
+     */
+    public $notify;
+
+    /**
+     * Timestamp of when the maintenance is due to start.
+     *
+     * @var string
+     */
+    public $timestamp;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'      => 'required|string',
+        'message'   => 'string',
+        'notify'    => 'bool',
+        'timestamp' => 'string',
+    ];
+
+    /**
+     * Create a new report maintenance command instance.
+     *
+     * @param string $name
+     * @param string $message
+     * @param bool   $notify
+     * @param string $timestamp
+     *
+     * @return void
+     */
+    public function __construct($name, $message, $notify, $timestamp)
+    {
+        $this->name = $name;
+        $this->message = $message;
+        $this->notify = $notify;
+        $this->timestamp = $timestamp;
+    }
+}

app/Commands/Incident/UpdateIncidentCommand.php

@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Incident;
+
+use CachetHQ\Cachet\Models\Incident;
+
+final class UpdateIncidentCommand
+{
+    /**
+     * The incident to update.
+     *
+     * @var \CachetHQ\Cachet\Models\Incident
+     */
+    public $incident;
+
+    /**
+     * The incident name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The incident status.
+     *
+     * @var int
+     */
+    public $status;
+
+    /**
+     * The incident message.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * The incident visibility.
+     *
+     * @var int
+     */
+    public $visible;
+
+    /**
+     * The incident component.
+     *
+     * @var int
+     */
+    public $component_id;
+
+    /**
+     * The component status.
+     *
+     * @var int
+     */
+    public $component_status;
+
+    /**
+     * Whether to notify about the incident or not.
+     *
+     * @var bool
+     */
+    public $notify;
+
+    /**
+     * The date that the incident occurred on.
+     *
+     * @var string
+     */
+    public $incident_date;
+
+    /**
+     * A given incident template.
+     *
+     * @var string|null
+     */
+    public $template;
+
+    /**
+     * Variables for the incident template.
+     *
+     * @var string[]|null
+     */
+    public $template_vars;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'             => 'string',
+        'status'           => 'int|min:0|max:4',
+        'message'          => 'string',
+        'visible'          => 'bool',
+        'component_id'     => 'int',
+        'component_status' => 'int|min:1|max:4|required_with:component_id',
+        'notify'           => 'bool',
+        'template'         => 'string',
+    ];
+
+    /**
+     * Create a new update incident command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Incident $name
+     * @param string                           $name
+     * @param int                              $status
+     * @param string                           $message
+     * @param int                              $visible
+     * @param int                              $component_id
+     * @param int                              $component_status
+     * @param bool                             $notify
+     * @param string|null                      $incident_date
+     * @param string|null                      $template
+     * @param array|null                       $template_vars
+     *
+     * @return void
+     */
+    public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $incident_date, $template, $template_vars)
+    {
+        $this->incident = $incident;
+        $this->name = $name;
+        $this->status = $status;
+        $this->message = $message;
+        $this->visible = $visible;
+        $this->component_id = $component_id;
+        $this->component_status = $component_status;
+        $this->notify = $notify;
+        $this->incident_date = $incident_date;
+        $this->template = $template;
+        $this->template_vars = $template_vars;
+    }
+}

app/Commands/Invite/ClaimInviteCommand.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Invite;
+
+final class ClaimInviteCommand
+{
+    /**
+     * The invte to mark as claimed.
+     *
+     * @var \CachetHQ\Cachet\Model\Invite
+     */
+    public $invite;
+
+    /**
+     * Create a new claim invite command instance.
+     *
+     * @param \CachetHQ\Cachet\Model\Invite $invite
+     *
+     * @return void
+     */
+    public function __construct($invite)
+    {
+        $this->invite = $invite;
+    }
+}

app/Commands/Metric/AddMetricCommand.php

@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Metric;
+
+final class AddMetricCommand
+{
+    /**
+     * The metric name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The metric suffix.
+     *
+     * @var string
+     */
+    public $suffix;
+
+    /**
+     * The metric description.
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * The metric default value.
+     *
+     * @var float
+     */
+    public $default_value;
+
+    /**
+     * The metric calculation type.
+     *
+     * @var int
+     */
+    public $calc_type;
+
+    /**
+     * The metric display chart.
+     *
+     * @var int
+     */
+    public $display_chart;
+
+    /**
+     * The metric decimal places.
+     *
+     * @var int
+     */
+    public $places;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'          => 'required|string',
+        'suffix'        => 'required|string',
+        'description'   => 'string',
+        'display_chart' => 'bool',
+        'default_value' => 'int',
+        'calc_type'     => 'int',
+        'display_chart' => 'int',
+        'places'        => 'int|between:0,4',
+    ];
+
+    /**
+     * Create a new add metric command instance.
+     *
+     * @param string $name
+     * @param string $suffix
+     * @param string $description
+     * @param float  $default_value
+     * @param int    $calc_type
+     * @param int    $display_chart
+     * @param int    $places
+     *
+     * @return void
+     */
+    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places)
+    {
+        $this->name = $name;
+        $this->suffix = $suffix;
+        $this->description = $description;
+        $this->default_value = $default_value;
+        $this->calc_type = $calc_type;
+        $this->display_chart = $display_chart;
+        $this->places = $places;
+    }
+}

app/Commands/Metric/AddMetricPointCommand.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+final class AddMetricPointCommand
+{
+    /**
+     * The metric to add.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * The metric point value.
+     *
+     * @var int
+     */
+    public $value;
+
+    /**
+     * The metric point created at.
+     *
+     * @var string
+     */
+    public $created_at;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'value'      => 'int',
+        'created_at' => 'string',
+    ];
+
+    /**
+     * Create a new add metric point command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     * @param int                            $value
+     * @param string                         $created_at
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric, $value, $created_at)
+    {
+        $this->metric = $metric;
+        $this->value = $value;
+        $this->created_at = $created_at;
+    }
+}

app/Commands/Metric/RemoveMetricCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+final class RemoveMetricCommand
+{
+    /**
+     * The metric to remove.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * Create a new remove metric command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Commands/Metric/RemoveMetricPointCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+final class RemoveMetricPointCommand
+{
+    /**
+     * The metric point to remove.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metricPoint;
+
+    /**
+     * Create a new remove metric point command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $metricPoint
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $metricPoint)
+    {
+        $this->metricPoint = $metricPoint;
+    }
+}

app/Commands/Metric/UpdateMetricCommand.php

@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+final class UpdateMetricCommand
+{
+    /**
+     * The metric.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * The metric name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The metric suffix.
+     *
+     * @var string
+     */
+    public $suffix;
+
+    /**
+     * The metric description.
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * The metric default value.
+     *
+     * @var float
+     */
+    public $default_value;
+
+    /**
+     * The metric calculation type.
+     *
+     * @var int
+     */
+    public $calc_type;
+
+    /**
+     * The metric display chart.
+     *
+     * @var int
+     */
+    public $display_chart;
+
+    /**
+     * The metric decimal places.
+     *
+     * @var int
+     */
+    public $places;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'          => 'string',
+        'suffix'        => 'string',
+        'description'   => 'string',
+        'display_chart' => 'bool',
+        'default_value' => 'numeric',
+        'calc_type'     => 'int|in:0,1',
+        'display_chart' => 'int',
+        'places'        => 'numeric|min:0|max:4',
+    ];
+
+    /**
+     * Create a new update metric command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     * @param string                         $name
+     * @param string                         $suffix
+     * @param string                         $description
+     * @param float                          $default_value
+     * @param int                            $calc_type
+     * @param int                            $display_chart
+     * @param int                            $places
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places)
+    {
+        $this->metric = $metric;
+        $this->name = $name;
+        $this->suffix = $suffix;
+        $this->description = $description;
+        $this->default_value = $default_value;
+        $this->calc_type = $calc_type;
+        $this->display_chart = $display_chart;
+        $this->places = $places;
+    }
+}

app/Commands/Metric/UpdateMetricPointCommand.php

@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+use CachetHQ\Cachet\Models\MetricPoint;
+
+final class UpdateMetricPointCommand
+{
+    /**
+     * The metric point.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $point;
+
+    /**
+     * The metric.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * The metric point value.
+     *
+     * @var int
+     */
+    public $value;
+
+    /**
+     * The metric point created at.
+     *
+     * @var string
+     */
+    public $created_at;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'value'      => 'int',
+        'created_at' => 'string',
+    ];
+
+    /**
+     * Create a new update metric point command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $point
+     * @param \CachetHQ\Cachet\Models\Metric      $metric
+     * @param int                                 $value
+     * @param string                              $created_at
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $point, Metric $metric, $value, $created_at)
+    {
+        $this->point = $point;
+        $this->metric = $metric;
+        $this->value = $value;
+        $this->created_at = $created_at;
+    }
+}

app/Commands/Subscriber/SubscribeSubscriberCommand.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Subscriber;
+
+final class SubscribeSubscriberCommand
+{
+    /**
+     * The subscriber email.
+     *
+     * @var string
+     */
+    public $email;
+
+    /**
+     * The subscriber auto verification.
+     *
+     * @var bool
+     */
+    public $verified;
+
+    /**
+     * The validation rules.
+     *
+     * @var array
+     */
+    public $rules = [
+        'email' => 'required|email',
+    ];
+
+    /**
+     * Create a new subscribe subscriber command instance.
+     *
+     * @param string $email
+     * @param bool   $verified
+     *
+     * @return void
+     */
+    public function __construct($email, $verified = false)
+    {
+        $this->email = $email;
+        $this->verified = $verified;
+    }
+}

app/Commands/Subscriber/UnsubscribeSubscriberCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+final class UnsubscribeSubscriberCommand
+{
+    /**
+     * The subscriber to unsubscribe.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a unsubscribe subscriber command instance.
+     *
+     * @param string $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Commands/Subscriber/VerifySubscriberCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+final class VerifySubscriberCommand
+{
+    /**
+     * The subscriber to verify.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a verify subscriber command instance.
+     *
+     * @param string $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Commands/User/AddTeamMemberCommand.php

@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\User;
+
+final class AddTeamMemberCommand
+{
+    /**
+     * The user username.
+     *
+     * @var string
+     */
+    public $username;
+
+    /**
+     * The user password.
+     *
+     * @var string
+     */
+    public $password;
+
+    /**
+     * The user email.
+     *
+     * @var string
+     */
+    public $email;
+
+    /**
+     * The user level.
+     *
+     * @var int
+     */
+    public $level;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'     => 'required|string',
+        'password' => 'string',
+        'level'    => 'int',
+    ];
+
+    /**
+     * Create a new add team member command instance.
+     *
+     * @param string $username
+     * @param string $password
+     * @param string $email
+     * @param int    $level
+     *
+     * @return void
+     */
+    public function __construct($username, $password, $email, $level)
+    {
+        $this->username = $username;
+        $this->password = $password;
+        $this->email = $email;
+        $this->level = $level;
+    }
+}

app/Commands/User/GenerateApiTokenCommand.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\User;
+
+final class GenerateApiTokenCommand
+{
+    /**
+     * The user to generate the token.
+     *
+     * @var \CachetHQ\Cachet\Models\User
+     */
+    public $user;
+
+    /**
+     * Create a new generate api token command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
+     * @return void
+     */
+    public function __construct($user)
+    {
+        $this->user = $user;
+    }
+}

app/Commands/User/InviteTeamMemberCommand.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\User;
+
+final class InviteTeamMemberCommand
+{
+    /**
+     * The invte emails.
+     *
+     * @var string[]
+     */
+    public $emails;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'emails' => 'required|array|email',
+    ];
+
+    /**
+     * Create a new invite team member command instance.
+     *
+     * @param array $email
+     *
+     * @return void
+     */
+    public function __construct($emails)
+    {
+        $this->emails = $emails;
+    }
+}

app/Commands/User/RemoveUserCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\User;
+
+use CachetHQ\Cachet\Models\User;
+
+final class RemoveUserCommand
+{
+    /**
+     * The user to remove.
+     *
+     * @var \CachetHQ\Cachet\Models\User
+     */
+    public $user;
+
+    /**
+     * Create a new remove user command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Commands/User/SignupUserCommand.php

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Commands\User;
+
+final class SignupUserCommand
+{
+    /**
+     * The user username.
+     *
+     * @var string
+     */
+    public $username;
+
+    /**
+     * The user password.
+     *
+     * @var string
+     */
+    public $password;
+
+    /**
+     * The user email.
+     *
+     * @var string
+     */
+    public $email;
+
+    /**
+     * The user level.
+     *
+     * @var int
+     */
+    public $level;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'username' => 'required|string',
+        'password' => 'string',
+        'email'    => 'required|string|email',
+        'level'    => 'int',
+    ];
+
+    /**
+     * Create a new signup user command instance.
+     *
+     * @param string $username
+     * @param string $password
+     * @param string $email
+     * @param int    $level
+     *
+     * @return void
+     */
+    public function __construct($username, $password, $email, $level)
+    {
+        $this->username = $username;
+        $this->password = $password;
+        $this->email = $email;
+        $this->level = $level;
+    }
+}

app/Composers/AppComposer.php

@@ -12,7 +12,9 @@
 namespace CachetHQ\Cachet\Composers;
 
 use CachetHQ\Cachet\Facades\Setting;
+use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Config;
 
 class AppComposer
 {
@@ -20,17 +22,25 @@ class AppComposer
      * Index page view composer.
      *
      * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
      */
     public function compose(View $view)
     {
-        $isEnabled = (bool) Setting::get('enable_subscribers', false);
-        $mailAddress = env('MAIL_ADDRESS', false);
-        $mailFrom = env('MAIL_NAME', false);
-
-        $withData = [
-            'subscribersEnabled' => $isEnabled && $mailAddress && $mailFrom,
-        ];
-
-        $view->with($withData);
+        $view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
+        $view->withAppAnalytics(Setting::get('app_analytics'));
+        $view->withAppAnalyticsGoSquared(Setting::get('app_analytics_gs'));
+        $view->withAppAnalyticsPiwikUrl(Setting::get('app_analytics_piwik_url'));
+        $view->withAppAnalyticsPiwikSiteId(Setting::get('app_analytics_piwik_siteid'));
+        $view->withAppBanner(Setting::get('app_banner'));
+        $view->withAppBannerStyleFullWidth(Setting::get('style_fullwidth_header'));
+        $view->withAppBannerType(Setting::get('app_banner_type'));
+        $view->withAppDomain(Setting::get('app_domain'));
+        $view->withAppGraphs(Setting::get('display_graphs'));
+        $view->withAppLocale(Setting::get('app_locale'));
+        $view->withAppName(Setting::get('app_name'));
+        $view->withAppStylesheet(Setting::get('stylesheet'));
+        $view->withAppUrl(Config::get('app.url'));
+        $view->withShowSupport(Setting::get('show_support'));
     }
 }

app/Composers/CurrentUserComposer.php

@@ -14,15 +14,17 @@ namespace CachetHQ\Cachet\Composers;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 
-class LoggedUserComposer
+class CurrentUserComposer
 {
     /**
      * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
      */
     public function compose(View $view)
     {
-        $view->with('loggedUser', Auth::user());
+        $view->withCurrentUser(Auth::user());
     }
 }

app/Composers/DashboardComposer.php

@@ -21,10 +21,12 @@ class DashboardComposer
      * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
      */
     public function compose(View $view)
     {
-        $view->with('incidentCount', Incident::notScheduled()->count());
-        $view->with('componentCount', Component::all()->count());
+        $view->withIncidentCount(Incident::notScheduled()->count());
+        $view->withComponentCount(Component::all()->count());
     }
 }

app/Composers/MetricsComposer.php

@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Composers;
+
+use CachetHQ\Cachet\Facades\Setting;
+use CachetHQ\Cachet\Models\Metric;
+use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
+use Illuminate\Contracts\View\View;
+
+class MetricsComposer
+{
+    /**
+     * @var \CachetHQ\Cachet\Repositories\Metric\MetricRepository
+     */
+    protected $metricRepository;
+
+    /**
+     * Construct a new home controller instance.
+     *
+     * @param \CachetHQ\Cachet\Repositories\Metric\MetricRepository $metricRepository
+     *
+     * @return void
+     */
+    public function __construct(MetricRepository $metricRepository)
+    {
+        $this->metricRepository = $metricRepository;
+    }
+
+    /**
+     * Metrics view composer.
+     *
+     * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
+     */
+    public function compose(View $view)
+    {
+        $metrics = null;
+        $metricData = [];
+        if ($displayMetrics = Setting::get('display_graphs')) {
+            $metrics = Metric::where('display_chart', 1)->get();
+
+            $metrics->map(function ($metric) use (&$metricData) {
+                $metricData[$metric->id] = [
+                    'today' => $this->metricRepository->listPointsToday($metric),
+                    'week'  => $this->metricRepository->listPointsForWeek($metric),
+                    'month' => $this->metricRepository->listPointsForMonth($metric),
+                ];
+            });
+        }
+
+        $view->withDisplayMetrics($displayMetrics)
+            ->withMetrics($metrics)
+            ->withMetricData($metricData);
+    }
+}

app/Composers/StatusPageComposer.php

@@ -12,26 +12,29 @@
 namespace CachetHQ\Cachet\Composers;
 
 use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
 use Illuminate\Contracts\View\View;
 
-class IndexComposer
+class StatusPageComposer
 {
     /**
      * Index page view composer.
      *
      * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
      */
     public function compose(View $view)
     {
         // Default data
         $withData = [
-            'systemStatus'  => 'danger',
+            'systemStatus'  => 'info',
             'systemMessage' => trans('cachet.service.bad'),
             'favicon'       => 'favicon-high-alert',
         ];
 
-        if (Component::notStatus(1)->count() === 0) {
+        if (Component::enabled()->notStatus(1)->count() === 0) {
             // If all our components are ok, do we have any non-fixed incidents?
             $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get();
             $incidentCount = $incidents->count();
@@ -44,11 +47,22 @@ class IndexComposer
                 ];
             }
         } else {
-            if (Component::whereIn('status', [2, 3])->count() > 0) {
+            if (Component::enabled()->whereIn('status', [2, 3])->count() > 0) {
                 $withData['favicon'] = 'favicon-medium-alert';
             }
         }
 
-        $view->with($withData);
+        // Scheduled maintenance code.
+        $scheduledMaintenance = Incident::scheduled()->orderBy('scheduled_at')->get();
+
+        // Component & Component Group lists.
+        $usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->lists('group_id');
+        $componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
+        $ungroupedComponents = Component::enabled()->where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();
+
+        $view->with($withData)
+            ->withComponentGroups($componentGroups)
+            ->withUngroupedComponents($ungroupedComponents)
+            ->withScheduledMaintenance($scheduledMaintenance);
     }
 }

app/Composers/ThemeComposer.php

@@ -20,18 +20,23 @@ class ThemeComposer
      * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
      */
     public function compose(View $view)
     {
-        $view->with('themeBackgroundColor', Setting::get('style_background_color'));
-        $view->with('themeTextColor', Setting::get('style_text_color'));
-
-        $viewData = $view->getData();
-        $themeView = array_only($viewData, preg_grep('/^theme/', array_keys($viewData)));
-        $hasThemeSettings = array_filter($themeView, function ($data) {
-            return $data != null;
-        });
-
-        $view->with('themeSetup', !empty($hasThemeSettings));
+        // Theme colors.
+        $view->withThemeBackgroundColor(Setting::get('style_background_color', '#F0F3F4'));
+        $view->withThemeBackgroundFills(Setting::get('style_background_fills', '#FFFFFF'));
+        $view->withThemeBannerBackgroundColor(Setting::get('style_banner_background_color', ''));
+        $view->withThemeBannerPadding(Setting::get('style_banner_padding', '40px 0'));
+        $view->withThemeTextColor(Setting::get('style_text_color', '#333333'));
+        $view->withThemeReds(Setting::get('style_reds', '#ff6f6f'));
+        $view->withThemeBlues(Setting::get('style_blues', '#3498db'));
+        $view->withThemeGreens(Setting::get('style_greens', '#7ED321'));
+        $view->withThemeYellows(Setting::get('style_yellows', '#F7CA18'));
+        $view->withThemeOranges(Setting::get('style_oranges', '#FF8800'));
+        $view->withThemeMetrics(Setting::get('style_metrics', '#0dccc0'));
+        $view->withThemeLinks(Setting::get('style_links', '#7ED321'));
     }
 }

app/Composers/TimezoneLocaleComposer.php

@@ -22,6 +22,8 @@ class TimezoneLocaleComposer
      * Timezones and Locales composer.
      *
      * @param \Illuminate\Contracts\View\View $view
+     *
+     * @return void
      */
     public function compose(View $view)
     {
@@ -45,6 +47,7 @@ class TimezoneLocaleComposer
             'Europe'     => DateTimeZone::EUROPE,
             'Indian'     => DateTimeZone::INDIAN,
             'Pacific'    => DateTimeZone::PACIFIC,
+            'UTC'        => DateTimeZone::UTC,
         ];
 
         $timezones = [];
@@ -65,9 +68,7 @@ class TimezoneLocaleComposer
             }
         }
 
-        $view->with([
-            'timezones' => $timezones,
-            'langs'     => $langs,
-        ]);
+        $view->withTimezones($timezones);
+        $view->withLangs($langs);
     }
 }

app/Config/Repository.php

@@ -33,6 +33,8 @@ class Repository
      * Create a new settings service instance.
      *
      * @param \CachetHQ\Cachet\Models\Setting $model
+     *
+     * @return void
      */
     public function __construct(Setting $model)
     {
@@ -44,11 +46,10 @@ class Repository
      *
      * @param string      $name
      * @param string|null $default
-     * @param bool        $checkEnv
      *
      * @return string|null
      */
-    public function get($name, $default = null, $checkEnv = true)
+    public function get($name, $default = null)
     {
         // if we've not loaded the settings, load them now
         if (!$this->settings) {
@@ -60,13 +61,6 @@ class Repository
             return $this->settings[$name];
         }
 
-        // fallback to getenv if allowed to
-        if ($checkEnv) {
-            if ($this->settings[$name] = env(strtoupper($name))) {
-                return $this->settings[$name];
-            }
-        }
-
         return $default;
     }
 
@@ -75,6 +69,8 @@ class Repository
      *
      * @param string $name
      * @param string $value
+     *
+     * @return void
      */
     public function set($name, $value)
     {

app/Console/Commands/DemoMetricPointSeederCommand.php

@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Console\Commands;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+use DateInterval;
+use DateTime;
+use Illuminate\Console\Command;
+use Illuminate\Console\ConfirmableTrait;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * This is the demo seeder of metric points command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class DemoMetricPointSeederCommand extends Command
+{
+    use ConfirmableTrait;
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'cachet:metrics';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Seeds the demo Cachet metric with points.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        if (!$this->confirmToProceed()) {
+            return;
+        }
+
+        $this->seedMetricPoints();
+
+        $this->info('Demo metric seeded with demo data successfully!');
+    }
+
+    /**
+     * Seed the metric points table.
+     *
+     * @return void
+     */
+    protected function seedMetricPoints()
+    {
+        MetricPoint::truncate();
+
+        // Generate 11 hours of metric points
+        for ($i = 0; $i < 11; $i++) {
+            $metricTime = (new DateTime())->sub(new DateInterval('PT'.$i.'H'));
+
+            MetricPoint::create([
+                'metric_id'  => 1,
+                'value'      => random_int(1, 10),
+                'created_at' => $metricTime,
+                'updated_at' => $metricTime,
+            ]);
+        }
+    }
+
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+        ];
+    }
+}

app/Console/Commands/DemoSeederCommand.php

@@ -0,0 +1,343 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Console\Commands;
+
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\ComponentGroup;
+use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\Metric;
+use CachetHQ\Cachet\Models\MetricPoint;
+use CachetHQ\Cachet\Models\Setting;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\User;
+use DateInterval;
+use DateTime;
+use Illuminate\Console\Command;
+use Illuminate\Console\ConfirmableTrait;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * This is the demo seeder command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class DemoSeederCommand extends Command
+{
+    use ConfirmableTrait;
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'cachet:seed';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Seeds Cachet with demo data.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        if (!$this->confirmToProceed()) {
+            return;
+        }
+
+        $this->seedComponentGroups();
+        $this->seedComponents();
+        $this->seedIncidents();
+        $this->seedMetricPoints();
+        $this->seedMetrics();
+        $this->seedSettings();
+        $this->seedSubscribers();
+        $this->seedUsers();
+
+        $this->info('Database seeded with demo data successfully!');
+    }
+
+    /**
+     * Seed the component groups table.
+     *
+     * @return void
+     */
+    protected function seedComponentGroups()
+    {
+        $defaultGroups = [
+            [
+                'name'  => 'Websites',
+                'order' => 1,
+            ],
+        ];
+
+        ComponentGroup::truncate();
+
+        foreach ($defaultGroups as $group) {
+            ComponentGroup::create($group);
+        }
+    }
+
+    /**
+     * Seed the components table.
+     *
+     * @return void
+     */
+    protected function seedComponents()
+    {
+        $defaultComponents = [
+            [
+                'name'        => 'API',
+                'description' => 'Used by third-parties to connect to us',
+                'status'      => 1,
+                'order'       => 0,
+                'group_id'    => 0,
+                'link'        => '',
+            ], [
+                'name'        => 'Documentation',
+                'description' => 'Kindly powered by Readme.io',
+                'status'      => 1,
+                'order'       => 0,
+                'group_id'    => 1,
+                'link'        => 'https://docs.cachethq.io',
+            ], [
+                'name'        => 'Website',
+                'description' => '',
+                'status'      => 1,
+                'order'       => 0,
+                'group_id'    => 1,
+                'link'        => 'https://cachethq.io',
+            ], [
+                'name'        => 'Blog',
+                'description' => 'The Cachet Blog.',
+                'status'      => 1,
+                'order'       => 0,
+                'group_id'    => 1,
+                'link'        => 'https://blog.cachethq.io',
+            ],
+        ];
+
+        Component::truncate();
+
+        foreach ($defaultComponents as $component) {
+            Component::create($component);
+        }
+    }
+
+    /**
+     * Seed the incidents table.
+     *
+     * @return void
+     */
+    protected function seedIncidents()
+    {
+        $defaultIncidents = [
+            [
+                'name'         => 'Awesome',
+                'message'      => ':+1: We totally nailed the fix.',
+                'status'       => 4,
+                'component_id' => 0,
+                'scheduled_at' => null,
+                'visible'      => 1,
+            ],
+            [
+                'name'         => 'Monitoring the fix',
+                'message'      => ":ship: We've deployed a fix.",
+                'status'       => 3,
+                'component_id' => 0,
+                'scheduled_at' => null,
+                'visible'      => 1,
+            ],
+            [
+                'name'         => 'Update',
+                'message'      => "We've identified the problem. Our engineers are currently looking at it.",
+                'status'       => 2,
+                'component_id' => 0,
+                'scheduled_at' => null,
+                'visible'      => 1,
+            ],
+            [
+                'name'         => 'Test Incident',
+                'message'      => 'Something went wrong, with something or another.',
+                'status'       => 1,
+                'component_id' => 0,
+                'scheduled_at' => null,
+                'visible'      => 1,
+            ],
+            [
+                'name'         => 'Investigating the API',
+                'message'      => ':zap: We\'ve seen high response times from our API. It looks to be fixing itself as time goes on.',
+                'status'       => 1,
+                'component_id' => 1,
+                'scheduled_at' => null,
+                'visible'      => 1,
+            ],
+        ];
+
+        Incident::truncate();
+
+        foreach ($defaultIncidents as $incident) {
+            Incident::create($incident);
+        }
+    }
+
+    /**
+     * Seed the metric points table.
+     *
+     * @return void
+     */
+    protected function seedMetricPoints()
+    {
+        MetricPoint::truncate();
+
+        // Generate 11 hours of metric points
+        for ($i = 0; $i < 11; $i++) {
+            $metricTime = (new DateTime())->sub(new DateInterval('PT'.$i.'H'));
+
+            MetricPoint::create([
+                'metric_id'  => 1,
+                'value'      => random_int(1, 10),
+                'created_at' => $metricTime,
+                'updated_at' => $metricTime,
+            ]);
+        }
+    }
+
+    /**
+     * Seed the metrics table.
+     *
+     * @return void
+     */
+    protected function seedMetrics()
+    {
+        $defaultMetrics = [
+            [
+                'name'          => 'Cups of coffee',
+                'suffix'        => 'Cups',
+                'description'   => 'How many cups of coffee we\'ve drank.',
+                'default_value' => 0,
+                'calc_type'     => 1,
+                'display_chart' => 1,
+            ],
+        ];
+
+        Metric::truncate();
+
+        foreach ($defaultMetrics as $metric) {
+            Metric::create($metric);
+        }
+    }
+
+    /**
+     * Seed the settings table.
+     *
+     * @return void
+     */
+    protected function seedSettings()
+    {
+        $defaultSettings = [
+            [
+                'name'  => 'app_name',
+                'value' => 'Cachet Demo',
+            ],
+            [
+                'name'  => 'app_domain',
+                'value' => 'https://demo.cachethq.io',
+            ],
+            [
+                'name'  => 'show_support',
+                'value' => '1',
+            ],
+            [
+                'name'  => 'app_locale',
+                'value' => 'en',
+            ],
+            [
+                'name'  => 'app_timezone',
+                'value' => 'Europe/London',
+            ],
+            [
+                'name'  => 'app_incident_days',
+                'value' => '7',
+            ],
+            [
+                'name'  => 'app_analytics',
+                'value' => 'UA-58442674-3',
+            ],
+            [
+                'name'  => 'app_analytics_gs',
+                'value' => 'GSN-712462-P',
+            ],
+            [
+                'name'  => 'display_graphs',
+                'value' => '1',
+            ],
+        ];
+
+        Setting::truncate();
+
+        foreach ($defaultSettings as $setting) {
+            Setting::create($setting);
+        }
+    }
+
+    /**
+     * Seed the subscribers.
+     *
+     * @return void
+     */
+    protected function seedSubscribers()
+    {
+        Subscriber::truncate();
+    }
+
+    /**
+     * Seed the users table.
+     *
+     * @return void
+     */
+    protected function seedUsers()
+    {
+        $users = [
+            [
+                'username' => 'test',
+                'password' => 'test123',
+                'email'    => 'test@test.com',
+                'level'    => 1,
+                'api_key'  => '9yMHsdioQosnyVK4iCVR',
+            ],
+        ];
+
+        User::truncate();
+
+        foreach ($users as $user) {
+            User::create($user);
+        }
+    }
+
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+        ];
+    }
+}

app/Console/Commands/FixPermissionsCommand.php

@@ -1,111 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Console\Commands;
-
-use DirectoryIterator;
-use Illuminate\Console\Command;
-
-class FixPermissionsCommand extends Command
-{
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $name = 'cachet:chmod';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fixes file and directory permissions. Ensures SQLite database is writable.';
-
-    /**
-     * Path to the storage directory.
-     *
-     * @var string
-     */
-    protected $storageDirectory;
-
-    /**
-     * Path of the database directory.
-     *
-     * @var string
-     */
-    protected $databaseDirectory;
-
-    /**
-     * Path of the SQLite database file.
-     *
-     * @var string
-     */
-    protected $databasePath;
-
-    /**
-     * Which database connection are we using?
-     *
-     * @var string
-     */
-    protected $databaseDefault;
-
-    /**
-     * Create a new fix permissions command instance.
-     *
-     * @param string $storageDirectory
-     * @param string $databaseDirectory
-     * @param string $databasePath
-     * @param string $databaseDefault
-     */
-    public function __construct($storageDirectory, $databaseDirectory, $databasePath, $databaseDefault)
-    {
-        $this->storageDirectory = $storageDirectory;
-        $this->databaseDirectory = $databaseDirectory;
-        $this->databasePath = $databasePath;
-        $this->databaseDefault = $databaseDefault;
-
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     */
-    public function fire()
-    {
-        $this->recursiveChmod($this->storageDirectory);
-
-        if ($this->databaseDefault === 'sqlite') {
-            chmod($this->databaseDirectory, 755);
-            chmod($this->databasePath, 755);
-        }
-    }
-
-    /**
-     * Recursively sets a paths file permissions.
-     *
-     * @param string $path
-     * @param string $mode
-     */
-    protected function recursiveChmod($path, $mode = '0755')
-    {
-        $dir = new DirectoryIterator($path);
-        foreach ($dir as $item) {
-            if (!$item->isDot()) {
-                chmod($item->getPathname(), $mode);
-            }
-
-            if ($item->isDir() && !$item->isDot()) {
-                $this->recursiveChmod($item->getPathname());
-            }
-        }
-    }
-}

app/Console/Kernel.php

@@ -11,6 +11,8 @@
 
 namespace CachetHQ\Cachet\Console;
 
+use CachetHQ\Cachet\Console\Commands\DemoMetricPointSeederCommand;
+use CachetHQ\Cachet\Console\Commands\DemoSeederCommand;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -22,13 +24,16 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        'CachetHQ\Cachet\Console\Commands\FixPermissionsCommand',
+        DemoMetricPointSeederCommand::class,
+        DemoSeederCommand::class,
     ];
 
     /**
      * Define the application's command schedule.
      *
      * @param \Illuminate\Console\Scheduling\Schedule $schedule
+     *
+     * @return void
      */
     protected function schedule(Schedule $schedule)
     {

app/Dates/DateFactory.php

@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Dates;
+
+use Jenssegers\Date\Date;
+
+class DateFactory
+{
+    /**
+     * The application timezone.
+     *
+     * @var string
+     */
+    protected $appTimezone;
+
+    /**
+     * The cachet timezone.
+     *
+     * @var string
+     */
+    protected $cachetTimezone;
+
+    /**
+     * Create a new date factory instance.
+     *
+     * @param string $appTimezone
+     * @param string $cachetTimezone
+     *
+     * @return void
+     */
+    public function __construct($appTimezone, $cachetTimezone)
+    {
+        $this->appTimezone = $appTimezone;
+        $this->cachetTimezone = $cachetTimezone;
+    }
+
+    /**
+     * Create a Carbon instance from a specific format.
+     *
+     * @param string $format
+     * @param string $time
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return \Carbon\Carbon
+     */
+    public function create($format, $time)
+    {
+        return Date::createFromFormat($format, $time, $this->cachetTimezone)->setTimezone($this->appTimezone);
+    }
+
+    /**
+     * Create a Carbon instance from a specific format.
+     *
+     * We're also going to make sure the timezone information is correct.
+     *
+     * @param string $format
+     * @param string $time
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return \Carbon\Carbon
+     */
+    public function createNormalized($format, $time)
+    {
+        return $this->create($format, $time)->setTimezone($this->appTimezone);
+    }
+}

app/Events/Component/ComponentWasAddedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+class ComponentWasAddedEvent
+{
+    /**
+     * The component that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new component was added event instance.
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Events/Component/ComponentWasRemovedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+class ComponentWasRemovedEvent
+{
+    /**
+     * The component that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new component was removed event instance.
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Events/Component/ComponentWasUpdatedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+class ComponentWasUpdatedEvent
+{
+    /**
+     * The component that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new component was updated event instance.
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class ComponentGroupWasAddedEvent
+{
+    /**
+     * The component group that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new component group was added event instance.
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Events/ComponentGroup/ComponentGroupWasRemovedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class ComponentGroupWasRemovedEvent
+{
+    /**
+     * The component group that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new component group was removed event instance.
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class ComponentGroupWasUpdatedEvent
+{
+    /**
+     * The component group that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new component group was updated event instance.
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Events/Incident/IncidentWasRemovedEvent.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Incident;
+
+use CachetHQ\Cachet\Models\Incident;
+
+class IncidentWasRemovedEvent
+{
+    /**
+     * The incident that has been removed.
+     *
+     * @var \CachetHQ\Cachet\Models\Incident
+     */
+    public $incident;
+
+    /**
+     * Create a new incident was removed event instance.
+     */
+    public function __construct(Incident $incident)
+    {
+        $this->incident = $incident;
+    }
+}

app/Events/Incident/IncidentWasReportedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events;
+namespace CachetHQ\Cachet\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class IncidentHasReportedEvent
+class IncidentWasReportedEvent
 {
     /**
      * The incident that has been reported.
@@ -24,6 +24,8 @@ class IncidentHasReportedEvent
 
     /**
      * Create a new incident has reported event instance.
+     *
+     * @return void
      */
     public function __construct(Incident $incident)
     {

app/Events/Incident/IncidentWasUpdatedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Incident;
+
+use CachetHQ\Cachet\Models\Incident;
+
+class IncidentWasUpdatedEvent
+{
+    /**
+     * The incident that has been updated.
+     *
+     * @var \CachetHQ\Cachet\Models\Incident
+     */
+    public $incident;
+
+    /**
+     * Create a new incident has updated event instance.
+     *
+     * @return void
+     */
+    public function __construct(Incident $incident)
+    {
+        $this->incident = $incident;
+    }
+}

app/Events/Incident/MaintenanceWasScheduledEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events;
+namespace CachetHQ\Cachet\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class MaintenanceHasScheduledEvent
+class MaintenanceWasScheduledEvent
 {
     /**
      * The incident that has been reported.
@@ -24,6 +24,8 @@ class MaintenanceHasScheduledEvent
 
     /**
      * Create a new maintenance has scheduled event instance.
+     *
+     * @return void
      */
     public function __construct(Incident $incident)
     {

app/Events/Invite/InviteWasClaimed.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Invite;
+
+use CachetHQ\Cachet\Models\Invite;
+
+final class InviteWasClaimed
+{
+    /**
+     * The invite that has been claimed.
+     *
+     * @var \CachetHQ\Cachet\Models\Invite
+     */
+    public $invite;
+
+    /**
+     * Create a new invite was claimed event instance.
+     *
+     * @return void
+     */
+    public function __construct(Invite $invite)
+    {
+        $this->invite = $invite;
+    }
+}

app/Events/Metric/MetricPointWasAddedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+class MetricPointWasAddedEvent
+{
+    /**
+     * The metric point that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metric;
+
+    /**
+     * Create a new metric point was added event instance.
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Events/Metric/MetricPointWasRemovedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+class MetricPointWasRemovedEvent
+{
+    /**
+     * The metric point that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metricPoint;
+
+    /**
+     * Create a new metric point was removed event instance.
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $metricPoint)
+    {
+        $this->metricPoint = $metricPoint;
+    }
+}

app/Events/Metric/MetricPointWasUpdatedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+class MetricPointWasUpdatedEvent
+{
+    /**
+     * The metric point that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $point;
+
+    /**
+     * Create a new metric point was updated event instance.
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $point)
+    {
+        $this->point = $point;
+    }
+}

app/Events/Metric/MetricWasAddedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+class MetricWasAddedEvent
+{
+    /**
+     * The metric that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * Create a new metric was added event instance.
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Events/Metric/MetricWasRemovedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+class MetricWasRemovedEvent
+{
+    /**
+     * The metric that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * Create a new metric was removed event instance.
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Events/Metric/MetricWasUpdatedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+class MetricWasUpdatedEvent
+{
+    /**
+     * The metric that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metric;
+
+    /**
+     * Create a new metric was updated event instance.
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Events/Subscriber/SubscriberHasSubscribedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+class SubscriberHasSubscribedEvent
+{
+    /**
+     * The subscriber who has subscribed.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a new subscriber has subscribed event instance.
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+class SubscriberHasUnsubscribedEvent
+{
+    /**
+     * The subscriber who has unsubscribed.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a new subscriber has unsubscribed event instance.
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Events/Subscriber/SubscriberHasVerifiedEvent.php

@@ -9,21 +9,23 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events;
+namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class CustomerHasSubscribedEvent
+class SubscriberHasVerifiedEvent
 {
     /**
-     * The customer who has subscribed.
+     * The subscriber who has verified.
      *
      * @var \CachetHQ\Cachet\Models\Subscriber
      */
     public $subscriber;
 
     /**
-     * Create a new customer has subscribed event instance.
+     * Create a new subscriber has subscribed event instance.
+     *
+     * @return void
      */
     public function __construct(Subscriber $subscriber)
     {

app/Events/User/UserEventInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\User;
+
+interface UserEventInterface
+{
+    //
+}

app/Events/User/UserWasAddedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\User;
+
+use CachetHQ\Cachet\Models\User;
+
+final class UserWasAddedEvent implements UserEventInterface
+{
+    /**
+     * The user that has been added.
+     *
+     * @var \CachetHQ\Cachet\Models\User
+     */
+    public $user;
+
+    /**
+     * Create a new user was added event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Events/User/UserWasInvitedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\User;
+
+use CachetHQ\Cachet\Models\Invite;
+
+final class UserWasInvitedEvent
+{
+    /**
+     * The invite that has been added.
+     *
+     * @var \CachetHQ\Cachet\Models\Invite
+     */
+    public $invite;
+
+    /**
+     * Create a new user was invite event instance.
+     *
+     * @return void
+     */
+    public function __construct(Invite $invite)
+    {
+        $this->invite = $invite;
+    }
+}

app/Events/User/UserWasRemovedEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\User;
+
+use CachetHQ\Cachet\Models\User;
+
+final class UserWasRemovedEvent implements UserEventInterface
+{
+    /**
+     * The user that has been removed.
+     *
+     * @var \CachetHQ\Cachet\Models\User
+     */
+    public $user;
+
+    /**
+     * Create a new user was removed event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Exceptions/Displayers/JsonValidationDisplayer.php

@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Exceptions\Displayers;
+
+use AltThree\Validator\ValidationException;
+use Exception;
+use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use GrahamCampbell\Exceptions\Displayers\JsonDisplayer;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class JsonValidationDisplayer extends JsonDisplayer implements DisplayerInterface
+{
+    /**
+     * Get the error response associated with the given exception.
+     *
+     * @param \Exception $exception
+     * @param string     $id
+     * @param int        $code
+     * @param string[]   $headers
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function display(Exception $exception, $id, $code, array $headers)
+    {
+        $info = $this->info->generate($exception, $id, 400);
+
+        $error = ['id' => $id, 'status' => $info['code'], 'title' => $info['name'], 'detail' => $info['detail'], 'meta' => ['details' => $exception->getMessageBag()->all()]];
+
+        return new JsonResponse(['errors' => [$error]], 400, array_merge($headers, ['Content-Type' => $this->contentType()]));
+    }
+
+    /**
+     * Can we display the exception?
+     *
+     * @param \Exception $original
+     * @param \Exception $transformed
+     * @param int        $code
+     *
+     * @return bool
+     */
+    public function canDisplay(Exception $original, Exception $transformed, $code)
+    {
+        return $transformed instanceof ValidationException;
+    }
+}

app/Exceptions/Displayers/RedirectDisplayer.php

@@ -29,6 +29,8 @@ class RedirectDisplayer implements DisplayerInterface
      * Create a new redirect displayer instance.
      *
      * @param \Illuminate\Http\Request $request
+     *
+     * @return void
      */
     public function __construct(Request $request)
     {
@@ -65,10 +67,11 @@ class RedirectDisplayer implements DisplayerInterface
      *
      * @param \Exception $original
      * @param \Exception $transformed
+     * @param int        $code
      *
      * @return bool
      */
-    public function canDisplay(Exception $original, Exception $transformed)
+    public function canDisplay(Exception $original, Exception $transformed, $code)
     {
         $redirect = $transformed instanceof HttpExceptionInterface && $transformed->getStatusCode() === 401;
 

app/Exceptions/Filters/ApiFilter.php

@@ -27,6 +27,8 @@ class ApiFilter
      * Create a new api filter instance.
      *
      * @param \Illuminate\Http\Request $request
+     *
+     * @return void
      */
     public function __construct(Request $request)
     {
@@ -39,10 +41,11 @@ class ApiFilter
      * @param \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[] $displayers
      * @param \Exception                                                 $original
      * @param \Exception                                                 $transformed
+     * @param int                                                        $code
      *
      * @return \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[]
      */
-    public function filter(array $displayers, Exception $original, Exception $transformed)
+    public function filter(array $displayers, Exception $original, Exception $transformed, $code)
     {
         if ($this->request->is('api*')) {
             foreach ($displayers as $index => $displayer) {

app/Exceptions/Handler.php

@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Exceptions;
-
-use GrahamCampbell\Exceptions\ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class Handler extends ExceptionHandler
-{
-    /**
-     * A list of the exception types that should not be reported.
-     *
-     * @var string[]
-     */
-    protected $dontReport = [
-        NotFoundHttpException::class,
-    ];
-}

app/Handlers/Commands/Component/AddComponentCommandHandler.php

@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Component;
+
+use CachetHQ\Cachet\Commands\Component\AddComponentCommand;
+use CachetHQ\Cachet\Events\Component\ComponentWasAddedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class AddComponentCommandHandler
+{
+    /**
+     * Handle the add component command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Component\AddComponentCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Component
+     */
+    public function handle(AddComponentCommand $command)
+    {
+        $component = Component::create($this->filter($command));
+
+        event(new ComponentWasAddedEvent($component));
+
+        return $component;
+    }
+
+    /**
+     * Filter the command data.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\AddComponentCommand $command
+     *
+     * @return array
+     */
+    protected function filter(AddComponentCommand $command)
+    {
+        $params = [
+            'name'        => $command->name,
+            'description' => $command->description,
+            'link'        => $command->link,
+            'status'      => $command->status,
+            'enabled'     => $command->enabled,
+            'order'       => $command->order,
+            'group_id'    => $command->group_id,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
+}

app/Handlers/Commands/Component/RemoveComponentCommandHandler.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Component;
+
+use CachetHQ\Cachet\Commands\Component\RemoveComponentCommand;
+use CachetHQ\Cachet\Events\Component\ComponentWasRemovedEvent;
+
+class RemoveComponentCommandHandler
+{
+    /**
+     * Handle the remove component command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Component\RemoveComponentCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveComponentCommand $command)
+    {
+        $component = $command->component;
+
+        event(new ComponentWasRemovedEvent($component));
+
+        $component->delete();
+    }
+}

app/Handlers/Commands/Component/UpdateComponentCommandHandler.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Component;
+
+use CachetHQ\Cachet\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Events\Component\ComponentWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class UpdateComponentCommandHandler
+{
+    /**
+     * Handle the update component command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Component\UpdateComponentCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Component
+     */
+    public function handle(UpdateComponentCommand $command)
+    {
+        $component = $command->component;
+
+        $component->update($this->filter($command));
+
+        event(new ComponentWasUpdatedEvent($component));
+
+        return $component;
+    }
+
+    /**
+     * Filter the command data.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\UpdateComponentCommand $command
+     *
+     * @return array
+     */
+    protected function filter(UpdateComponentCommand $command)
+    {
+        $params = [
+            'name'        => $command->name,
+            'description' => $command->description,
+            'link'        => $command->link,
+            'status'      => $command->status,
+            'enabled'     => $command->enabled,
+            'order'       => $command->order,
+            'group_id'    => $command->group_id,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
+}

app/Handlers/Commands/ComponentGroup/AddComponentGroupCommandHandler.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Commands\ComponentGroup\AddComponentGroupCommand;
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasAddedEvent;
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class AddComponentGroupCommandHandler
+{
+    /**
+     * Handle the add component group command.
+     *
+     * @param \CachetHQ\Cachet\Commands\ComponentGroup\AddComponentGroupCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public function handle(AddComponentGroupCommand $command)
+    {
+        $group = ComponentGroup::create([
+            'name'  => $command->name,
+            'order' => $command->order,
+        ]);
+
+        event(new ComponentGroupWasAddedEvent($group));
+
+        return $group;
+    }
+}

app/Handlers/Commands/ComponentGroup/RemoveComponentGroupCommandHandler.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Commands\ComponentGroup\RemoveComponentGroupCommand;
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasRemovedEvent;
+
+class RemoveComponentGroupCommandHandler
+{
+    /**
+     * Handle the remove component group command.
+     *
+     * @param \CachetHQ\Cachet\Commands\ComponentGroup\RemoveComponentGroupCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveComponentGroupCommand $command)
+    {
+        $group = $command->group;
+
+        event(new ComponentGroupWasRemovedEvent($group));
+
+        // Remove the group id from all component.
+        $group->components->map(function ($component) {
+            $component->update(['group_id' => 0]);
+        });
+
+        $group->delete();
+    }
+}

app/Handlers/Commands/ComponentGroup/UpdateComponentGroupCommandHandler.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Commands\ComponentGroup\UpdateComponentGroupCommand;
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasUpdatedEvent;
+
+class UpdateComponentGroupCommandHandler
+{
+    /**
+     * Handle the update component group command.
+     *
+     * @param \CachetHQ\Cachet\Commands\ComponentGroup\UpdateComponentGroupCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public function handle(UpdateComponentGroupCommand $command)
+    {
+        $group = $command->group;
+        $group->update([
+            'name'  => $command->name,
+            'order' => $command->order,
+        ]);
+
+        event(new ComponentGroupWasUpdatedEvent($group));
+
+        return $group;
+    }
+}

app/Handlers/Commands/Incident/RemoveIncidentCommandHandler.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Commands\Incident\RemoveIncidentCommand;
+use CachetHQ\Cachet\Events\Incident\IncidentWasRemovedEvent;
+
+class RemoveIncidentCommandHandler
+{
+    /**
+     * Handle the remove incident command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\RemoveIncidentCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveIncidentCommand $command)
+    {
+        $incident = $command->incident;
+
+        event(new IncidentWasRemovedEvent($incident));
+
+        $incident->delete();
+    }
+}

app/Handlers/Commands/Incident/ReportIncidentCommandHandler.php

@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Commands\Incident\ReportIncidentCommand;
+use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\IncidentTemplate;
+use Twig_Loader_String;
+use TwigBridge\Facade\Twig;
+
+class ReportIncidentCommandHandler
+{
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new report incident command handler instance.
+     *
+     * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     *
+     * @return void
+     */
+    public function __construct(DateFactory $dates)
+    {
+        $this->dates = $dates;
+    }
+
+    /**
+     * Handle the report incident command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\ReportIncidentCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Incident
+     */
+    public function handle(ReportIncidentCommand $command)
+    {
+        if ($command->template) {
+            $command->message = $this->parseIncidentTemplate($command->template, $command->template_vars);
+        }
+
+        $data = [
+            'name'    => $command->name,
+            'status'  => $command->status,
+            'message' => $command->message,
+            'visible' => $command->visible,
+        ];
+
+        // Link with the component.
+        if ($command->component_id) {
+            $data['component_id'] = $command->component_id;
+        }
+
+        // The incident occurred at a different time.
+        if ($command->incident_date) {
+            $incidentDate = $this->dates->createNormalized('d/m/Y H:i', $command->incident_date);
+
+            $data['created_at'] = $incidentDate;
+            $data['updated_at'] = $incidentDate;
+        }
+
+        // Create the incident
+        $incident = Incident::create($data);
+
+        // Update the component.
+        if ($command->component_id) {
+            Component::find($command->component_id)->update([
+                'status' => $command->component_status,
+            ]);
+        }
+
+        $incident->notify = (bool) $command->notify;
+
+        event(new IncidentWasReportedEvent($incident));
+
+        return $incident;
+    }
+
+    /**
+     * Compiles an incident template into an incident message.
+     *
+     * @param string $templateSlug
+     * @param array  $vars
+     *
+     * @return string
+     */
+    protected function parseIncidentTemplate($templateSlug, $vars)
+    {
+        Twig::setLoader(new Twig_Loader_String());
+        $template = IncidentTemplate::forSlug($templateSlug)->first();
+
+        return Twig::render($template->template, $vars);
+    }
+}

app/Handlers/Commands/Incident/ReportMaintenanceCommandHandler.php

@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Commands\Incident\ReportMaintenanceCommand;
+use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Events\Incident\MaintenanceWasScheduledEvent;
+use CachetHQ\Cachet\Models\Incident;
+
+class ReportMaintenanceCommandHandler
+{
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new report maintanance command handler instance.
+     *
+     * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     *
+     * @return void
+     */
+    public function __construct(DateFactory $dates)
+    {
+        $this->dates = $dates;
+    }
+
+    /**
+     * Handle the report maintenance command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\ReportMaintenanceCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Incident
+     */
+    public function handle(ReportMaintenanceCommand $command)
+    {
+        $scheduledAt = $this->dates->createNormalized('d/m/Y H:i', $command->timestamp);
+
+        $maintenanceEvent = Incident::create([
+            'name'         => $command->name,
+            'message'      => $command->message,
+            'scheduled_at' => $scheduledAt,
+            'status'       => 0,
+            'visible'      => 1,
+        ]);
+
+        $maintenanceEvent->notify = (bool) $command->notify;
+
+        event(new MaintenanceWasScheduledEvent($maintenanceEvent));
+
+        return $maintenanceEvent;
+    }
+}

app/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php

@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand;
+use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Events\Incident\IncidentWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\IncidentTemplate;
+use Twig_Loader_String;
+use TwigBridge\Facade\Twig;
+
+class UpdateIncidentCommandHandler
+{
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new update incident command handler instance.
+     *
+     * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     *
+     * @return void
+     */
+    public function __construct(DateFactory $dates)
+    {
+        $this->dates = $dates;
+    }
+
+    /**
+     * Handle the update incident command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Incident
+     */
+    public function handle(UpdateIncidentCommand $command)
+    {
+        if ($command->template) {
+            $command->message = $this->parseIncidentTemplate($command->template, $command->template_vars);
+        }
+
+        $incident = $command->incident;
+        $incident->update($this->filter($command));
+
+        // The incident occurred at a different time.
+        if ($command->incident_date) {
+            $incidentDate = $this->dates->createNormalized('d/m/Y H:i', $command->incident_date);
+
+            $incident->update([
+                'created_at' => $incidentDate,
+                'updated_at' => $incidentDate,
+            ]);
+        }
+
+        // Update the component.
+        if ($command->component_id) {
+            Component::find($command->component_id)->update([
+                'status' => $command->component_status,
+            ]);
+        }
+
+        event(new IncidentWasUpdatedEvent($incident));
+
+        return $incident;
+    }
+
+    /**
+     * Filter the command data.
+     *
+     * @param \CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand $command
+     *
+     * @return array
+     */
+    protected function filter(UpdateIncidentCommand $command)
+    {
+        $params = [
+            'name'             => $command->name,
+            'status'           => $command->status,
+            'message'          => $command->message,
+            'visible'          => $command->visible,
+            'component_id'     => $command->component_id,
+            'component_status' => $command->component_status,
+            'notify'           => $command->notify,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
+
+    /**
+     * Compiles an incident template into an incident message.
+     *
+     * @param string $templateSlug
+     * @param array  $vars
+     *
+     * @return string
+     */
+    protected function parseIncidentTemplate($templateSlug, $vars)
+    {
+        Twig::setLoader(new Twig_Loader_String());
+        $template = IncidentTemplate::forSlug($templateSlug)->first();
+
+        return Twig::render($template->template, $vars);
+    }
+}

app/Handlers/Commands/Invite/ClaimInviteCommandHandler.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Invite;
+
+use CachetHQ\Cachet\Commands\Invite\ClaimInviteCommand;
+use CachetHQ\Cachet\Events\Invite\InviteWasClaimed;
+use Carbon\Carbon;
+
+class ClaimInviteCommandHandler
+{
+    /**
+     * Handle the claim invite command.
+     *
+     * @param \CachetHQ\Cachet\Commands\User\ClaimInviteCommand $command
+     *
+     * @return void
+     */
+    public function handle(ClaimInviteCommand $command)
+    {
+        $invite = $command->invite;
+
+        $invite->claimed_at = Carbon::now();
+        $invite->save();
+
+        event(new InviteWasClaimed($invite));
+    }
+}

app/Handlers/Commands/Metric/AddMetricCommandHandler.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Commands\Metric\AddMetricCommand;
+use CachetHQ\Cachet\Events\Metric\MetricWasAddedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class AddMetricCommandHandler
+{
+    /**
+     * Handle the add metric command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\AddMetricCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Metric
+     */
+    public function handle(AddMetricCommand $command)
+    {
+        $metric = Metric::create([
+            'name'          => $command->name,
+            'suffix'        => $command->suffix,
+            'description'   => $command->description,
+            'default_value' => $command->default_value,
+            'calc_type'     => $command->calc_type,
+            'display_chart' => $command->display_chart,
+            'places'        => $command->places,
+        ]);
+
+        event(new MetricWasAddedEvent($metric));
+
+        return $metric;
+    }
+}

app/Handlers/Commands/Metric/AddMetricPointCommandHandler.php

@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Commands\Metric\AddMetricPointCommand;
+use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Events\Metric\MetricPointWasAddedEvent;
+use CachetHQ\Cachet\Models\MetricPoint;
+
+class AddMetricPointCommandHandler
+{
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new add metric point command handler instance.
+     *
+     * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     *
+     * @return void
+     */
+    public function __construct(DateFactory $dates)
+    {
+        $this->dates = $dates;
+    }
+
+    /**
+     * Handle the add metric point command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\AddMetricPointCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public function handle(AddMetricPointCommand $command)
+    {
+        $metric = $command->metric;
+        $createdAt = $command->created_at;
+
+        $data = [
+            'metric_id' => $metric->id,
+            'value'     => $command->value,
+        ];
+
+        if ($createdAt) {
+            $data['created_at'] = $this->dates->create('U', $createdAt)->format('Y-m-d H:i:s');
+        }
+
+        $metricPoint = MetricPoint::create($data);
+
+        event(new MetricPointWasAddedEvent($metricPoint));
+
+        return $metricPoint;
+    }
+}

app/Handlers/Commands/Metric/RemoveMetricCommandHandler.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Commands\Metric\RemoveMetricCommand;
+use CachetHQ\Cachet\Events\Metric\MetricWasRemovedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class RemoveMetricCommandHandler
+{
+    /**
+     * Handle the remove metric command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\RemoveMetricCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveMetricCommand $command)
+    {
+        $metric = $command->metric;
+
+        event(new MetricWasRemovedEvent($metric));
+
+        $metric->delete();
+    }
+}

app/Handlers/Commands/Metric/RemoveMetricPointCommandHandler.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Commands\Metric\RemoveMetricPointCommand;
+use CachetHQ\Cachet\Events\Metric\MetricPointWasRemovedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class RemoveMetricPointCommandHandler
+{
+    /**
+     * Handle the remove metric point command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\RemoveMetricPointCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveMetricPointCommand $command)
+    {
+        $metricPoint = $command->metricPoint;
+
+        event(new MetricPointWasRemovedEvent($metricPoint));
+
+        $metricPoint->delete();
+    }
+}

app/Handlers/Commands/Metric/UpdateMetricCommandHandler.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand;
+use CachetHQ\Cachet\Events\Metric\MetricWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class UpdateMetricCommandHandler
+{
+    /**
+     * Handle the update metric command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Metric
+     */
+    public function handle(UpdateMetricCommand $command)
+    {
+        $metric = $command->metric;
+
+        $metric->update($this->filter($command));
+
+        event(new MetricWasUpdatedEvent($metric));
+
+        return $metric;
+    }
+
+    /**
+     * Filter the command data.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand $command
+     *
+     * @return array
+     */
+    protected function filter(UpdateMetricCommand $command)
+    {
+        $params = [
+            'name'          => $command->name,
+            'suffix'        => $command->suffix,
+            'description'   => $command->description,
+            'default_value' => $command->default_value,
+            'calc_type'     => $command->calc_type,
+            'display_chart' => $command->display_chart,
+            'places'        => $command->places,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
+}

app/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php

@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Commands\Metric\UpdateMetricPointCommand;
+use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Events\Metric\MetricPointWasUpdatedEvent;
+
+class UpdateMetricPointCommandHandler
+{
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new update metric point command handler instance.
+     *
+     * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     *
+     * @return void
+     */
+    public function __construct(DateFactory $dates)
+    {
+        $this->dates = $dates;
+    }
+
+    /**
+     * Handle the update metric point command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricPointCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public function handle(UpdateMetricPointCommand $command)
+    {
+        $point = $command->point;
+        $metric = $command->metric;
+        $createdAt = $command->created_at;
+
+        $data = [
+            'metric_id' => $metric->id,
+            'value'     => $command->value,
+        ];
+
+        if ($createdAt) {
+            $data['created_at'] = $this->dates->create('U', $createdAt)->format('Y-m-d H:i:s');
+        }
+
+        $point->update($data);
+
+        event(new MetricPointWasUpdatedEvent($point));
+
+        return $point;
+    }
+}

app/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Commands\Subscriber\SubscribeSubscriberCommand;
+use CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+
+class SubscribeSubscriberCommandHandler
+{
+    use DispatchesJobs;
+
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Subscriber\SubscribeSubscriberCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(SubscribeSubscriberCommand $command)
+    {
+        $subscriber = Subscriber::create(['email' => $command->email]);
+
+        if ($command->verified) {
+            $this->dispatch(new VerifySubscriberCommand($subscriber));
+        } else {
+            event(new SubscriberHasSubscribedEvent($subscriber));
+        }
+
+        return $subscriber;
+    }
+}

app/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Commands\Subscriber\UnsubscribeSubscriberCommand;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasUnsubscribedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+
+class UnsubscribeSubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe customer command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Subscriber\UnsubscribeSubscriberCommand $command
+     *
+     * @return void
+     */
+    public function handle(UnsubscribeSubscriberCommand $command)
+    {
+        $subscriber = $command->subscriber;
+
+        event(new SubscriberHasUnsubscribedEvent($subscriber));
+
+        $subscriber->delete();
+    }
+}

app/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasVerifiedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+use Carbon\Carbon;
+
+class VerifySubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe customer command.
+     *
+     * @param \CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand $command
+     *
+     * @return void
+     */
+    public function handle(VerifySubscriberCommand $command)
+    {
+        $subscriber = $command->subscriber;
+
+        $subscriber->verified_at = Carbon::now();
+        $subscriber->save();
+
+        event(new SubscriberHasVerifiedEvent($subscriber));
+    }
+}

app/Handlers/Commands/User/AddTeamMemberCommandHandler.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Commands\User\AddTeamMemberCommand;
+use CachetHQ\Cachet\Events\User\UserWasAddedEvent;
+use CachetHQ\Cachet\Models\User;
+
+class AddTeamMemberCommandHandler
+{
+    /**
+     * Handle the add team member command.
+     *
+     * @param \CachetHQ\Cachet\Commands\User\AddTeamMemberCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\User
+     */
+    public function handle(AddTeamMemberCommand $command)
+    {
+        $user = User::create([
+            'username' => $command->username,
+            'password' => $command->password,
+            'email'    => $command->email,
+            'level'    => $command->level,
+        ]);
+
+        event(new UserWasAddedEvent($user));
+
+        return $user;
+    }
+}

app/Handlers/Commands/User/GenerateApiTokenCommandHandler.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Commands\User\GenerateApiTokenCommand;
+use CachetHQ\Cachet\Models\User;
+
+class GenerateApiTokenCommandHandler
+{
+    /**
+     * Handle the generate api key command.
+     *
+     * @param \CachetHQ\Cachet\Commands\User\GenerateApiTokenCommand $command
+     *
+     * @return void
+     */
+    public function handle(GenerateApiTokenCommand $command)
+    {
+        $user = $command->user;
+
+        $user->api_key = User::generateApiKey();
+        $user->save();
+
+        //event(new GeneratedApiTokenEvent($user));
+    }
+}

app/Handlers/Commands/User/InviteTeamMemberCommandHandler.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Events\User\UserWasInvitedEvent;
+use CachetHQ\Cachet\Models\Invite;
+
+class InviteTeamMemberCommandHandler
+{
+    /**
+     * Handle the invite team member command.
+     *
+     * @param \CachetHQ\Cachet\Commands\User\InviteTeamMemberCommand $command
+     *
+     * @return void
+     */
+    public function handle(InviteTeamMemberCommand $command)
+    {
+        foreach ($command->emails as $email) {
+            $invite = Invite::create([
+                'email' => $email,
+            ]);
+
+            event(new UserWasInvitedEvent($invite));
+        }
+    }
+}

app/Handlers/Commands/User/RemoveUserCommandHandler.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Commands\User\RemoveUserCommand;
+use CachetHQ\Cachet\Events\User\UserWasRemovedEvent;
+use CachetHQ\Cachet\Models\User;
+
+class RemoveUserCommandHandler
+{
+    /**
+     * Handle the remove user command.
+     *
+     * @param \CachetHQ\Cachet\Commands\User\RemoveUserCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveUserCommand $command)
+    {
+        $user = $command->user;
+
+        event(new UserWasRemovedEvent($user));
+
+        $user->delete();
+    }
+}

app/Handlers/Commands/User/SignupUserCommandHandler.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Commands\User\SignupUserCommand;
+use CachetHQ\Cachet\Events\User\UserWasAddedEvent;
+use CachetHQ\Cachet\Models\User;
+
+class SignupUserCommandHandler
+{
+    /**
+     * Handle the signup user command.
+     *
+     * @param \CachetHQ\Cachet\Commands\User\SignupUserCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\User
+     */
+    public function handle(SignupUserCommand $command)
+    {
+        $user = User::create([
+            'username' => $command->username,
+            'password' => $command->password,
+            'email'    => $command->email,
+            'level'    => 2,
+        ]);
+
+        event(new UserWasAddedEvent($user));
+
+        return $user;
+    }
+}

app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Handlers\Events\Incident;
+
+use CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+use Illuminate\Contracts\Mail\MailQueue;
+use Illuminate\Mail\Message;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
+
+class SendIncidentEmailNotificationHandler
+{
+    /**
+     * The mailer instance.
+     *
+     * @var \Illuminate\Contracts\Mail\Mailer
+     */
+    protected $mailer;
+
+    /**
+     * The subscriber instance.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    protected $subscriber;
+
+    /**
+     * Create a new send incident email notification handler.
+     *
+     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
+     */
+    public function __construct(MailQueue $mailer, Subscriber $subscriber)
+    {
+        $this->mailer = $mailer;
+        $this->subscriber = $subscriber;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Events\Incident\IncidentHasReportedEvent $event
+     *
+     * @return void
+     */
+    public function handle(IncidentWasReportedEvent $event)
+    {
+        if (!$event->incident->notify) {
+            return false;
+        }
+
+        $incident = AutoPresenter::decorate($event->incident);
+        $component = AutoPresenter::decorate($event->incident->component);
+
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 1) {
+            foreach ($this->subscriber->isVerified()->get() as $subscriber) {
+                $mail = [
+                    'email'            => $subscriber->email,
+                    'subject'          => 'New incident reported.',
+                    'has_component'    => ($event->incident->component) ? true : false,
+                    'component_name'   => $component ? $component->name : null,
+                    'status'           => $incident->humanStatus,
+                    'html_content'     => $incident->formattedMessage,
+                    'text_content'     => $incident->message,
+                    'token'            => $subscriber->token,
+                    'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
+                ];
+
+                $this->mailer->queue([
+                    'html' => 'emails.incidents.new-html',
+                    'text' => 'emails.incidents.new-text',
+                ], $mail, function (Message $message) use ($mail) {
+                    $message->to($mail['email'])->subject($mail['subject']);
+                });
+            }
+        }
+    }
+}

app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events;
+namespace CachetHQ\Cachet\Handlers\Events\Incident;
 
-use CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent;
+use CachetHQ\Cachet\Events\Incident\MaintenanceWasScheduledEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
-use McCool\LaravelAutoPresenter\PresenterDecorator;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
 
 class SendMaintenanceEmailNotificationHandler
 {
@@ -33,46 +33,45 @@ class SendMaintenanceEmailNotificationHandler
      */
     protected $subscriber;
 
-    /**
-     * The presenter instance.
-     *
-     * @var \McCool\LaravelAutoPresenter\PresenterDecorator
-     */
-    protected $presenter;
-
     /**
      * Create a new send maintenance email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer               $mailer
-     * @param \CachetHQ\Cachet\Models\Subscriber              $subscriber
-     * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter
+     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
      */
-    public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter)
+    public function __construct(MailQueue $mailer, Subscriber $subscriber)
     {
         $this->mailer = $mailer;
         $this->subscriber = $subscriber;
-        $this->presenter = $presenter;
     }
 
     /**
      * Handle the event.
      *
      * @param \CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent $event
+     *
+     * @return void
      */
-    public function handle(MaintenanceHasScheduledEvent $event)
+    public function handle(MaintenanceWasScheduledEvent $event)
     {
-        $data = $this->presenter->decorate($event->incident);
+        if (!$event->incident->notify) {
+            return false;
+        }
 
-        foreach ($this->subscriber->all() as $subscriber) {
+        $data = AutoPresenter::decorate($event->incident);
+
+        foreach ($this->subscriber->isVerified()->get() as $subscriber) {
             $mail = [
-                'email'           => $subscriber->email,
-                'subject'         => 'Scheduled maintenance.',
-                'status'          => $data->humanStatus,
-                'htmlContent'     => $data->formattedMessage,
-                'textContent'     => $data->message,
-                'token'           => $subscriber->token,
-                'unsubscribeLink' => route('unsubscribe', ['code' => $subscriber->verify_code]),
-                'appUrl'          => env('APP_URL'),
+                'email'            => $subscriber->email,
+                'subject'          => 'Scheduled maintenance.',
+                'status'           => $data->humanStatus,
+                'html_content'     => $data->formattedMessage,
+                'text_content'     => $data->message,
+                'scheduled_at'     => $data->scheduled_at_formatted,
+                'token'            => $subscriber->token,
+                'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
             ];
 
             $this->mailer->queue([

app/Handlers/Events/SendIncidentEmailNotificationHandler.php

@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Handlers\Events;
-
-use CachetHQ\Cachet\Events\IncidentHasReportedEvent;
-use CachetHQ\Cachet\Models\Subscriber;
-use Illuminate\Contracts\Mail\MailQueue;
-use Illuminate\Mail\Message;
-use McCool\LaravelAutoPresenter\PresenterDecorator;
-
-class SendIncidentEmailNotificationHandler
-{
-    /**
-     * The mailer instance.
-     *
-     * @var \Illuminate\Contracts\Mail\Mailer
-     */
-    protected $mailer;
-
-    /**
-     * The subscriber instance.
-     *
-     * @var \CachetHQ\Cachet\Models\Subscriber
-     */
-    protected $subscriber;
-
-    /**
-     * The presenter instance.
-     *
-     * @var \McCool\LaravelAutoPresenter\PresenterDecorator
-     */
-    protected $presenter;
-
-    /**
-     * Create a new send incident email notification handler.
-     *
-     * @param \Illuminate\Contracts\Mail\Mailer               $mailer
-     * @param \CachetHQ\Cachet\Models\Subscriber              $subscriber
-     * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter
-     */
-    public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter)
-    {
-        $this->mailer = $mailer;
-        $this->subscriber = $subscriber;
-        $this->presenter = $presenter;
-    }
-
-    /**
-     * Handle the event.
-     *
-     * @param \CachetHQ\Cachet\Events\IncidentHasReportedEvent $event
-     */
-    public function handle(IncidentHasReportedEvent $event)
-    {
-        $data = $this->presenter->decorate($event->incident);
-
-        // Only send emails for public incidents.
-        if ($event->incident->visible === 1) {
-            foreach ($this->subscriber->all() as $subscriber) {
-                $mail = [
-                    'email'           => $subscriber->email,
-                    'subject'         => 'New incident reported.',
-                    'status'          => $data->humanStatus,
-                    'htmlContent'     => $data->formattedMessage,
-                    'textContent'     => $data->message,
-                    'token'           => $subscriber->token,
-                    'unsubscribeLink' => route('unsubscribe', ['code' => $subscriber->verify_code]),
-                    'appUrl'          => env('APP_URL'),
-                ];
-
-                $this->mailer->queue([
-                    'html' => 'emails.incidents.new-html',
-                    'text' => 'emails.incidents.new-text',
-                ], $mail, function (Message $message) use ($mail) {
-                    $message->to($mail['email'])->subject($mail['subject']);
-                });
-            }
-        }
-    }
-}