Bump version

Require the ext-xml extension

.bowerrc

@@ -1,4 +0,0 @@
-{
-    "directory": "vendor/bower_components",
-    "interactive": false
-}

.env.example

@@ -8,10 +8,12 @@ DB_HOST=localhost
 DB_DATABASE=cachet
 DB_USERNAME=homestead
 DB_PASSWORD=secret
+DB_PORT=null
+DB_PREFIX=null
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-QUEUE_DRIVER=database
+QUEUE_DRIVER=sync
 CACHET_EMOJI=false
 
 MAIL_DRIVER=smtp

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+/.github export-ignore
+/tests export-ignore

.github/ISSUE_TEMPLATE

@@ -0,0 +1,20 @@
+Before submitting your issue, please make sure that you've checked the checkboxes below.
+
+- [ ] I am running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
+- [ ] I am running at least PHP 5.5.9. *You can check this by running `php -v`.*
+- [ ] I have ran `rm -rf bootstrap/cache/*`.
+
+### Expected behaviour
+
+*Please describe what you're expecting to see happen.*
+
+### Actual behaviour
+
+*Please describe what you're actually seeing happen.*
+
+### Steps to reproduce
+
+*If your issue requires any specific steps to reproduce, please outline them here.*
+
+1. First step
+2. Second step

.travis.yml

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

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
 

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,13 +1,19 @@
 # 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/master.svg?style=flat-square)](https://travis-ci.org/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)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet)
+[![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet)
 
 ![Screenshot](https://cachethq.io/img/main-interface.jpg)
 
+Cachet is a beautiful and powerful open source status page system, a free replacement to services such as StatusPage.io, Status.io and others.
+
+## Supporting Cachet
+
+Cachet is a BSD-3-licensed open source project. If you'd like to support future development, check out the [Cachet Patreon campaign](https://patreon.com/jbrooksuk).
+
 ## Features
 
 - List your services components
@@ -28,15 +34,44 @@ The `master` branch of this repository is a development branch and **should not*
 ## Requirements
 
 - PHP 5.5.9+ or newer
+- Apache or Nginx server
 - [Composer](https://getcomposer.org)
 
-### Development Requirements
+## How to contribute
+
+We're always looking for contributions that improve Cachet. It's easy to get started and you don't even need to know how to write a single line of code!
+
+### Contributing as a non-developer/non-designer
+
+If you're one of the more linguistically talented people in the world who can speak and write more than just English, we're always looking for new [translations](#translations).
+
+Of course bug reports, feature requests and [documentation](https://docs.cachethq.io) are always being sought after.
+
+### Contributing as a designer
+
+As Cachet gains new features, the design and ideas that were once a perfect fit need updating and in some cases designing from scratch. This is where you come in! Fancy giving Cachet a lick of paint? Sweet!
+
+You'll need to install Node.js, Bower and Gulp.
+
+To get started you can do the following:
+
+1. Install Node.js and our dev dependencies.
+2. Modify the SCSS files in `./resources/assets/sass/`
+3. Run `gulp`
+
+If you're making a lot of changes, you'll find that running `gulp watch` will really help you out!
+
+### Contributing as a developer
+
+Built using [Laravel](https://laravel.com), Cachet is very easy to jump into. Have a look around you'll find it surprisingly easy!
 
 These extra dependencies are required to develop Cachet:
 
 - Node.js
-- Bower
 - Gulp
+- Git
+
+Once cloned to your local machine, you'll need some demo data! Simply run `php artisan cachet:seed` to get the demo installation on the go.
 
 ## Installation, Upgrades and Documentation
 
@@ -44,17 +79,20 @@ You can now find our documentation at [https://docs.cachethq.io](https://docs.ca
 
 - [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
 - [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
-- [Getting started with Vagrant](https://docs.cachethq.io/docs/get-started-with-vagrant)
 
 ### Demo Account
 
 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.
 
+### Release Notes
+
+All releases are listed on the [Releases page](https://github.com/CachetHQ/Cachet/releases) of the [Cachet GitHub repository](https://github.com/CachetHQ/Cachet). On the Releases page, you can also find the release notes for each release.
+
 ## 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).
@@ -62,3 +100,9 @@ A special thank you to our [translators](https://crowdin.com/project/cachet/acti
 ## 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.
+
+## Installations
+
+We offer a paid installation service, which starts at $99 but is subject to change, dependant on your setup and infrastructure.
+
+To find out more, email us at support@alt-three.com

VERSION

@@ -1 +1 @@
-2.0.5-dev
+2.3.8

app/Bus/Commands/Component/AddComponentCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Component;
+namespace CachetHQ\Cachet\Bus\Commands\Component;
 
 final class AddComponentCommand
 {

app/Bus/Commands/Component/RemoveComponentCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Component;
+namespace CachetHQ\Cachet\Bus\Commands\Component;
 
 use CachetHQ\Cachet\Models\Component;
 

app/Bus/Commands/Component/UpdateComponentCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Component;
+namespace CachetHQ\Cachet\Bus\Commands\Component;
 
 use CachetHQ\Cachet\Models\Component;
 

app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php

@@ -9,8 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Commands\ComponentGroup;
 
+/**
+ * This is the add component group command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class AddComponentGroupCommand
 {
     /**
@@ -27,14 +32,22 @@ final class AddComponentGroupCommand
      */
     public $order;
 
+    /**
+     * Is the component group collapsed?
+     *
+     * @var int
+     */
+    public $collapsed;
+
     /**
      * The validation rules.
      *
      * @var string[]
      */
     public $rules = [
-        'name'  => 'required|string',
-        'order' => 'int',
+        'name'      => 'required|string',
+        'order'     => 'int',
+        'collapsed' => 'int|between:0,3',
     ];
 
     /**
@@ -42,12 +55,14 @@ final class AddComponentGroupCommand
      *
      * @param string $name
      * @param int    $order
+     * @param int    $collapsed
      *
      * @return void
      */
-    public function __construct($name, $order)
+    public function __construct($name, $order, $collapsed)
     {
         $this->name = $name;
         $this->order = (int) $order;
+        $this->collapsed = $collapsed;
     }
 }

app/Bus/Commands/ComponentGroup/RemoveComponentGroupCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Commands\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 

app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php

@@ -9,10 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Commands\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
+/**
+ * This is the update component group command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class UpdateComponentGroupCommand
 {
     /**
@@ -36,14 +41,22 @@ final class UpdateComponentGroupCommand
      */
     public $order;
 
+    /**
+     * Is the component group collapsed?
+     *
+     * @var int
+     */
+    public $collapsed;
+
     /**
      * The validation rules.
      *
      * @var string[]
      */
     public $rules = [
-        'name'  => 'string',
-        'order' => 'int',
+        'name'      => 'string',
+        'order'     => 'int',
+        'collapsed' => 'int|between:0,3',
     ];
 
     /**
@@ -52,13 +65,15 @@ final class UpdateComponentGroupCommand
      * @param \CachetHQ\Cachet\Models\ComponentGroup $group
      * @param string                                 $name
      * @param int                                    $order
+     * @param int                                    $collapsed
      *
      * @return void
      */
-    public function __construct(ComponentGroup $group, $name, $order)
+    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

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Commands\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 

app/Bus/Commands/Incident/ReportIncidentCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Commands\Incident;
 
 final class ReportIncidentCommand
 {
@@ -93,7 +93,7 @@ final class ReportIncidentCommand
         'status'           => 'required|int|min:0|max:4',
         'message'          => 'string',
         'visible'          => 'bool',
-        'component_id'     => 'int',
+        'component_id'     => 'int|required_with:component_status',
         'component_status' => 'int|min:1|max:4|required_with:component_id',
         'notify'           => 'bool',
         'incident_date'    => 'string',
@@ -116,7 +116,7 @@ final class ReportIncidentCommand
      *
      * @return void
      */
-    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $incident_date, $template, $template_vars)
+    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;

app/Bus/Commands/Incident/ReportMaintenanceCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Commands\Incident;
 
 final class ReportMaintenanceCommand
 {

app/Bus/Commands/Incident/UpdateIncidentCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Commands\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
@@ -111,7 +111,7 @@ final class UpdateIncidentCommand
     /**
      * Create a new update incident command instance.
      *
-     * @param \CachetHQ\Cachet\Models\Incident $name
+     * @param \CachetHQ\Cachet\Models\Incident $incident
      * @param string                           $name
      * @param int                              $status
      * @param string                           $message
@@ -125,7 +125,7 @@ final class UpdateIncidentCommand
      *
      * @return void
      */
-    public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $incident_date, $template, $template_vars)
+    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;

app/Bus/Commands/Invite/ClaimInviteCommand.php

@@ -9,25 +9,27 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Invite;
+namespace CachetHQ\Cachet\Bus\Commands\Invite;
+
+use CachetHQ\Cachet\Models\Invite;
 
 final class ClaimInviteCommand
 {
     /**
-     * The invte to mark as claimed.
+     * The invite to mark as claimed.
      *
-     * @var \CachetHQ\Cachet\Model\Invite
+     * @var \CachetHQ\Cachet\Models\Invite
      */
     public $invite;
 
     /**
      * Create a new claim invite command instance.
      *
-     * @param \CachetHQ\Cachet\Model\Invite $invite
+     * @param \CachetHQ\Cachet\Models\Invite $invite
      *
      * @return void
      */
-    public function __construct($invite)
+    public function __construct(Invite $invite)
     {
         $this->invite = $invite;
     }

app/Bus/Commands/Metric/AddMetricCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Commands\Metric;
 
 final class AddMetricCommand
 {
@@ -62,6 +62,27 @@ final class AddMetricCommand
      */
     public $places;
 
+    /**
+     * The view to show the metric points in.
+     *
+     * @var int
+     */
+    public $default_view;
+
+    /**
+     * The threshold to buffer the metric points in.
+     *
+     * @var int
+     */
+    public $threshold;
+
+    /**
+     * The order of which to place the metric in.
+     *
+     * @var int
+     */
+    public $order;
+
     /**
      * The validation rules.
      *
@@ -76,6 +97,9 @@ final class AddMetricCommand
         'calc_type'     => 'int',
         'display_chart' => 'int',
         'places'        => 'int|between:0,4',
+        'default_view'  => 'int|between:0,3',
+        'threshold'     => 'numeric|between:0,10',
+        'order'         => 'int',
     ];
 
     /**
@@ -88,10 +112,13 @@ final class AddMetricCommand
      * @param int    $calc_type
      * @param int    $display_chart
      * @param int    $places
+     * @param int    $default_view
+     * @param int    $threshold
+     * @param int    $order
      *
      * @return void
      */
-    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places)
+    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view, $threshold, $order = 0)
     {
         $this->name = $name;
         $this->suffix = $suffix;
@@ -100,5 +127,8 @@ final class AddMetricCommand
         $this->calc_type = $calc_type;
         $this->display_chart = $display_chart;
         $this->places = $places;
+        $this->default_view = $default_view;
+        $this->threshold = $threshold;
+        $this->order = $order;
     }
 }

app/Bus/Commands/Metric/AddMetricPointCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Commands\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
@@ -42,7 +42,7 @@ final class AddMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 

app/Bus/Commands/Metric/RemoveMetricCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Commands\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 

app/Bus/Commands/Metric/RemoveMetricPointCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Commands\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 

app/Bus/Commands/Metric/UpdateMetricCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Commands\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
@@ -71,6 +71,27 @@ final class UpdateMetricCommand
      */
     public $places;
 
+    /**
+     * The view to show the metric points in.
+     *
+     * @var int
+     */
+    public $default_view;
+
+    /**
+     * The threshold to buffer the metric points in.
+     *
+     * @var int
+     */
+    public $threshold;
+
+    /**
+     * The order of which to place the metric in.
+     *
+     * @var int|null
+     */
+    public $order;
+
     /**
      * The validation rules.
      *
@@ -84,7 +105,10 @@ final class UpdateMetricCommand
         'default_value' => 'numeric',
         'calc_type'     => 'int|in:0,1',
         'display_chart' => 'int',
-        'places'        => 'numeric|min:0|max:4',
+        'places'        => 'numeric|between:0,4',
+        'default_view'  => 'numeric|between:0,4',
+        'threshold'     => 'numeric|between:0,10',
+        'order'         => 'int',
     ];
 
     /**
@@ -98,10 +122,13 @@ final class UpdateMetricCommand
      * @param int                            $calc_type
      * @param int                            $display_chart
      * @param int                            $places
+     * @param int                            $default_view
+     * @param int                            $threshold
+     * @param int|null                       $order
      *
      * @return void
      */
-    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places)
+    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view, $threshold, $order = null)
     {
         $this->metric = $metric;
         $this->name = $name;
@@ -111,5 +138,8 @@ final class UpdateMetricCommand
         $this->calc_type = $calc_type;
         $this->display_chart = $display_chart;
         $this->places = $places;
+        $this->default_view = $default_view;
+        $this->threshold = $threshold;
+        $this->order = $order;
     }
 }

app/Bus/Commands/Metric/UpdateMetricPointCommand.php

@@ -9,11 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Commands\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
 
+/**
+ * This is the update metric point command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class UpdateMetricPointCommand
 {
     /**
@@ -33,7 +38,7 @@ final class UpdateMetricPointCommand
     /**
      * The metric point value.
      *
-     * @var int
+     * @var float
      */
     public $value;
 
@@ -50,7 +55,7 @@ final class UpdateMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 
@@ -59,7 +64,7 @@ final class UpdateMetricPointCommand
      *
      * @param \CachetHQ\Cachet\Models\MetricPoint $point
      * @param \CachetHQ\Cachet\Models\Metric      $metric
-     * @param int                                 $value
+     * @param float                               $value
      * @param string                              $created_at
      *
      * @return void

app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php

@@ -9,8 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Subscriber;
+namespace CachetHQ\Cachet\Bus\Commands\Subscriber;
 
+/**
+ * This is the subscribe subscriber command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class SubscribeSubscriberCommand
 {
     /**
@@ -27,6 +32,13 @@ final class SubscribeSubscriberCommand
      */
     public $verified;
 
+    /**
+     * The list of subscriptions to set the subscriber up with.
+     *
+     * @var array|null
+     */
+    public $subscriptions;
+
     /**
      * The validation rules.
      *
@@ -39,14 +51,16 @@ final class SubscribeSubscriberCommand
     /**
      * Create a new subscribe subscriber command instance.
      *
-     * @param string $email
-     * @param bool   $verified
+     * @param string     $email
+     * @param bool       $verified
+     * @param array|null $subscriptions
      *
      * @return void
      */
-    public function __construct($email, $verified = false)
+    public function __construct($email, $verified = false, $subscriptions = null)
     {
         $this->email = $email;
         $this->verified = $verified;
+        $this->subscriptions = $subscriptions;
     }
 }

app/Bus/Commands/Subscriber/UnsubscribeSubscriberCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Subscriber;
+namespace CachetHQ\Cachet\Bus\Commands\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
@@ -25,7 +25,7 @@ final class UnsubscribeSubscriberCommand
     /**
      * Create a unsubscribe subscriber command instance.
      *
-     * @param string $subscriber
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */

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/UpdateSubscriberSubscriptionCommand.php

@@ -0,0 +1,50 @@
+<?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;
+
+/**
+ * This is the subscribe subscriber command.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
+final class UpdateSubscriberSubscriptionCommand
+{
+    /**
+     * The subscriber email.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * The subscriptions that we want to add.
+     *
+     * @var array|null
+     */
+    public $subscriptions;
+
+    /**
+     * Create a new subscribe subscriber command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     * @param null|array                         $subscriptions
+     *
+     * @return void
+     */
+    public function __construct($subscriber, $subscriptions = null)
+    {
+        $this->subscriber = $subscriber;
+        $this->subscriptions = $subscriptions;
+    }
+}

app/Bus/Commands/Subscriber/VerifySubscriberCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\Subscriber;
+namespace CachetHQ\Cachet\Bus\Commands\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
@@ -25,7 +25,7 @@ final class VerifySubscriberCommand
     /**
      * Create a verify subscriber command instance.
      *
-     * @param string $subscriber
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */

app/Bus/Commands/User/AddTeamMemberCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\User;
+namespace CachetHQ\Cachet\Bus\Commands\User;
 
 final class AddTeamMemberCommand
 {

app/Bus/Commands/User/GenerateApiTokenCommand.php

@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\User;
+namespace CachetHQ\Cachet\Bus\Commands\User;
+
+use CachetHQ\Cachet\Models\User;
 
 final class GenerateApiTokenCommand
 {
@@ -27,7 +29,7 @@ final class GenerateApiTokenCommand
      *
      * @return void
      */
-    public function __construct($user)
+    public function __construct(User $user)
     {
         $this->user = $user;
     }

app/Bus/Commands/User/InviteTeamMemberCommand.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\User;
+namespace CachetHQ\Cachet\Bus\Commands\User;
 
 final class InviteTeamMemberCommand
 {
     /**
-     * The invte emails.
+     * The invite emails.
      *
      * @var string[]
      */
@@ -32,11 +32,11 @@ final class InviteTeamMemberCommand
     /**
      * Create a new invite team member command instance.
      *
-     * @param array $email
+     * @param string[] $emails
      *
      * @return void
      */
-    public function __construct($emails)
+    public function __construct(array $emails)
     {
         $this->emails = $emails;
     }

app/Bus/Commands/User/RemoveUserCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\User;
+namespace CachetHQ\Cachet\Bus\Commands\User;
 
 use CachetHQ\Cachet\Models\User;
 

app/Bus/Commands/User/SignupUserCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Commands\User;
+namespace CachetHQ\Cachet\Bus\Commands\User;
 
 final class SignupUserCommand
 {

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

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Component;
+namespace CachetHQ\Cachet\Bus\Events\Component;
 
 use CachetHQ\Cachet\Models\Component;
 
-class ComponentWasAddedEvent
+final class ComponentWasAddedEvent implements ComponentEventInterface
 {
     /**
      * The component that was added.
@@ -25,6 +25,8 @@ class ComponentWasAddedEvent
     /**
      * Create a new component was added event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
      * @return void
      */
     public function __construct(Component $component)

app/Bus/Events/Component/ComponentWasRemovedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Component;
+namespace CachetHQ\Cachet\Bus\Events\Component;
 
 use CachetHQ\Cachet\Models\Component;
 
-class ComponentWasRemovedEvent
+final class ComponentWasRemovedEvent implements ComponentEventInterface
 {
     /**
      * The component that was removed.
@@ -25,6 +25,8 @@ class ComponentWasRemovedEvent
     /**
      * Create a new component was removed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
      * @return void
      */
     public function __construct(Component $component)

app/Bus/Events/Component/ComponentWasUpdatedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Component;
+namespace CachetHQ\Cachet\Bus\Events\Component;
 
 use CachetHQ\Cachet\Models\Component;
 
-class ComponentWasUpdatedEvent
+final class ComponentWasUpdatedEvent implements ComponentEventInterface
 {
     /**
      * The component that was updated.
@@ -25,6 +25,8 @@ class ComponentWasUpdatedEvent
     /**
      * Create a new component was updated event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
      * @return void
      */
     public function __construct(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

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Events\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
-class ComponentGroupWasAddedEvent
+final class ComponentGroupWasAddedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was added.
@@ -25,6 +25,8 @@ class ComponentGroupWasAddedEvent
     /**
      * Create a new component group was added event instance.
      *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
      * @return void
      */
     public function __construct(ComponentGroup $group)

app/Bus/Events/ComponentGroup/ComponentGroupWasRemovedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Events\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
-class ComponentGroupWasRemovedEvent
+final class ComponentGroupWasRemovedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was removed.
@@ -25,6 +25,8 @@ class ComponentGroupWasRemovedEvent
     /**
      * Create a new component group was removed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
      * @return void
      */
     public function __construct(ComponentGroup $group)

app/Bus/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Events\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
-class ComponentGroupWasUpdatedEvent
+final class ComponentGroupWasUpdatedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was updated.
@@ -25,6 +25,8 @@ class ComponentGroupWasUpdatedEvent
     /**
      * Create a new component group was updated event instance.
      *
+     * @param \CachetHQ\Cachet\Models\ComponentGroup $group
+     *
      * @return void
      */
     public function __construct(ComponentGroup $group)

app/Bus/Events/EventInterface.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\User;
+namespace CachetHQ\Cachet\Bus\Events;
 
-interface UserEventInterface
+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

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

app/Bus/Events/Incident/IncidentWasReportedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Incident;
+namespace CachetHQ\Cachet\Bus\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class IncidentWasReportedEvent
+final class IncidentWasReportedEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been reported.
@@ -25,6 +25,8 @@ class IncidentWasReportedEvent
     /**
      * 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

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

app/Bus/Events/Incident/MaintenanceWasScheduledEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Incident;
+namespace CachetHQ\Cachet\Bus\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class MaintenanceWasScheduledEvent
+final class MaintenanceWasScheduledEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been reported.
@@ -25,6 +25,8 @@ class MaintenanceWasScheduledEvent
     /**
      * 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

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Invite;
+namespace CachetHQ\Cachet\Bus\Events\Invite;
 
 use CachetHQ\Cachet\Models\Invite;
 
-final class InviteWasClaimed
+final class InviteWasClaimedEvent implements InviteEventInterface
 {
     /**
      * The invite that has been claimed.

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

@@ -9,26 +9,28 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Metric;
+namespace CachetHQ\Cachet\Bus\Events\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 
-class MetricPointWasAddedEvent
+final class MetricPointWasAddedEvent implements MetricEventInterface
 {
     /**
      * The metric point that was added.
      *
      * @var \CachetHQ\Cachet\Models\MetricPoint
      */
-    public $metric;
+    public $metricPoint;
 
     /**
      * Create a new metric point was added event instance.
      *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $metricPoint
+     *
      * @return void
      */
-    public function __construct(MetricPoint $metric)
+    public function __construct(MetricPoint $metricPoint)
     {
-        $this->metric = $metric;
+        $this->metricPoint = $metricPoint;
     }
 }

app/Bus/Events/Metric/MetricPointWasRemovedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Metric;
+namespace CachetHQ\Cachet\Bus\Events\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 
-class MetricPointWasRemovedEvent
+final class MetricPointWasRemovedEvent implements MetricEventInterface
 {
     /**
      * The metric point that was removed.
@@ -25,6 +25,8 @@ class MetricPointWasRemovedEvent
     /**
      * Create a new metric point was removed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $memtricPoint
+     *
      * @return void
      */
     public function __construct(MetricPoint $metricPoint)

app/Bus/Events/Metric/MetricPointWasUpdatedEvent.php

@@ -9,26 +9,28 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Metric;
+namespace CachetHQ\Cachet\Bus\Events\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 
-class MetricPointWasUpdatedEvent
+final class MetricPointWasUpdatedEvent implements MetricEventInterface
 {
     /**
      * The metric point that was updated.
      *
      * @var \CachetHQ\Cachet\Models\MetricPoint
      */
-    public $point;
+    public $metricPoint;
 
     /**
      * Create a new metric point was updated event instance.
      *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $metricPoint
+     *
      * @return void
      */
-    public function __construct(MetricPoint $point)
+    public function __construct(MetricPoint $metricPoint)
     {
-        $this->point = $point;
+        $this->metricPoint = $metricPoint;
     }
 }

app/Bus/Events/Metric/MetricWasAddedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Metric;
+namespace CachetHQ\Cachet\Bus\Events\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
-class MetricWasAddedEvent
+final class MetricWasAddedEvent implements MetricEventInterface
 {
     /**
      * The metric that was added.
@@ -25,6 +25,8 @@ class MetricWasAddedEvent
     /**
      * Create a new metric was added event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
      * @return void
      */
     public function __construct(Metric $metric)

app/Bus/Events/Metric/MetricWasRemovedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Metric;
+namespace CachetHQ\Cachet\Bus\Events\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
-class MetricWasRemovedEvent
+final class MetricWasRemovedEvent implements MetricEventInterface
 {
     /**
      * The metric that was removed.
@@ -25,6 +25,8 @@ class MetricWasRemovedEvent
     /**
      * Create a new metric was removed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
      * @return void
      */
     public function __construct(Metric $metric)

app/Bus/Events/Metric/MetricWasUpdatedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Metric;
+namespace CachetHQ\Cachet\Bus\Events\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
-class MetricWasUpdatedEvent
+final class MetricWasUpdatedEvent implements MetricEventInterface
 {
     /**
      * The metric that was updated.
@@ -25,6 +25,8 @@ class MetricWasUpdatedEvent
     /**
      * Create a new metric was updated event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
      * @return void
      */
     public function __construct(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

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Subscriber;
+namespace CachetHQ\Cachet\Bus\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class SubscriberHasSubscribedEvent
+final class SubscriberHasSubscribedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has subscribed.
@@ -25,6 +25,8 @@ class SubscriberHasSubscribedEvent
     /**
      * Create a new subscriber has subscribed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
      * @return void
      */
     public function __construct(Subscriber $subscriber)

app/Bus/Events/Subscriber/SubscriberHasUnsubscribedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Subscriber;
+namespace CachetHQ\Cachet\Bus\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class SubscriberHasUnsubscribedEvent
+final class SubscriberHasUnsubscribedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has unsubscribed.
@@ -25,6 +25,8 @@ class SubscriberHasUnsubscribedEvent
     /**
      * Create a new subscriber has unsubscribed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
      * @return void
      */
     public function __construct(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

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\Subscriber;
+namespace CachetHQ\Cachet\Bus\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class SubscriberHasVerifiedEvent
+final class SubscriberHasVerifiedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has verified.
@@ -25,6 +25,8 @@ class SubscriberHasVerifiedEvent
     /**
      * Create a new subscriber has subscribed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
      * @return void
      */
     public function __construct(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

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\User;
+namespace CachetHQ\Cachet\Bus\Events\User;
 
 use CachetHQ\Cachet\Models\User;
 
@@ -25,6 +25,8 @@ final class UserWasAddedEvent implements UserEventInterface
     /**
      * Create a new user was added event instance.
      *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
      * @return void
      */
     public function __construct(User $user)

app/Bus/Events/User/UserWasInvitedEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\User;
+namespace CachetHQ\Cachet\Bus\Events\User;
 
 use CachetHQ\Cachet\Models\Invite;
 
-final class UserWasInvitedEvent
+final class UserWasInvitedEvent implements UserEventInterface
 {
     /**
      * The invite that has been added.
@@ -25,6 +25,8 @@ final class UserWasInvitedEvent
     /**
      * Create a new user was invite event instance.
      *
+     * @param \CachetHQ\Cachet\Models\Invite $invite
+     *
      * @return void
      */
     public function __construct(Invite $invite)

app/Bus/Events/User/UserWasRemovedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Events\User;
+namespace CachetHQ\Cachet\Bus\Events\User;
 
 use CachetHQ\Cachet\Models\User;
 
@@ -25,6 +25,8 @@ final class UserWasRemovedEvent implements UserEventInterface
     /**
      * Create a new user was removed event instance.
      *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
      * @return void
      */
     public function __construct(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/Handlers/Commands/Component/AddComponentCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Component;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Component;
 
-use CachetHQ\Cachet\Commands\Component\AddComponentCommand;
-use CachetHQ\Cachet\Events\Component\ComponentWasAddedEvent;
+use CachetHQ\Cachet\Bus\Commands\Component\AddComponentCommand;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasAddedEvent;
 use CachetHQ\Cachet\Models\Component;
 
 class AddComponentCommandHandler
@@ -20,7 +20,7 @@ class AddComponentCommandHandler
     /**
      * Handle the add component command.
      *
-     * @param \CachetHQ\Cachet\Commands\Component\AddComponentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Component\AddComponentCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Component
      */
@@ -36,7 +36,7 @@ class AddComponentCommandHandler
     /**
      * Filter the command data.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\AddComponentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\AddComponentCommand $command
      *
      * @return array
      */

app/Bus/Handlers/Commands/Component/RemoveComponentCommandHandler.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Component;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Component;
 
-use CachetHQ\Cachet\Commands\Component\RemoveComponentCommand;
-use CachetHQ\Cachet\Events\Component\ComponentWasRemovedEvent;
+use CachetHQ\Cachet\Bus\Commands\Component\RemoveComponentCommand;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent;
 
 class RemoveComponentCommandHandler
 {
     /**
      * Handle the remove component command.
      *
-     * @param \CachetHQ\Cachet\Commands\Component\RemoveComponentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Component\RemoveComponentCommand $command
      *
      * @return void
      */

app/Bus/Handlers/Commands/Component/UpdateComponentCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Component;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Component;
 
-use CachetHQ\Cachet\Commands\Component\UpdateComponentCommand;
-use CachetHQ\Cachet\Events\Component\ComponentWasUpdatedEvent;
+use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
 
 class UpdateComponentCommandHandler
@@ -20,7 +20,7 @@ class UpdateComponentCommandHandler
     /**
      * Handle the update component command.
      *
-     * @param \CachetHQ\Cachet\Commands\Component\UpdateComponentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Component
      */
@@ -38,7 +38,7 @@ class UpdateComponentCommandHandler
     /**
      * Filter the command data.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\UpdateComponentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\UpdateComponentCommand $command
      *
      * @return array
      */

app/Bus/Handlers/Commands/ComponentGroup/AddComponentGroupCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\ComponentGroup;
 
-use CachetHQ\Cachet\Commands\ComponentGroup\AddComponentGroupCommand;
-use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasAddedEvent;
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\AddComponentGroupCommand;
+use CachetHQ\Cachet\Bus\Events\ComponentGroup\ComponentGroupWasAddedEvent;
 use CachetHQ\Cachet\Models\ComponentGroup;
 
 class AddComponentGroupCommandHandler
@@ -20,15 +20,16 @@ class AddComponentGroupCommandHandler
     /**
      * Handle the add component group command.
      *
-     * @param \CachetHQ\Cachet\Commands\ComponentGroup\AddComponentGroupCommand $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,
+            'name'      => $command->name,
+            'order'     => $command->order,
+            'collapsed' => $command->collapsed,
         ]);
 
         event(new ComponentGroupWasAddedEvent($group));

app/Bus/Handlers/Commands/ComponentGroup/RemoveComponentGroupCommandHandler.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\ComponentGroup;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\ComponentGroup;
 
-use CachetHQ\Cachet\Commands\ComponentGroup\RemoveComponentGroupCommand;
-use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasRemovedEvent;
+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\Commands\ComponentGroup\RemoveComponentGroupCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\ComponentGroup\RemoveComponentGroupCommand $command
      *
      * @return void
      */

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

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Incident;
 
-use CachetHQ\Cachet\Commands\Incident\RemoveIncidentCommand;
-use CachetHQ\Cachet\Events\Incident\IncidentWasRemovedEvent;
+use CachetHQ\Cachet\Bus\Commands\Incident\RemoveIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasRemovedEvent;
 
 class RemoveIncidentCommandHandler
 {
     /**
      * Handle the remove incident command.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\RemoveIncidentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\RemoveIncidentCommand $command
      *
      * @return void
      */

app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php

@@ -9,17 +9,22 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Incident;
 
-use CachetHQ\Cachet\Commands\Incident\ReportIncidentCommand;
+use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
 use CachetHQ\Cachet\Dates\DateFactory;
-use CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use Twig_Loader_String;
-use TwigBridge\Facade\Twig;
+use TwigBridge\Bridge;
 
+/**
+ * This is the report incident command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class ReportIncidentCommandHandler
 {
     /**
@@ -29,38 +34,48 @@ class ReportIncidentCommandHandler
      */
     protected $dates;
 
+    /**
+     * The twig bridge instance.
+     *
+     * @var \TwigBridge\Bridge
+     */
+    protected $twig;
+
     /**
      * Create a new report incident command handler instance.
      *
      * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     * @param \TwigBridge\Bridge                 $twig
      *
      * @return void
      */
-    public function __construct(DateFactory $dates)
+    public function __construct(DateFactory $dates, Bridge $twig)
     {
         $this->dates = $dates;
+        $this->twig = $twig;
     }
 
     /**
      * Handle the report incident command.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\ReportIncidentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Incident
      */
     public function handle(ReportIncidentCommand $command)
     {
-        if ($command->template) {
-            $command->message = $this->parseIncidentTemplate($command->template, $command->template_vars);
-        }
-
         $data = [
             'name'    => $command->name,
             'status'  => $command->status,
-            'message' => $command->message,
             'visible' => $command->visible,
         ];
 
+        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;
@@ -68,7 +83,7 @@ class ReportIncidentCommandHandler
 
         // The incident occurred at a different time.
         if ($command->incident_date) {
-            $incidentDate = $this->dates->createNormalized('d/m/Y H:i', $command->incident_date);
+            $incidentDate = $this->dates->create('d/m/Y H:i', $command->incident_date);
 
             $data['created_at'] = $incidentDate;
             $data['updated_at'] = $incidentDate;
@@ -101,9 +116,13 @@ class ReportIncidentCommandHandler
      */
     protected function parseIncidentTemplate($templateSlug, $vars)
     {
-        Twig::setLoader(new Twig_Loader_String());
+        if ($vars === null) {
+            $vars = [];
+        }
+
+        $this->twig->setLoader(new Twig_Loader_String());
         $template = IncidentTemplate::forSlug($templateSlug)->first();
 
-        return Twig::render($template->template, $vars);
+        return $this->twig->render($template->template, $vars);
     }
 }

app/Bus/Handlers/Commands/Incident/ReportMaintenanceCommandHandler.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Incident;
 
-use CachetHQ\Cachet\Commands\Incident\ReportMaintenanceCommand;
+use CachetHQ\Cachet\Bus\Commands\Incident\ReportMaintenanceCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent;
 use CachetHQ\Cachet\Dates\DateFactory;
-use CachetHQ\Cachet\Events\Incident\MaintenanceWasScheduledEvent;
 use CachetHQ\Cachet\Models\Incident;
 
 class ReportMaintenanceCommandHandler
@@ -26,7 +26,7 @@ class ReportMaintenanceCommandHandler
     protected $dates;
 
     /**
-     * Create a new report maintanance command handler instance.
+     * Create a new report maintenance command handler instance.
      *
      * @param \CachetHQ\Cachet\Dates\DateFactory $dates
      *
@@ -40,13 +40,13 @@ class ReportMaintenanceCommandHandler
     /**
      * Handle the report maintenance command.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\ReportMaintenanceCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\ReportMaintenanceCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Incident
      */
     public function handle(ReportMaintenanceCommand $command)
     {
-        $scheduledAt = $this->dates->createNormalized('d/m/Y H:i', $command->timestamp);
+        $scheduledAt = $this->dates->create('d/m/Y H:i', $command->timestamp);
 
         $maintenanceEvent = Incident::create([
             'name'         => $command->name,

app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php

@@ -9,17 +9,22 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Incident;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Incident;
 
-use CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand;
+use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent;
 use CachetHQ\Cachet\Dates\DateFactory;
-use CachetHQ\Cachet\Events\Incident\IncidentWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use Twig_Loader_String;
-use TwigBridge\Facade\Twig;
+use TwigBridge\Bridge;
 
+/**
+ * This is the update incident command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class UpdateIncidentCommandHandler
 {
     /**
@@ -29,22 +34,31 @@ class UpdateIncidentCommandHandler
      */
     protected $dates;
 
+    /**
+     * The twig bridge instance.
+     *
+     * @var \TwigBridge\Bridge
+     */
+    protected $twig;
+
     /**
      * Create a new update incident command handler instance.
      *
      * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     * @param \TwigBridge\Bridge                 $twig
      *
      * @return void
      */
-    public function __construct(DateFactory $dates)
+    public function __construct(DateFactory $dates, Bridge $twig)
     {
         $this->dates = $dates;
+        $this->twig = $twig;
     }
 
     /**
      * Handle the update incident command.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Incident
      */
@@ -59,7 +73,7 @@ class UpdateIncidentCommandHandler
 
         // The incident occurred at a different time.
         if ($command->incident_date) {
-            $incidentDate = $this->dates->createNormalized('d/m/Y H:i', $command->incident_date);
+            $incidentDate = $this->dates->create('d/m/Y H:i', $command->incident_date);
 
             $incident->update([
                 'created_at' => $incidentDate,
@@ -82,7 +96,7 @@ class UpdateIncidentCommandHandler
     /**
      * Filter the command data.
      *
-     * @param \CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand $command
      *
      * @return array
      */
@@ -113,9 +127,9 @@ class UpdateIncidentCommandHandler
      */
     protected function parseIncidentTemplate($templateSlug, $vars)
     {
-        Twig::setLoader(new Twig_Loader_String());
+        $this->twig->setLoader(new Twig_Loader_String());
         $template = IncidentTemplate::forSlug($templateSlug)->first();
 
-        return Twig::render($template->template, $vars);
+        return $this->twig->render($template->template, $vars);
     }
 }

app/Bus/Handlers/Commands/Invite/ClaimInviteCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Invite;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Invite;
 
-use CachetHQ\Cachet\Commands\Invite\ClaimInviteCommand;
-use CachetHQ\Cachet\Events\Invite\InviteWasClaimed;
+use CachetHQ\Cachet\Bus\Commands\Invite\ClaimInviteCommand;
+use CachetHQ\Cachet\Bus\Events\Invite\InviteWasClaimedEvent;
 use Carbon\Carbon;
 
 class ClaimInviteCommandHandler
@@ -20,7 +20,7 @@ class ClaimInviteCommandHandler
     /**
      * Handle the claim invite command.
      *
-     * @param \CachetHQ\Cachet\Commands\User\ClaimInviteCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\ClaimInviteCommand $command
      *
      * @return void
      */
@@ -31,6 +31,6 @@ class ClaimInviteCommandHandler
         $invite->claimed_at = Carbon::now();
         $invite->save();
 
-        event(new InviteWasClaimed($invite));
+        event(new InviteWasClaimedEvent($invite));
     }
 }

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

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric;
 
-use CachetHQ\Cachet\Commands\Metric\AddMetricCommand;
-use CachetHQ\Cachet\Events\Metric\MetricWasAddedEvent;
+use CachetHQ\Cachet\Bus\Commands\Metric\AddMetricCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricWasAddedEvent;
 use CachetHQ\Cachet\Models\Metric;
 
 class AddMetricCommandHandler
@@ -20,7 +20,7 @@ class AddMetricCommandHandler
     /**
      * Handle the add metric command.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\AddMetricCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\AddMetricCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Metric
      */
@@ -34,6 +34,9 @@ class AddMetricCommandHandler
             'calc_type'     => $command->calc_type,
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
+            'default_view'  => $command->default_view,
+            'threshold'     => $command->threshold,
+            'order'         => $command->order,
         ]);
 
         event(new MetricWasAddedEvent($metric));

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

@@ -0,0 +1,84 @@
+<?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;
+use Carbon\Carbon;
+
+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;
+
+        // Do we have an existing point with the same value?
+        $point = $this->findOrCreatePoint($command);
+
+        $point->increment('counter', 1);
+
+        event(new MetricPointWasAddedEvent($point));
+
+        return $point;
+    }
+
+    protected function findOrCreatePoint(AddMetricPointCommand $command)
+    {
+        $buffer = Carbon::now()->subMinutes($command->metric->threshold);
+        $point = MetricPoint::where('metric_id', $command->metric->id)->where('value', $command->value)->where('created_at', '>=', $buffer)->first();
+
+        if ($point) {
+            return $point;
+        }
+
+        $data = [
+            'metric_id' => $command->metric->id,
+            'value'     => $command->value,
+            'counter'   => 0,
+        ];
+
+        if ($command->created_at) {
+            $data['created_at'] = $this->dates->create('U', $command->created_at)->format('Y-m-d H:i:s');
+        }
+
+        return MetricPoint::create($data);
+    }
+}

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

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric;
 
-use CachetHQ\Cachet\Commands\Metric\RemoveMetricCommand;
-use CachetHQ\Cachet\Events\Metric\MetricWasRemovedEvent;
+use CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricWasRemovedEvent;
 use CachetHQ\Cachet\Models\Metric;
 
 class RemoveMetricCommandHandler
@@ -20,7 +20,7 @@ class RemoveMetricCommandHandler
     /**
      * Handle the remove metric command.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\RemoveMetricCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricCommand $command
      *
      * @return void
      */

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

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric;
 
-use CachetHQ\Cachet\Commands\Metric\RemoveMetricPointCommand;
-use CachetHQ\Cachet\Events\Metric\MetricPointWasRemovedEvent;
+use CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricPointCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasRemovedEvent;
 use CachetHQ\Cachet\Models\Metric;
 
 class RemoveMetricPointCommandHandler
@@ -20,7 +20,7 @@ class RemoveMetricPointCommandHandler
     /**
      * Handle the remove metric point command.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\RemoveMetricPointCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\RemoveMetricPointCommand $command
      *
      * @return void
      */

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

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric;
 
-use CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand;
-use CachetHQ\Cachet\Events\Metric\MetricWasUpdatedEvent;
+use CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Metric;
 
 class UpdateMetricCommandHandler
@@ -20,7 +20,7 @@ class UpdateMetricCommandHandler
     /**
      * Handle the update metric command.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Metric
      */
@@ -38,7 +38,7 @@ class UpdateMetricCommandHandler
     /**
      * Filter the command data.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricCommand $command
      *
      * @return array
      */
@@ -52,6 +52,9 @@ class UpdateMetricCommandHandler
             'calc_type'     => $command->calc_type,
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
+            'default_view'  => $command->default_view,
+            'threshold'     => $command->threshold,
+            'order'         => $command->order,
         ];
 
         return array_filter($params, function ($val) {

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

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Metric;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric;
 
-use CachetHQ\Cachet\Commands\Metric\UpdateMetricPointCommand;
+use CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricPointCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasUpdatedEvent;
 use CachetHQ\Cachet\Dates\DateFactory;
-use CachetHQ\Cachet\Events\Metric\MetricPointWasUpdatedEvent;
 
 class UpdateMetricPointCommandHandler
 {
@@ -39,7 +39,7 @@ class UpdateMetricPointCommandHandler
     /**
      * Handle the update metric point command.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricPointCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricPointCommand $command
      *
      * @return \CachetHQ\Cachet\Models\MetricPoint
      */
@@ -51,7 +51,7 @@ class UpdateMetricPointCommandHandler
 
         $data = [
             'metric_id' => $metric->id,
-            'value'     => $command->value,
+            'value'     => (float) $command->value,
         ];
 
         if ($createdAt) {

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\Models\Component;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the subscribe subscriber command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
+class SubscribeSubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(SubscribeSubscriberCommand $command)
+    {
+        if ($subscriber = Subscriber::where('email', $command->email)->first()) {
+            return $subscriber;
+        }
+
+        $subscriber = Subscriber::firstOrCreate(['email' => $command->email]);
+
+        // Decide what to subscribe the subscriber to.
+        if ($subscriptions = $command->subscriptions) {
+            $subscriptions = Component::whereIn('id', $subscriptions);
+        } else {
+            $subscriptions = Component::all();
+        }
+
+        foreach ($subscriptions as $component) {
+            Subscription::create([
+                'subscriber_id' => $subscriber->id,
+                'component_id'  => $component->id,
+            ]);
+        }
+
+        if ($command->verified) {
+            dispatch(new VerifySubscriberCommand($subscriber));
+        } else {
+            event(new SubscriberHasSubscribedEvent($subscriber));
+        }
+
+        return $subscriber;
+    }
+}

app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 
-use CachetHQ\Cachet\Commands\Subscriber\UnsubscribeSubscriberCommand;
-use CachetHQ\Cachet\Events\Subscriber\SubscriberHasUnsubscribedEvent;
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 
 class UnsubscribeSubscriberCommandHandler
@@ -20,7 +20,7 @@ class UnsubscribeSubscriberCommandHandler
     /**
      * Handle the subscribe customer command.
      *
-     * @param \CachetHQ\Cachet\Commands\Subscriber\UnsubscribeSubscriberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand $command
      *
      * @return void
      */

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/UpdateSubscriberSubscriptionCommandHandler.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\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the subscribe subscriber command handler.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
+class UpdateSubscriberSubscriptionCommandHandler
+{
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(UpdateSubscriberSubscriptionCommand $command)
+    {
+        $subscriber = $command->subscriber;
+        $subscriptions = $command->subscriptions ?: [];
+
+        $components = Component::all();
+
+        $updateSubscriptions = $components->filter(function ($item) use ($subscriptions) {
+            return in_array($item->id, $subscriptions);
+        });
+
+        $subscriber->global = ($updateSubscriptions->count() === $components->count());
+
+        $subscriber->subscriptions()->delete();
+
+        if (!$updateSubscriptions->isEmpty()) {
+            foreach ($updateSubscriptions as $subscription) {
+                Subscription::firstOrCreate([
+                    'subscriber_id' => $subscriber->id,
+                    'component_id'  => $subscription->id,
+                ]);
+            }
+        }
+
+        $subscriber->save();
+
+        event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+
+        return $subscriber;
+    }
+}

app/Bus/Handlers/Commands/Subscriber/VerifySubscriberCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\Subscriber;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 
-use CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand;
-use CachetHQ\Cachet\Events\Subscriber\SubscriberHasVerifiedEvent;
+use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasVerifiedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Carbon\Carbon;
 
@@ -21,7 +21,7 @@ class VerifySubscriberCommandHandler
     /**
      * Handle the subscribe customer command.
      *
-     * @param \CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand $command
      *
      * @return void
      */
@@ -29,6 +29,7 @@ class VerifySubscriberCommandHandler
     {
         $subscriber = $command->subscriber;
 
+        // Mark the subscriber as verified.
         $subscriber->verified_at = Carbon::now();
         $subscriber->save();
 

app/Bus/Handlers/Commands/User/AddTeamMemberCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\User;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Commands\User\AddTeamMemberCommand;
-use CachetHQ\Cachet\Events\User\UserWasAddedEvent;
+use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasAddedEvent;
 use CachetHQ\Cachet\Models\User;
 
 class AddTeamMemberCommandHandler
@@ -20,7 +20,7 @@ class AddTeamMemberCommandHandler
     /**
      * Handle the add team member command.
      *
-     * @param \CachetHQ\Cachet\Commands\User\AddTeamMemberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand $command
      *
      * @return \CachetHQ\Cachet\Models\User
      */

app/Bus/Handlers/Commands/User/GenerateApiTokenCommandHandler.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\User;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Commands\User\GenerateApiTokenCommand;
+use CachetHQ\Cachet\Bus\Commands\User\GenerateApiTokenCommand;
 use CachetHQ\Cachet\Models\User;
 
 class GenerateApiTokenCommandHandler
@@ -19,7 +19,7 @@ class GenerateApiTokenCommandHandler
     /**
      * Handle the generate api key command.
      *
-     * @param \CachetHQ\Cachet\Commands\User\GenerateApiTokenCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\GenerateApiTokenCommand $command
      *
      * @return void
      */

app/Bus/Handlers/Commands/User/InviteTeamMemberCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\User;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Commands\User\InviteTeamMemberCommand;
-use CachetHQ\Cachet\Events\User\UserWasInvitedEvent;
+use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
 use CachetHQ\Cachet\Models\Invite;
 
 class InviteTeamMemberCommandHandler
@@ -20,7 +20,7 @@ class InviteTeamMemberCommandHandler
     /**
      * Handle the invite team member command.
      *
-     * @param \CachetHQ\Cachet\Commands\User\InviteTeamMemberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand $command
      *
      * @return void
      */

app/Bus/Handlers/Commands/User/RemoveUserCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\User;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Commands\User\RemoveUserCommand;
-use CachetHQ\Cachet\Events\User\UserWasRemovedEvent;
+use CachetHQ\Cachet\Bus\Commands\User\RemoveUserCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasRemovedEvent;
 use CachetHQ\Cachet\Models\User;
 
 class RemoveUserCommandHandler
@@ -20,7 +20,7 @@ class RemoveUserCommandHandler
     /**
      * Handle the remove user command.
      *
-     * @param \CachetHQ\Cachet\Commands\User\RemoveUserCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\RemoveUserCommand $command
      *
      * @return void
      */

app/Bus/Handlers/Commands/User/SignupUserCommandHandler.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Commands\User;
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Commands\User\SignupUserCommand;
-use CachetHQ\Cachet\Events\User\UserWasAddedEvent;
+use CachetHQ\Cachet\Bus\Commands\User\SignupUserCommand;
+use CachetHQ\Cachet\Bus\Events\User\UserWasAddedEvent;
 use CachetHQ\Cachet\Models\User;
 
 class SignupUserCommandHandler
@@ -20,7 +20,7 @@ class SignupUserCommandHandler
     /**
      * Handle the signup user command.
      *
-     * @param \CachetHQ\Cachet\Commands\User\SignupUserCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\SignupUserCommand $command
      *
      * @return \CachetHQ\Cachet\Models\User
      */
@@ -30,7 +30,7 @@ class SignupUserCommandHandler
             'username' => $command->username,
             'password' => $command->password,
             'email'    => $command->email,
-            'level'    => 2,
+            'level'    => User::LEVEL_USER,
         ]);
 
         event(new UserWasAddedEvent($user));

app/Bus/Handlers/Events/Component/CleanupComponentSubscriptionsHandler.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\Events\Component;
+
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the cleanup component subscriptions handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class CleanupComponentSubscriptionsHandler
+{
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent $event
+     *
+     * @return void
+     */
+    public function handle(ComponentWasRemovedEvent $event)
+    {
+        $component = $event->component;
+        $subscription = Subscription::forComponent($component->id);
+
+        // Cleanup the subscriptions.
+        $subscription->delete();
+    }
+}

app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php

@@ -0,0 +1,113 @@
+<?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\Subscriber;
+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;
+
+    /**
+     * 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\Component\ComponentWasUpdatedEvent $event
+     *
+     * @return void
+     */
+    public function handle(ComponentWasUpdatedEvent $event)
+    {
+        $component = $event->component;
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($component, $subscriber);
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($component, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Models\Component  $component
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(Component $component, Subscriber $subscriber)
+    {
+        $component = AutoPresenter::decorate($component);
+
+        $mail = [
+            'subject'                => trans('cachet.subscriber.email.component.subject'),
+            'component_name'         => $component->name,
+            'component_human_status' => $component->human_status,
+        ];
+
+        $mail['email'] = $subscriber->email;
+        $mail['manage_link'] = route('subscribe.manage', ['code' => $subscriber->verify_code]);
+
+        $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,133 @@
+<?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\IncidentWasReportedEvent $event
+     *
+     * @return void
+     */
+    public function handle(IncidentWasReportedEvent $event)
+    {
+        if (!$event->incident->notify) {
+            return false;
+        }
+
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 0) {
+            return;
+        }
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+
+        if (!$event->incident->component) {
+            return;
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($event->incident->component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\IncidentWasReportedEvent $event
+     * @param \CachetHQ\Cachet\Models\Subscriber                   $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(IncidentWasReportedEvent $event, $subscriber)
+    {
+        $incident = AutoPresenter::decorate($event->incident);
+        $component = AutoPresenter::decorate($event->incident->component);
+
+        $mail = [
+            'email'            => $subscriber->email,
+            'subject'          => trans('cachet.subscriber.email.incident.subject', [
+                'status' => $incident->human_status,
+                'name'   => $incident->name,
+            ]),
+            'has_component'    => ($event->incident->component) ? true : false,
+            'component_name'   => $component ? $component->name : null,
+            'name'             => $incident->name,
+            'timestamp'        => $incident->created_at_formatted,
+            'status'           => $incident->human_status,
+            'html_content'     => $incident->formattedMessage,
+            'text_content'     => $incident->message,
+            'token'            => $subscriber->token,
+            'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
+            '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,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\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\MaintenanceWasScheduledEvent $event
+     *
+     * @return void
+     */
+    public function handle(MaintenanceWasScheduledEvent $event)
+    {
+        if (!$event->incident->notify) {
+            return false;
+        }
+
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 0) {
+            return;
+        }
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+
+        if (!$event->incident->component) {
+            return;
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($event->incident->component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceWasScheduledEvent $event
+     * @param \CachetHQ\Cachet\Models\Subscriber                       $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(MaintenanceWasScheduledEvent $event, $subscriber)
+    {
+        $incident = AutoPresenter::decorate($event->incident);
+        $component = AutoPresenter::decorate($event->incident->component);
+
+        $mail = [
+            'email'            => $subscriber->email,
+            'subject'          => trans('cachet.subscriber.email.maintenance.subject', [
+                'name'   => $incident->name,
+            ]),
+            'has_component'    => ($event->incident->component) ? true : false,
+            'component_name'   => $component ? $component->name : null,
+            'name'             => $incident->name,
+            'timestamp'        => $incident->scheduled_at_formatted,
+            'status'           => $incident->human_status,
+            'html_content'     => $incident->formattedMessage,
+            'text_content'     => $incident->message,
+            'token'            => $subscriber->token,
+            'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
+            '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']);
+        });
+    }
+}