Bumped version

Updated deps

.env.example

@@ -8,10 +8,12 @@ DB_HOST=localhost
 DB_DATABASE=cachet
 DB_USERNAME=homestead
 DB_PASSWORD=secret
+DB_PORT=null
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=database
+CACHET_EMOJI=false
 
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
@@ -20,7 +22,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

@@ -4,16 +4,18 @@ php:
   - 5.5.9
   - 5.5
   - 5.6
+  - 7.0
   - 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.6" ] || [ "$TRAVIS_PULL_REQUEST" != false ]; then vendor/bin/phpunit; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; 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.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi

CONTRIBUTING.md

@@ -8,9 +8,7 @@ Feature requests and bug reports should be made by using the [issue tracker](htt
 
 ## Languages
 
-When needing to add labels, placeholders or general text, you **must not** write directly into the source file, rather make use of the `./resources/lang/` directory.
-
-Always provide the English translation and copy your English string to all other languages - making sure that the indentation and alignment of the arrays are updated.
+Any non-English translations must be made on the [Cachet CrowdIn](https://translate.cachethq.io) project. This makes syncing translations much easier.
 
 ## Coding Standards
 
@@ -59,7 +57,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.
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Alt Three Services Limited.
+Copyright (c) 2015-2016 Alt Three Services Limited.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -1,8 +1,8 @@
 # Cachet
 
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
-[![Build Status](https://img.shields.io/travis/cachethq/Cachet.svg?style=flat-square)](https://travis-ci.org/cachethq/Cachet)
-[![Quality Score](https://img.shields.io/scrutinizer/g/cachethq/Cachet.svg?style=flat-square)](https://scrutinizer-ci.com/g/cachethq/Cachet)
+[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
+[![Quality Score](https://img.shields.io/scrutinizer/g/CachetHQ/Cachet.svg?style=flat-square)](https://scrutinizer-ci.com/g/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.png)](http://translate.cachethq.io/project/cachet)
 
@@ -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
@@ -46,7 +50,7 @@ You can now find our documentation at [https://docs.cachethq.io](https://docs.ca
 
 To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following:
 
-- **Username:** test@test.com
+- **Username:** test or test@test.com
 - **Password:** test123
 
 The demo is reset every half hour.
@@ -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.1.3-dev

app/Bus/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\Bus\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/Bus/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\Bus\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/Bus/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\Bus\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/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php

@@ -0,0 +1,63 @@
+<?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\Bus\Commands\ComponentGroup;
+
+final class AddComponentGroupCommand
+{
+    /**
+     * The component group name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The component group description.
+     *
+     * @var int
+     */
+    public $order;
+
+    /**
+     * Is the component group collapsed?
+     *
+     * @var bool
+     */
+    public $collapsed;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'      => 'required|string',
+        'order'     => 'int',
+        'collapsed' => 'bool',
+    ];
+
+    /**
+     * Create a add component group command instance.
+     *
+     * @param string $name
+     * @param int    $order
+     * @param bool   $collapsed
+     *
+     * @return void
+     */
+    public function __construct($name, $order, $collapsed)
+    {
+        $this->name = $name;
+        $this->order = (int) $order;
+        $this->collapsed = $collapsed;
+    }
+}

app/Bus/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\Bus\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/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.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\Bus\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;
+
+    /**
+     * Is the component group collapsed?
+     *
+     * @var bool
+     */
+    public $collapsed;
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'      => 'string',
+        'order'     => 'int',
+        'collapsed' => 'bool',
+    ];
+
+    /**
+     * Create a add component group command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     * @param string                                 $name
+     * @param int                                    $order
+     * @param bool                                   $collapsed
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group, $name, $order, $collapsed)
+    {
+        $this->group = $group;
+        $this->name = $name;
+        $this->order = (int) $order;
+        $this->collapsed = $collapsed;
+    }
+}

app/Bus/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\Bus\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/Bus/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\Bus\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|required_with:component_status',
+        '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, array $template_vars = null)
+    {
+        $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/Bus/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\Bus\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/Bus/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\Bus\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 $incident
+     * @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, array $template_vars = null)
+    {
+        $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/Bus/Commands/Invite/ClaimInviteCommand.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\Bus\Commands\Invite;
+
+use CachetHQ\Cachet\Models\Invite;
+
+final class ClaimInviteCommand
+{
+    /**
+     * The invite to mark as claimed.
+     *
+     * @var \CachetHQ\Cachet\Models\Invite
+     */
+    public $invite;
+
+    /**
+     * Create a new claim invite command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Invite $invite
+     *
+     * @return void
+     */
+    public function __construct(Invite $invite)
+    {
+        $this->invite = $invite;
+    }
+}

app/Bus/Commands/Metric/AddMetricCommand.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\Bus\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 view to show the metric points in.
+     *
+     * @var int
+     */
+    public $default_view;
+
+    /**
+     * 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',
+        'default_view'  => 'int|between:0,3',
+    ];
+
+    /**
+     * 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
+     * @param int    $default_view
+     *
+     * @return void
+     */
+    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
+    {
+        $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;
+        $this->default_view = $default_view;
+    }
+}

app/Bus/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\Bus\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/Bus/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\Bus\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/Bus/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\Bus\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/Bus/Commands/Metric/UpdateMetricCommand.php

@@ -0,0 +1,125 @@
+<?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\Bus\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 view to show the metric points in.
+     *
+     * @var int
+     */
+    public $default_view;
+
+    /**
+     * 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|between:0,4',
+        'default_view'  => 'numeric|between:0,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
+     * @param int                            $default_view
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
+    {
+        $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;
+        $this->default_view = $default_view;
+    }
+}

app/Bus/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\Bus\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/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php

@@ -0,0 +1,66 @@
+<?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\Bus\Commands\Subscriber;
+
+/**
+ * This is the subscribe subscriber command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+final class SubscribeSubscriberCommand
+{
+    /**
+     * The subscriber email.
+     *
+     * @var string
+     */
+    public $email;
+
+    /**
+     * The subscriber auto verification.
+     *
+     * @var bool
+     */
+    public $verified;
+
+    /**
+     * The subscriptions that we want to add.
+     *
+     * @var array|null
+     */
+    public $subscriptions;
+
+    /**
+     * The validation rules.
+     *
+     * @var array
+     */
+    public $rules = [
+        'email' => 'required|email',
+    ];
+
+    /**
+     * Create a new subscribe subscriber command instance.
+     *
+     * @param string     $email
+     * @param bool       $verified
+     * @param null|array $subscriptions
+     *
+     * @return void
+     */
+    public function __construct($email, $verified = false, $subscriptions = null)
+    {
+        $this->email = $email;
+        $this->verified = $verified;
+        $this->subscriptions = $subscriptions;
+    }
+}

app/Bus/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\Bus\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 \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Bus/Commands/Subscriber/UnsubscribeSubscriptionCommand.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\Bus\Commands\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscription;
+
+final class UnsubscribeSubscriptionCommand
+{
+    /**
+     * The subscription to unsubscribe.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscription
+     */
+    public $subscription;
+
+    /**
+     * Create a unsubscribe subscription command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscription $subscription
+     *
+     * @return void
+     */
+    public function __construct(Subscription $subscription)
+    {
+        $this->subscription = $subscription;
+    }
+}

app/Bus/Commands/Subscriber/VerifySubscriberCommand.php

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

app/Bus/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\Bus\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/Bus/Commands/User/GenerateApiTokenCommand.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\Bus\Commands\User;
+
+use CachetHQ\Cachet\Models\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 $user)
+    {
+        $this->user = $user;
+    }
+}

app/Bus/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\Bus\Commands\User;
+
+final class InviteTeamMemberCommand
+{
+    /**
+     * The invite 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 string[] $emails
+     *
+     * @return void
+     */
+    public function __construct(array $emails)
+    {
+        $this->emails = $emails;
+    }
+}

app/Bus/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\Bus\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/Bus/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\Bus\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/Bus/Events/Component/ComponentEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\Component;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface ComponentEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/Component/ComponentWasAddedEvent.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\Bus\Events\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+final class ComponentWasAddedEvent implements ComponentEventInterface
+{
+    /**
+     * The component that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new component was added event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Bus/Events/Component/ComponentWasRemovedEvent.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\Bus\Events\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+final class ComponentWasRemovedEvent implements ComponentEventInterface
+{
+    /**
+     * The component that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new component was removed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Bus/Events/Component/ComponentWasUpdatedEvent.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\Bus\Events\Component;
+
+use CachetHQ\Cachet\Models\Component;
+
+final class ComponentWasUpdatedEvent implements ComponentEventInterface
+{
+    /**
+     * The component that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\Component
+     */
+    public $component;
+
+    /**
+     * Create a new component was updated event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
+     * @return void
+     */
+    public function __construct(Component $component)
+    {
+        $this->component = $component;
+    }
+}

app/Bus/Events/ComponentGroup/ComponentGroupEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface ComponentGroupEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/ComponentGroup/ComponentGroupWasAddedEvent.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\Bus\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+final class ComponentGroupWasAddedEvent implements ComponentGroupEventInterface
+{
+    /**
+     * The component group that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new component group was added event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Bus/Events/ComponentGroup/ComponentGroupWasRemovedEvent.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\Bus\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+final class ComponentGroupWasRemovedEvent implements ComponentGroupEventInterface
+{
+    /**
+     * The component group that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new component group was removed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Bus/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.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\Bus\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+final class ComponentGroupWasUpdatedEvent implements ComponentGroupEventInterface
+{
+    /**
+     * The component group that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public $group;
+
+    /**
+     * Create a new component group was updated event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
+     * @return void
+     */
+    public function __construct(ComponentGroup $group)
+    {
+        $this->group = $group;
+    }
+}

app/Bus/Events/EventInterface.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\Bus\Events;
+
+interface EventInterface
+{
+    //
+}

app/Bus/Events/Incident/IncidentEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\Incident;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface IncidentEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/Incident/IncidentWasRemovedEvent.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\Bus\Events\Incident;
+
+use CachetHQ\Cachet\Models\Incident;
+
+final class IncidentWasRemovedEvent implements IncidentEventInterface
+{
+    /**
+     * The incident that has been removed.
+     *
+     * @var \CachetHQ\Cachet\Models\Incident
+     */
+    public $incident;
+
+    /**
+     * Create a new incident was removed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Incident $incident
+     *
+     * @return void
+     */
+    public function __construct(Incident $incident)
+    {
+        $this->incident = $incident;
+    }
+}

app/Bus/Events/Incident/IncidentWasReportedEvent.php

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

app/Bus/Events/Incident/IncidentWasUpdatedEvent.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\Bus\Events\Incident;
+
+use CachetHQ\Cachet\Models\Incident;
+
+final class IncidentWasUpdatedEvent implements IncidentEventInterface
+{
+    /**
+     * The incident that has been updated.
+     *
+     * @var \CachetHQ\Cachet\Models\Incident
+     */
+    public $incident;
+
+    /**
+     * Create a new incident has updated event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Incident $incident
+     *
+     * @return void
+     */
+    public function __construct(Incident $incident)
+    {
+        $this->incident = $incident;
+    }
+}

app/Bus/Events/Incident/MaintenanceWasScheduledEvent.php

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

app/Bus/Events/Invite/InviteEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\Invite;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface InviteEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/Invite/InviteWasClaimedEvent.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\Bus\Events\Invite;
+
+use CachetHQ\Cachet\Models\Invite;
+
+final class InviteWasClaimedEvent implements InviteEventInterface
+{
+    /**
+     * 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/Bus/Events/Metric/MetricEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface MetricEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/Metric/MetricPointWasAddedEvent.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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+final class MetricPointWasAddedEvent implements MetricEventInterface
+{
+    /**
+     * The metric point that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metricPoint;
+
+    /**
+     * Create a new metric point was added event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $metricPoint
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $metricPoint)
+    {
+        $this->metricPoint = $metricPoint;
+    }
+}

app/Bus/Events/Metric/MetricPointWasRemovedEvent.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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+final class MetricPointWasRemovedEvent implements MetricEventInterface
+{
+    /**
+     * The metric point that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metricPoint;
+
+    /**
+     * Create a new metric point was removed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $memtricPoint
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $metricPoint)
+    {
+        $this->metricPoint = $metricPoint;
+    }
+}

app/Bus/Events/Metric/MetricPointWasUpdatedEvent.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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Models\MetricPoint;
+
+final class MetricPointWasUpdatedEvent implements MetricEventInterface
+{
+    /**
+     * The metric point that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metricPoint;
+
+    /**
+     * Create a new metric point was updated event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $metricPoint
+     *
+     * @return void
+     */
+    public function __construct(MetricPoint $metricPoint)
+    {
+        $this->metricPoint = $metricPoint;
+    }
+}

app/Bus/Events/Metric/MetricWasAddedEvent.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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+final class MetricWasAddedEvent implements MetricEventInterface
+{
+    /**
+     * The metric that was added.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * Create a new metric was added event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Bus/Events/Metric/MetricWasRemovedEvent.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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+final class MetricWasRemovedEvent implements MetricEventInterface
+{
+    /**
+     * The metric that was removed.
+     *
+     * @var \CachetHQ\Cachet\Models\Metric
+     */
+    public $metric;
+
+    /**
+     * Create a new metric was removed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Bus/Events/Metric/MetricWasUpdatedEvent.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\Bus\Events\Metric;
+
+use CachetHQ\Cachet\Models\Metric;
+
+final class MetricWasUpdatedEvent implements MetricEventInterface
+{
+    /**
+     * The metric that was updated.
+     *
+     * @var \CachetHQ\Cachet\Models\MetricPoint
+     */
+    public $metric;
+
+    /**
+     * Create a new metric was updated event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
+     * @return void
+     */
+    public function __construct(Metric $metric)
+    {
+        $this->metric = $metric;
+    }
+}

app/Bus/Events/Subscriber/SubscriberEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\Subscriber;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface SubscriberEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/Subscriber/SubscriberHasSubscribedEvent.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\Bus\Events\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+final class SubscriberHasSubscribedEvent implements SubscriberEventInterface
+{
+    /**
+     * The subscriber who has subscribed.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a new subscriber has subscribed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Bus/Events/Subscriber/SubscriberHasUnsubscribedEvent.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\Bus\Events\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+final class SubscriberHasUnsubscribedEvent implements SubscriberEventInterface
+{
+    /**
+     * The subscriber who has unsubscribed.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a new subscriber has unsubscribed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Bus/Events/Subscriber/SubscriberHasUpdatedSubscriptionsEvent.php

@@ -0,0 +1,41 @@
+<?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\Bus\Events\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+/**
+ * This is the subscriber has updated subscriptions event.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+final class SubscriberHasUpdatedSubscriptionsEvent implements SubscriberEventInterface
+{
+    /**
+     * The subscriber.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a new subscriber has updated subscriptions event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Bus/Events/Subscriber/SubscriberHasVerifiedEvent.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\Bus\Events\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+final class SubscriberHasVerifiedEvent implements SubscriberEventInterface
+{
+    /**
+     * The subscriber who has verified.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * Create a new subscriber has subscribed event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return void
+     */
+    public function __construct(Subscriber $subscriber)
+    {
+        $this->subscriber = $subscriber;
+    }
+}

app/Bus/Events/User/UserEventInterface.php

@@ -0,0 +1,19 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\EventInterface;
+
+interface UserEventInterface extends EventInterface
+{
+    //
+}

app/Bus/Events/User/UserWasAddedEvent.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\Bus\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.
+     *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Bus/Events/User/UserWasInvitedEvent.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\Bus\Events\User;
+
+use CachetHQ\Cachet\Models\Invite;
+
+final class UserWasInvitedEvent implements UserEventInterface
+{
+    /**
+     * The invite that has been added.
+     *
+     * @var \CachetHQ\Cachet\Models\Invite
+     */
+    public $invite;
+
+    /**
+     * Create a new user was invite event instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Invite $invite
+     *
+     * @return void
+     */
+    public function __construct(Invite $invite)
+    {
+        $this->invite = $invite;
+    }
+}

app/Bus/Events/User/UserWasRemovedEvent.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\Bus\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.
+     *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Bus/Exceptions/ExceptionInterface.php

@@ -0,0 +1,23 @@
+<?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\Bus\Exceptions;
+
+/**
+ * This is the exception interface.
+ *
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
+interface ExceptionInterface
+{
+    //
+}

app/Bus/Exceptions/Subscriber/AlreadySubscribedException.php

@@ -0,0 +1,26 @@
+<?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\Bus\Exceptions\Subscriber;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+use Exception;
+
+/**
+ * This is the already subscribed exception class.
+ *
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
+class AlreadySubscribedException extends Exception implements ExceptionInterface
+{
+    //
+}

app/Bus/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\Bus\Handlers\Commands\Component;
+
+use CachetHQ\Cachet\Bus\Commands\Component\AddComponentCommand;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasAddedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class AddComponentCommandHandler
+{
+    /**
+     * Handle the add component command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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\Bus\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/Bus/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\Bus\Handlers\Commands\Component;
+
+use CachetHQ\Cachet\Bus\Commands\Component\RemoveComponentCommand;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent;
+
+class RemoveComponentCommandHandler
+{
+    /**
+     * Handle the remove component command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Component\RemoveComponentCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveComponentCommand $command)
+    {
+        $component = $command->component;
+
+        event(new ComponentWasRemovedEvent($component));
+
+        $component->delete();
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Component;
+
+use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class UpdateComponentCommandHandler
+{
+    /**
+     * Handle the update component command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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\Bus\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/Bus/Handlers/Commands/ComponentGroup/AddComponentGroupCommandHandler.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\Bus\Handlers\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\AddComponentGroupCommand;
+use CachetHQ\Cachet\Bus\Events\ComponentGroup\ComponentGroupWasAddedEvent;
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class AddComponentGroupCommandHandler
+{
+    /**
+     * Handle the add component group command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\ComponentGroup\AddComponentGroupCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public function handle(AddComponentGroupCommand $command)
+    {
+        $group = ComponentGroup::create([
+            'name'      => $command->name,
+            'order'     => $command->order,
+            'collapsed' => $command->collapsed,
+        ]);
+
+        event(new ComponentGroupWasAddedEvent($group));
+
+        return $group;
+    }
+}

app/Bus/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\Bus\Handlers\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\RemoveComponentGroupCommand;
+use CachetHQ\Cachet\Bus\Events\ComponentGroup\ComponentGroupWasRemovedEvent;
+
+class RemoveComponentGroupCommandHandler
+{
+    /**
+     * Handle the remove component group command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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/Bus/Handlers/Commands/ComponentGroup/UpdateComponentGroupCommandHandler.php

@@ -0,0 +1,55 @@
+<?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\Bus\Handlers\Commands\ComponentGroup;
+
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\UpdateComponentGroupCommand;
+use CachetHQ\Cachet\Bus\Events\ComponentGroup\ComponentGroupWasUpdatedEvent;
+
+class UpdateComponentGroupCommandHandler
+{
+    /**
+     * Handle the update component group command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\ComponentGroup\UpdateComponentGroupCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\ComponentGroup
+     */
+    public function handle(UpdateComponentGroupCommand $command)
+    {
+        $group = $command->group;
+        $group->update($this->filter($command));
+
+        event(new ComponentGroupWasUpdatedEvent($group));
+
+        return $group;
+    }
+
+    /**
+     * Filter the command data.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\ComponentGroup\UpdateComponentGroupCommand $command
+     *
+     * @return array
+     */
+    protected function filter(UpdateComponentGroupCommand $command)
+    {
+        $params = [
+            'name'      => $command->name,
+            'order'     => $command->order,
+            'collapsed' => $command->collapsed,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Bus\Commands\Incident\RemoveIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasRemovedEvent;
+
+class RemoveIncidentCommandHandler
+{
+    /**
+     * Handle the remove incident command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\RemoveIncidentCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveIncidentCommand $command)
+    {
+        $incident = $command->incident;
+
+        event(new IncidentWasRemovedEvent($incident));
+
+        $incident->delete();
+    }
+}

app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.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\Bus\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Dates\DateFactory;
+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\Bus\Commands\Incident\ReportIncidentCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Incident
+     */
+    public function handle(ReportIncidentCommand $command)
+    {
+        $data = [
+            'name'    => $command->name,
+            'status'  => $command->status,
+            'visible' => $command->visible,
+        ];
+
+        if ($command->template) {
+            $data['message'] = $this->parseIncidentTemplate($command->template, $command->template_vars);
+        } else {
+            $data['message'] = $command->message;
+        }
+
+        // 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->create('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)
+    {
+        if ($vars === null) {
+            $vars = [];
+        }
+
+        Twig::setLoader(new Twig_Loader_String());
+        $template = IncidentTemplate::forSlug($templateSlug)->first();
+
+        return Twig::render($template->template, $vars);
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Bus\Commands\Incident\ReportMaintenanceCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent;
+use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Models\Incident;
+
+class ReportMaintenanceCommandHandler
+{
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new report maintenance 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\Bus\Commands\Incident\ReportMaintenanceCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Incident
+     */
+    public function handle(ReportMaintenanceCommand $command)
+    {
+        $scheduledAt = $this->dates->create('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/Bus/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\Bus\Handlers\Commands\Incident;
+
+use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent;
+use CachetHQ\Cachet\Dates\DateFactory;
+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\Bus\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->create('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\Bus\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/Bus/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\Bus\Handlers\Commands\Invite;
+
+use CachetHQ\Cachet\Bus\Commands\Invite\ClaimInviteCommand;
+use CachetHQ\Cachet\Bus\Events\Invite\InviteWasClaimedEvent;
+use Carbon\Carbon;
+
+class ClaimInviteCommandHandler
+{
+    /**
+     * Handle the claim invite command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\User\ClaimInviteCommand $command
+     *
+     * @return void
+     */
+    public function handle(ClaimInviteCommand $command)
+    {
+        $invite = $command->invite;
+
+        $invite->claimed_at = Carbon::now();
+        $invite->save();
+
+        event(new InviteWasClaimedEvent($invite));
+    }
+}

app/Bus/Handlers/Commands/Metric/AddMetricCommandHandler.php

@@ -0,0 +1,44 @@
+<?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\Bus\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Bus\Commands\Metric\AddMetricCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricWasAddedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class AddMetricCommandHandler
+{
+    /**
+     * Handle the add metric command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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,
+            'default_view'  => $command->default_view,
+        ]);
+
+        event(new MetricWasAddedEvent($metric));
+
+        return $metric;
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Bus\Commands\Metric\AddMetricPointCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasAddedEvent;
+use CachetHQ\Cachet\Dates\DateFactory;
+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\Bus\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/Bus/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\Bus\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricWasRemovedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class RemoveMetricCommandHandler
+{
+    /**
+     * Handle the remove metric command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveMetricCommand $command)
+    {
+        $metric = $command->metric;
+
+        event(new MetricWasRemovedEvent($metric));
+
+        $metric->delete();
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricPointCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasRemovedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class RemoveMetricPointCommandHandler
+{
+    /**
+     * Handle the remove metric point command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricPointCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveMetricPointCommand $command)
+    {
+        $metricPoint = $command->metricPoint;
+
+        event(new MetricPointWasRemovedEvent($metricPoint));
+
+        $metricPoint->delete();
+    }
+}

app/Bus/Handlers/Commands/Metric/UpdateMetricCommandHandler.php

@@ -0,0 +1,62 @@
+<?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\Bus\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class UpdateMetricCommandHandler
+{
+    /**
+     * Handle the update metric command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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\Bus\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,
+            'default_view'  => $command->default_view,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Metric;
+
+use CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricPointCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasUpdatedEvent;
+use CachetHQ\Cachet\Dates\DateFactory;
+
+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\Bus\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/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.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\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
+use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
+use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the subscribe subscriber command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class SubscribeSubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand $command
+     *
+     * @throws \CachetHQ\Cachet\Exceptions\AlreadySubscribedException
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(SubscribeSubscriberCommand $command)
+    {
+        if (Subscriber::where('email', $command->email)->first() && $command->subscriptions === null) {
+            throw new AlreadySubscribedException("Cannot subscribe {$command->email} because they're already subscribed.");
+        }
+
+        $subscriber = Subscriber::firstOrCreate(['email' => $command->email]);
+
+        if ($subscriptions = $command->subscriptions) {
+            foreach ($subscriptions as $subscription => $subscriptionValue) {
+                Subscription::firstOrCreate([
+                    'subscriber_id' => $subscriber->id,
+                    $subscription   => $subscriptionValue,
+                ]);
+            }
+        }
+
+        if ($subscriber->is_verified === false) {
+            if ($command->verified) {
+                dispatch(new VerifySubscriberCommand($subscriber));
+            } else {
+                event(new SubscriberHasSubscribedEvent($subscriber));
+            }
+        } else {
+            event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+        }
+
+        return $subscriber;
+    }
+}

app/Bus/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\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+
+class UnsubscribeSubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe customer command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand $command
+     *
+     * @return void
+     */
+    public function handle(UnsubscribeSubscriberCommand $command)
+    {
+        $subscriber = $command->subscriber;
+
+        event(new SubscriberHasUnsubscribedEvent($subscriber));
+
+        $subscriber->delete();
+    }
+}

app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriptionCommandHandler.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\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
+use CachetHQ\Cachet\Models\Subscription;
+
+class UnsubscribeSubscriptionCommandHandler
+{
+    /**
+     * Handle the unsubscribe subscription command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand $command
+     *
+     * @return void
+     */
+    public function handle(UnsubscribeSubscriptionCommand $command)
+    {
+        $subscription = $command->subscription;
+
+        event(new SubscriberHasUnsubscribedEvent($subscription->subscriber));
+
+        $subscription->delete();
+    }
+}

app/Bus/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.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\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasVerifiedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+use Carbon\Carbon;
+
+class VerifySubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe customer command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand $command
+     *
+     * @return void
+     */
+    public function handle(VerifySubscriberCommand $command)
+    {
+        $subscriber = $command->subscriber;
+
+        // Mark the subscriber as verified.
+        $subscriber->verified_at = Carbon::now();
+        $subscriber->save();
+
+        event(new SubscriberHasVerifiedEvent($subscriber));
+    }
+}

app/Bus/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\Bus\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasAddedEvent;
+use CachetHQ\Cachet\Models\User;
+
+class AddTeamMemberCommandHandler
+{
+    /**
+     * Handle the add team member command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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/Bus/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\Bus\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Bus\Commands\User\GenerateApiTokenCommand;
+use CachetHQ\Cachet\Models\User;
+
+class GenerateApiTokenCommandHandler
+{
+    /**
+     * Handle the generate api key command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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/Bus/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\Bus\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
+use CachetHQ\Cachet\Models\Invite;
+
+class InviteTeamMemberCommandHandler
+{
+    /**
+     * Handle the invite team member command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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/Bus/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\Bus\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Bus\Commands\User\RemoveUserCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasRemovedEvent;
+use CachetHQ\Cachet\Models\User;
+
+class RemoveUserCommandHandler
+{
+    /**
+     * Handle the remove user command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\User\RemoveUserCommand $command
+     *
+     * @return void
+     */
+    public function handle(RemoveUserCommand $command)
+    {
+        $user = $command->user;
+
+        event(new UserWasRemovedEvent($user));
+
+        $user->delete();
+    }
+}

app/Bus/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\Bus\Handlers\Commands\User;
+
+use CachetHQ\Cachet\Bus\Commands\User\SignupUserCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasAddedEvent;
+use CachetHQ\Cachet\Models\User;
+
+class SignupUserCommandHandler
+{
+    /**
+     * Handle the signup user command.
+     *
+     * @param \CachetHQ\Cachet\Bus\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'    => User::LEVEL_USER,
+        ]);
+
+        event(new UserWasAddedEvent($user));
+
+        return $user;
+    }
+}

app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.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\Bus\Handlers\Events\Component;
+
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscription;
+use Illuminate\Contracts\Mail\MailQueue;
+use Illuminate\Mail\Message;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
+
+class SendComponentUpdateEmailNotificationHandler
+{
+    /**
+     * The mailer instance.
+     *
+     * @var \Illuminate\Contracts\Mail\Mailer
+     */
+    protected $mailer;
+
+    /**
+     * Create a new send incident email notification handler.
+     *
+     * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     *
+     * @return void
+     */
+    public function __construct(MailQueue $mailer)
+    {
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent $event
+     *
+     * @return void
+     */
+    public function handle(ComponentWasUpdatedEvent $event)
+    {
+        $component = AutoPresenter::decorate($event->component);
+
+        $mail = [
+            'subject'                => trans('cachet.subscriber.email.component.subject'),
+            'component_name'         => $component->name,
+            'component_human_status' => $component->human_status,
+        ];
+
+        foreach (Subscription::isVerifiedForComponent($component->id)->with('subscriber')->get() as $subscription) {
+            $subscriber = $subscription->subscriber;
+            $mail['email'] = $subscriber->email;
+            $mail['unsubscribe_link'] = route('subscribe.unsubscribe', ['code' => $subscriber->verify_code, 'subscription' => $subscription->id]);
+
+            $this->mailer->queue([
+                'html' => 'emails.components.update-html',
+                'text' => 'emails.components.update-text',
+            ], $mail, function (Message $message) use ($mail) {
+                $message->to($mail['email'])->subject($mail['subject']);
+            });
+        }
+    }
+}

app/Bus/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\Bus\Handlers\Events\Incident;
+
+use CachetHQ\Cachet\Bus\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\Bus\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->human_status,
+                    '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/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -0,0 +1,85 @@
+<?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\Bus\Handlers\Events\Incident;
+
+use CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+use Illuminate\Contracts\Mail\MailQueue;
+use Illuminate\Mail\Message;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
+
+class SendMaintenanceEmailNotificationHandler
+{
+    /**
+     * The mailer instance.
+     *
+     * @var \Illuminate\Contracts\Mail\MailQueue
+     */
+    protected $mailer;
+
+    /**
+     * The subscriber instance.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    protected $subscriber;
+
+    /**
+     * Create a new send maintenance 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\Bus\Events\MaintenanceHasScheduledEvent $event
+     *
+     * @return void
+     */
+    public function handle(MaintenanceWasScheduledEvent $event)
+    {
+        if (!$event->incident->notify) {
+            return false;
+        }
+
+        $data = AutoPresenter::decorate($event->incident);
+
+        foreach ($this->subscriber->isVerified()->get() as $subscriber) {
+            $mail = [
+                'email'            => $subscriber->email,
+                'subject'          => 'Scheduled maintenance.',
+                'status'           => $data->human_status,
+                '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([
+                'html' => 'emails.incidents.maintenance-html',
+                'text' => 'emails.incidents.maintenance-text',
+            ], $mail, function (Message $message) use ($mail) {
+                $message->to($mail['email'])->subject($mail['subject']);
+            });
+        }
+    }
+}

app/Bus/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events;
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Subscriber;
 
-use CachetHQ\Cachet\Events\CustomerHasSubscribedEvent;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
 
@@ -28,6 +28,8 @@ class SendSubscriberVerificationEmailHandler
      * Create a new send subscriber verification email handler.
      *
      * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     *
+     * @return void
      */
     public function __construct(MailQueue $mailer)
     {
@@ -37,15 +39,16 @@ class SendSubscriberVerificationEmailHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Events\CustomerHasSubscribedEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\SubscriberHasSubscribedEvent $event
+     *
+     * @return void
      */
-    public function handle(CustomerHasSubscribedEvent $event)
+    public function handle(SubscriberHasSubscribedEvent $event)
     {
         $mail = [
-            'email'   => $event->subscriber->email,
-            'subject' => 'Confirm your subscription.',
-            'link'    => route('subscribe-verify', ['code' => $event->subscriber->verify_code]),
-            'appUrl'  => env('APP_URL'),
+            'email'    => $event->subscriber->email,
+            'subject'  => 'Confirm your subscription.',
+            'link'     => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
         ];
 
         $this->mailer->queue([

app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.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\Bus\Handlers\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
+use Illuminate\Contracts\Mail\MailQueue;
+use Illuminate\Mail\Message;
+
+class SendInviteUserEmailHandler
+{
+    /**
+     * The mailer instance.
+     *
+     * @var \Illuminate\Contracts\Mail\MailQueue
+     */
+    protected $mailer;
+
+    /**
+     * Create a new send invite user email handler.
+     *
+     * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     *
+     * @return void
+     */
+    public function __construct(MailQueue $mailer)
+    {
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\UserWasInvitedEvent $event
+     *
+     * @return void
+     */
+    public function handle(UserWasInvitedEvent $event)
+    {
+        $mail = [
+            'email'    => $event->invite->email,
+            'subject'  => 'You have been invited.',
+            'link'     => route('signup.invite', ['code' => $event->invite->code]),
+        ];
+
+        $this->mailer->queue([
+            'html' => 'emails.users.invite-html',
+            'text' => 'emails.users.invite-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
+    }
+}

app/Composers/AppComposer.php

@@ -11,8 +11,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 +21,32 @@ 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);
+        $view->withAboutApp(Markdown::convertToHtml(Config::get('setting.app_about')));
+        $view->withAppAnalytics(Config::get('setting.app_analytics'));
+        $view->withAppAnalyticsGoSquared(Config::get('setting.app_analytics_go_squared'));
+        $view->withAppAnalyticsPiwikUrl(Config::get('setting.app_analytics_piwik_url'));
+        $view->withAppAnalyticsPiwikSiteId(Config::get('setting.app_analytics_piwik_site_id'));
+        $view->withAppBanner(Config::get('setting.app_banner'));
+        $view->withAppBannerStyleFullWidth(Config::get('setting.style_fullwidth_header'));
+        $view->withAppBannerType(Config::get('setting.app_banner_type'));
+        $view->withAppDomain(Config::get('setting.app_domain'));
+        $view->withAppGraphs(Config::get('setting.display_graphs'));
+        $view->withAppLocale(Config::get('setting.app_locale'));
+        $view->withAppStylesheet(Config::get('setting.stylesheet'));
+        $view->withAppUrl(Config::get('app.url'));
 
-        $withData = [
-            'subscribersEnabled' => $isEnabled && $mailAddress && $mailFrom,
-        ];
+        $view->withAppName($name = Config::get('setting.app_name'));
+        $view->withShowSupport($support = Config::get('setting.show_support'));
 
-        $view->with($withData);
+        if ($support) {
+            $view->withSiteTitle(Config::get('setting.app_name').' | Cachet');
+        } else {
+            $view->withSiteTitle(Config::get('setting.app_name'));
+        }
     }
 }

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());
     }
 }