Back to dev

Fix the Str import. Fixes #1749

.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
-*.less linguist-vendored
+*.scss linguist-vendored
+/.github export-ignore
+/tests export-ignore

.github/ISSUE_TEMPLATE

@@ -0,0 +1,25 @@
+Before submitting your issue, please make sure that you've checked all of the checkboxes below.
+
+- [ ] You're running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
+- [ ] Ensure that you're running at least PHP 5.5.9, you can check this by running `php -v`
+- [ ] You've ran `rm -rf bootstrap/cache/*` from the root of your Cachet installation.
+
+To help us better understand your issue, please answer the following — cheers!
+
+### Your setup
+
+- *What version of Cachet?*
+- *What database driver? MySQL? Postgres? SQLite?*
+- *What version of PHP?*
+
+### 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.*

.travis.yml

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

CONTRIBUTING.md

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

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,16 @@
 # 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)
+[![Quality Score](https://img.shields.io/scrutinizer/g/CachetHQ/Cachet.svg?style=flat-square)](https://scrutinizer-ci.com/g/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.png)](http://translate.cachethq.io/project/cachet)
+[![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.
+
 ## Features
 
 - List your services components
@@ -28,15 +31,46 @@ 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
 
-Theses extra dependencies are required to develop Cachet:
+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, Bower and Gulp.
+2. Install the assets; `bower install`
+3. Modify the SCSS files in `./resources/assets/sass/`
+4. 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
 
@@ -50,15 +84,33 @@ You can now find our documentation at [https://docs.cachethq.io](https://docs.ca
 
 To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following:
 
-- **Username:** test@test.com
+- **Username:** test or test@test.com
 - **Password:** test123
 
 The demo is reset every half hour.
 
+### 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).
 
 ## Security Vulnerabilities
 
-If you discover a security vulnerability within Cachet, please send an e-mail us at support@alt-three.com. All security vulnerabilities will be promptly addressed.
+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
+
+## Donations
+
+Cachet is open source, we don't have any licensing models and don't run ads on the [website](https://cachethq.io).
+
+If you'd like to donate towards further development of Cachet you can do so via Paypal.
+
+[![Donate](https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D4M5LVULVPPKL)

VERSION

@@ -0,0 +1 @@
+2.2.5-dev

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
 {
@@ -55,6 +55,13 @@ final class AddComponentCommand
      */
     public $group_id;
 
+    /**
+     * Is the component enabled?
+     *
+     * @var bool
+     */
+    public $enabled;
+
     /**
      * The validation rules.
      *
@@ -63,10 +70,11 @@ final class AddComponentCommand
     public $rules = [
         'name'        => 'required|string',
         'description' => 'string',
-        'status'      => 'required|integer',
+        'status'      => 'int|min:1|max:4',
         'link'        => 'url',
-        'order'       => 'integer',
-        'group_id'    => 'integer',
+        'order'       => 'int',
+        'group_id'    => 'int',
+        'enabled'     => 'bool',
     ];
 
     /**
@@ -78,10 +86,11 @@ final class AddComponentCommand
      * @param string $link
      * @param int    $order
      * @param int    $group_id
+     * @param bool   $enabled
      *
      * @return void
      */
-    public function __construct($name, $description, $status, $link, $order, $group_id)
+    public function __construct($name, $description, $status, $link, $order, $group_id, $enabled)
     {
         $this->name = $name;
         $this->description = $description;
@@ -89,5 +98,6 @@ final class AddComponentCommand
         $this->link = $link;
         $this->order = $order;
         $this->group_id = $group_id;
+        $this->enabled = $enabled;
     }
 }

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;
 
@@ -64,6 +64,13 @@ final class UpdateComponentCommand
      */
     public $group_id;
 
+    /**
+     * Is the component enabled?
+     *
+     * @var bool
+     */
+    public $enabled;
+
     /**
      * The validation rules.
      *
@@ -72,10 +79,11 @@ final class UpdateComponentCommand
     public $rules = [
         'name'        => 'string',
         'description' => 'string',
-        'status'      => 'integer',
+        'status'      => 'int|min:1|max:4',
         'link'        => 'url',
-        'order'       => 'integer',
-        'group_id'    => 'integer',
+        'order'       => 'int',
+        'group_id'    => 'int',
+        'enabled'     => 'bool',
     ];
 
     /**
@@ -88,10 +96,11 @@ final class UpdateComponentCommand
      * @param string                            $link
      * @param int                               $order
      * @param int                               $group_id
+     * @param bool                              $enabled
      *
      * @return void
      */
-    public function __construct(Component $component, $name, $description, $status, $link, $order, $group_id)
+    public function __construct(Component $component, $name, $description, $status, $link, $order, $group_id, $enabled)
     {
         $this->component = $component;
         $this->name = $name;
@@ -100,5 +109,6 @@ final class UpdateComponentCommand
         $this->link = $link;
         $this->order = $order;
         $this->group_id = $group_id;
+        $this->enabled = $enabled;
     }
 }

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' => 'integer',
+        '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' => 'integer',
+        '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
 {
@@ -69,6 +69,20 @@ final class ReportIncidentCommand
      */
     public $incident_date;
 
+    /**
+     * A given incident template.
+     *
+     * @var string|null
+     */
+    public $template;
+
+    /**
+     * Variables for the incident template.
+     *
+     * @var string[]|null
+     */
+    public $template_vars;
+
     /**
      * The validation rules.
      *
@@ -76,13 +90,14 @@ final class ReportIncidentCommand
      */
     public $rules = [
         'name'             => 'required|string',
-        'status'           => 'required|integer',
+        'status'           => 'required|int|min:0|max:4',
         'message'          => 'string',
-        'visible'          => 'boolean',
-        'component_id'     => 'integer',
-        'component_status' => 'integer',
-        'notify'           => 'boolean',
+        'visible'          => 'bool',
+        'component_id'     => 'int|required_with:component_status',
+        'component_status' => 'int|min:1|max:4|required_with:component_id',
+        'notify'           => 'bool',
         'incident_date'    => 'string',
+        'template'         => 'string',
     ];
 
     /**
@@ -96,10 +111,12 @@ final class ReportIncidentCommand
      * @param int         $component_status
      * @param bool        $notify
      * @param string|null $incident_date
+     * @param string|null $template
+     * @param array|null  $template_vars
      *
      * @return void
      */
-    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $incident_date)
+    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;
@@ -109,5 +126,7 @@ final class ReportIncidentCommand
         $this->component_status = $component_status;
         $this->notify = $notify;
         $this->incident_date = $incident_date;
+        $this->template = $template;
+        $this->template_vars = $template_vars;
     }
 }

app/Bus/Commands/Incident/ReportMaintenanceCommand.php

@@ -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
 {
@@ -49,7 +49,7 @@ final class ReportMaintenanceCommand
     public $rules = [
         'name'      => 'required|string',
         'message'   => 'string',
-        'notify'    => 'boolean',
+        'notify'    => 'bool',
         'timestamp' => 'string',
     ];
 

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;
 
@@ -78,6 +78,20 @@ final class UpdateIncidentCommand
      */
     public $incident_date;
 
+    /**
+     * A given incident template.
+     *
+     * @var string|null
+     */
+    public $template;
+
+    /**
+     * Variables for the incident template.
+     *
+     * @var string[]|null
+     */
+    public $template_vars;
+
     /**
      * The validation rules.
      *
@@ -85,18 +99,19 @@ final class UpdateIncidentCommand
      */
     public $rules = [
         'name'             => 'string',
-        'status'           => 'integer',
+        'status'           => 'int|min:0|max:4',
         'message'          => 'string',
-        'visible'          => 'boolean',
-        'component_id'     => 'integer',
-        'component_status' => 'integer',
-        'notify'           => 'boolean',
+        'visible'          => 'bool',
+        'component_id'     => 'int',
+        'component_status' => 'int|min:1|max:4|required_with:component_id',
+        'notify'           => 'bool',
+        'template'         => 'string',
     ];
 
     /**
      * Create a new update incident command instance.
      *
-     * @param \CachetHQ\Cachet\Models\Incident $name
+     * @param \CachetHQ\Cachet\Models\Incident $incident
      * @param string                           $name
      * @param int                              $status
      * @param string                           $message
@@ -105,10 +120,12 @@ final class UpdateIncidentCommand
      * @param int                              $component_status
      * @param bool                             $notify
      * @param string|null                      $incident_date
+     * @param string|null                      $template
+     * @param array|null                       $template_vars
      *
      * @return void
      */
-    public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $incident_date = null)
+    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;
@@ -119,5 +136,7 @@ final class UpdateIncidentCommand
         $this->component_status = $component_status;
         $this->notify = $notify;
         $this->incident_date = $incident_date;
+        $this->template = $template;
+        $this->template_vars = $template_vars;
     }
 }

app/Bus/Commands/Invite/ClaimInviteCommand.php

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

app/Bus/Commands/Metric/AddMetricCommand.php

@@ -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,13 @@ final class AddMetricCommand
      */
     public $places;
 
+    /**
+     * The view to show the metric points in.
+     *
+     * @var int
+     */
+    public $default_view;
+
     /**
      * The validation rules.
      *
@@ -71,11 +78,12 @@ final class AddMetricCommand
         'name'          => 'required|string',
         'suffix'        => 'required|string',
         'description'   => 'string',
-        'display_chart' => 'boolean',
-        'default_value' => 'integer',
-        'calc_type'     => 'integer',
-        'display_chart' => 'integer',
-        'places'        => 'integer|between:0,4',
+        'display_chart' => 'bool',
+        'default_value' => 'int',
+        'calc_type'     => 'int',
+        'display_chart' => 'int',
+        'places'        => 'int|between:0,4',
+        'default_view'  => 'int|between:0,3',
     ];
 
     /**
@@ -88,10 +96,11 @@ final class AddMetricCommand
      * @param int    $calc_type
      * @param int    $display_chart
      * @param int    $places
+     * @param int    $default_view
      *
      * @return void
      */
-    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places)
+    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
     {
         $this->name = $name;
         $this->suffix = $suffix;
@@ -100,5 +109,6 @@ final class AddMetricCommand
         $this->calc_type = $calc_type;
         $this->display_chart = $display_chart;
         $this->places = $places;
+        $this->default_view = $default_view;
     }
 }

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'      => 'integer',
+        'value'      => 'int',
         '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,13 @@ final class UpdateMetricCommand
      */
     public $places;
 
+    /**
+     * The view to show the metric points in.
+     *
+     * @var int
+     */
+    public $default_view;
+
     /**
      * The validation rules.
      *
@@ -80,11 +87,12 @@ final class UpdateMetricCommand
         'name'          => 'string',
         'suffix'        => 'string',
         'description'   => 'string',
-        'display_chart' => 'boolean',
+        'display_chart' => 'bool',
         'default_value' => 'numeric',
-        'calc_type'     => 'integer|in:0,1',
-        'display_chart' => 'integer',
-        'places'        => 'numeric|min:0|max:4',
+        'calc_type'     => 'int|in:0,1',
+        'display_chart' => 'int',
+        'places'        => 'numeric|between:0,4',
+        'default_view'  => 'numeric|between:0,4',
     ];
 
     /**
@@ -98,10 +106,11 @@ final class UpdateMetricCommand
      * @param int                            $calc_type
      * @param int                            $display_chart
      * @param int                            $places
+     * @param int                            $default_view
      *
      * @return void
      */
-    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places)
+    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
     {
         $this->metric = $metric;
         $this->name = $name;
@@ -111,5 +120,6 @@ final class UpdateMetricCommand
         $this->calc_type = $calc_type;
         $this->display_chart = $display_chart;
         $this->places = $places;
+        $this->default_view = $default_view;
     }
 }

app/Bus/Commands/Metric/UpdateMetricPointCommand.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;
 use CachetHQ\Cachet\Models\MetricPoint;
@@ -50,7 +50,7 @@ final class UpdateMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'integer',
+        'value'      => 'int',
         'created_at' => 'string',
     ];
 

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 subscriptions that we want to add.
+     *
+     * @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 null|array $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/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
 {
@@ -49,7 +49,7 @@ final class AddTeamMemberCommand
     public $rules = [
         'name'     => 'required|string',
         'password' => 'string',
-        'level'    => 'integer',
+        'level'    => 'int',
     ];
 
     /**

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

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

app/Bus/Commands/User/RemoveUserCommand.php

@@ -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

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

app/Bus/Events/Component/ComponentEventInterface.php

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

app/Bus/Events/Component/ComponentWasAddedEvent.php

@@ -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

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

app/Bus/Events/Metric/MetricEventInterface.php

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

app/Bus/Events/Metric/MetricPointWasAddedEvent.php

@@ -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

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

app/Bus/Events/User/UserWasRemovedEvent.php

@@ -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/Exceptions/Subscriber/AlreadySubscribedException.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Exceptions\Subscriber;
+
+use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
+use Exception;
+
+/**
+ * This is the already subscribed exception class.
+ *
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
+class AlreadySubscribedException extends Exception implements ExceptionInterface
+{
+    //
+}

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

@@ -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,23 +20,40 @@ 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
      */
     public function handle(AddComponentCommand $command)
     {
-        $component = Component::create([
-            'name'        => $command->name,
-            'description' => $command->description,
-            'link'        => $command->link,
-            'status'      => $command->status,
-            'order'       => $command->order,
-            'group_id'    => $command->group_id,
-        ]);
+        $component = Component::create($this->filter($command));
 
         event(new ComponentWasAddedEvent($component));
 
         return $component;
     }
+
+    /**
+     * Filter the command data.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\AddComponentCommand $command
+     *
+     * @return array
+     */
+    protected function filter(AddComponentCommand $command)
+    {
+        $params = [
+            'name'        => $command->name,
+            'description' => $command->description,
+            'link'        => $command->link,
+            'status'      => $command->status,
+            'enabled'     => $command->enabled,
+            'order'       => $command->order,
+            'group_id'    => $command->group_id,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
+    }
 }

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

@@ -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,14 +20,15 @@ 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
      */
     public function handle(UpdateComponentCommand $command)
     {
         $component = $command->component;
-        $component->update($this->filterComponentData($command));
+
+        $component->update($this->filter($command));
 
         event(new ComponentWasUpdatedEvent($component));
 
@@ -37,19 +38,24 @@ class UpdateComponentCommandHandler
     /**
      * Filter the command data.
      *
-     * @param \CachetHQ\Cachet\Commands\Component\UpdateComponentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\UpdateComponentCommand $command
      *
      * @return array
      */
-    protected function filterComponentData($command)
+    protected function filter(UpdateComponentCommand $command)
     {
-        return array_filter([
+        $params = [
             'name'        => $command->name,
             'description' => $command->description,
             'link'        => $command->link,
             'status'      => $command->status,
+            'enabled'     => $command->enabled,
             'order'       => $command->order,
             'group_id'    => $command->group_id,
-        ]);
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
     }
 }

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

@@ -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

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

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

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

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

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

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

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

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

@@ -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,7 @@ class AddMetricCommandHandler
             'calc_type'     => $command->calc_type,
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
+            'default_view'  => $command->default_view,
         ]);
 
         event(new MetricWasAddedEvent($metric));

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

@@ -9,19 +9,38 @@
  * 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\AddMetricPointCommand;
-use CachetHQ\Cachet\Events\Metric\MetricPointWasAddedEvent;
+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\Commands\Metric\AddMetricPointCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\AddMetricPointCommand $command
      *
      * @return \CachetHQ\Cachet\Models\MetricPoint
      */
@@ -36,7 +55,7 @@ class AddMetricPointCommandHandler
         ];
 
         if ($createdAt) {
-            $data['created_at'] = Carbon::createFromFormat('U', $createdAt)->format('Y-m-d H:i:s');
+            $data['created_at'] = $this->dates->create('U', $createdAt)->format('Y-m-d H:i:s');
         }
 
         $metricPoint = 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
      */
@@ -28,7 +28,7 @@ class UpdateMetricCommandHandler
     {
         $metric = $command->metric;
 
-        $metric->update($this->filterMetricData($command));
+        $metric->update($this->filter($command));
 
         event(new MetricWasUpdatedEvent($metric));
 
@@ -38,13 +38,13 @@ class UpdateMetricCommandHandler
     /**
      * Filter the command data.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricCommand $command
      *
      * @return array
      */
-    protected function filterMetricData($command)
+    protected function filter(UpdateMetricCommand $command)
     {
-        return array_filter([
+        $params = [
             'name'          => $command->name,
             'suffix'        => $command->suffix,
             'description'   => $command->description,
@@ -52,6 +52,11 @@ class UpdateMetricCommandHandler
             'calc_type'     => $command->calc_type,
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
-        ]);
+            'default_view'  => $command->default_view,
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
     }
 }

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

@@ -9,18 +9,37 @@
  * 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\Events\Metric\MetricPointWasUpdatedEvent;
-use Carbon\Carbon;
+use CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricPointCommand;
+use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasUpdatedEvent;
+use CachetHQ\Cachet\Dates\DateFactory;
 
 class UpdateMetricPointCommandHandler
 {
+    /**
+     * The date factory instance.
+     *
+     * @var \CachetHQ\Cachet\Dates\DateFactory
+     */
+    protected $dates;
+
+    /**
+     * Create a new update metric point command handler instance.
+     *
+     * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     *
+     * @return void
+     */
+    public function __construct(DateFactory $dates)
+    {
+        $this->dates = $dates;
+    }
+
     /**
      * Handle the update metric point command.
      *
-     * @param \CachetHQ\Cachet\Commands\Metric\UpdateMetricPointCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricPointCommand $command
      *
      * @return \CachetHQ\Cachet\Models\MetricPoint
      */
@@ -36,7 +55,7 @@ class UpdateMetricPointCommandHandler
         ];
 
         if ($createdAt) {
-            $data['created_at'] = Carbon::createFromFormat('U', $createdAt)->format('Y-m-d H:i:s');
+            $data['created_at'] = $this->dates->create('U', $createdAt)->format('Y-m-d H:i:s');
         }
 
         $point->update($data);

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

@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
+use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
+use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the subscribe subscriber command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class SubscribeSubscriberCommandHandler
+{
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand $command
+     *
+     * @throws \CachetHQ\Cachet\Exceptions\AlreadySubscribedException
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(SubscribeSubscriberCommand $command)
+    {
+        if (Subscriber::where('email', $command->email)->first() && $command->subscriptions === null) {
+            throw new AlreadySubscribedException("Cannot subscribe {$command->email} because they're already subscribed.");
+        }
+
+        $subscriber = Subscriber::firstOrCreate(['email' => $command->email]);
+
+        if ($subscriptions = $command->subscriptions) {
+            foreach ($subscriptions as $subscription => $subscriptionValue) {
+                Subscription::firstOrCreate([
+                    'subscriber_id' => $subscriber->id,
+                    $subscription   => $subscriptionValue,
+                ]);
+            }
+        }
+
+        if ($subscriber->is_verified === false) {
+            if ($command->verified) {
+                dispatch(new VerifySubscriberCommand($subscriber));
+            } else {
+                event(new SubscriberHasSubscribedEvent($subscriber));
+            }
+        } else {
+            event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+        }
+
+        return $subscriber;
+    }
+}

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

@@ -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/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

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

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

@@ -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

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

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

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Component;
+
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscription;
+use Illuminate\Contracts\Mail\MailQueue;
+use Illuminate\Mail\Message;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
+
+class SendComponentUpdateEmailNotificationHandler
+{
+    /**
+     * The mailer instance.
+     *
+     * @var \Illuminate\Contracts\Mail\Mailer
+     */
+    protected $mailer;
+
+    /**
+     * Create a new send incident email notification handler.
+     *
+     * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     *
+     * @return void
+     */
+    public function __construct(MailQueue $mailer)
+    {
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent $event
+     *
+     * @return void
+     */
+    public function handle(ComponentWasUpdatedEvent $event)
+    {
+        $component = AutoPresenter::decorate($event->component);
+
+        $mail = [
+            'subject'                => trans('cachet.subscriber.email.component.subject'),
+            'component_name'         => $component->name,
+            'component_human_status' => $component->human_status,
+        ];
+
+        foreach (Subscription::isVerifiedForComponent($component->id)->with('subscriber')->get() as $subscription) {
+            $subscriber = $subscription->subscriber;
+            $mail['email'] = $subscriber->email;
+            $mail['manage_link'] = route('subscribe.manage', ['code' => $subscriber->verify_code]);
+            $mail['unsubscribe_link'] = route('subscribe.unsubscribe', ['code' => $subscriber->verify_code, 'subscription' => $subscription->id]);
+
+            $this->mailer->queue([
+                'html' => 'emails.components.update-html',
+                'text' => 'emails.components.update-text',
+            ], $mail, function (Message $message) use ($mail) {
+                $message->to($mail['email'])->subject($mail['subject']);
+            });
+        }
+    }
+}

app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events\Incident;
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Incident;
 
-use CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
@@ -50,29 +50,33 @@ class SendIncidentEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Events\Incident\IncidentHasReportedEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentHasReportedEvent $event
      *
      * @return void
      */
     public function handle(IncidentWasReportedEvent $event)
     {
+        if (!$event->incident->notify) {
+            return false;
+        }
+
         $incident = AutoPresenter::decorate($event->incident);
         $component = AutoPresenter::decorate($event->incident->component);
 
         // Only send emails for public incidents.
         if ($event->incident->visible === 1) {
-            foreach ($this->subscriber->all() as $subscriber) {
+            foreach ($this->subscriber->isVerified()->get() as $subscriber) {
                 $mail = [
                     'email'            => $subscriber->email,
                     'subject'          => 'New incident reported.',
                     'has_component'    => ($event->incident->component) ? true : false,
                     'component_name'   => $component ? $component->name : null,
-                    'status'           => $incident->humanStatus,
+                    '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]),
-                    'app_url'          => env('APP_URL'),
                 ];
 
                 $this->mailer->queue([

app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events\Incident;
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Incident;
 
-use CachetHQ\Cachet\Events\Incident\MaintenanceWasScheduledEvent;
+use CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
@@ -50,25 +50,29 @@ class SendMaintenanceEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceHasScheduledEvent $event
      *
      * @return void
      */
     public function handle(MaintenanceWasScheduledEvent $event)
     {
+        if (!$event->incident->notify) {
+            return false;
+        }
+
         $data = AutoPresenter::decorate($event->incident);
 
-        foreach ($this->subscriber->all() as $subscriber) {
+        foreach ($this->subscriber->isVerified()->get() as $subscriber) {
             $mail = [
                 'email'            => $subscriber->email,
                 'subject'          => 'Scheduled maintenance.',
-                'status'           => $data->humanStatus,
+                'status'           => $data->human_status,
                 'html_content'     => $data->formattedMessage,
                 'text_content'     => $data->message,
                 'scheduled_at'     => $data->scheduled_at_formatted,
                 'token'            => $subscriber->token,
+                'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
                 'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
-                'app_url'          => env('APP_URL'),
             ];
 
             $this->mailer->queue([

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

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Handlers\Events\Subscriber;
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Subscriber;
 
-use CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
 
@@ -39,7 +39,7 @@ class SendSubscriberVerificationEmailHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\SubscriberHasSubscribedEvent $event
      *
      * @return void
      */
@@ -49,7 +49,6 @@ class SendSubscriberVerificationEmailHandler
             'email'    => $event->subscriber->email,
             'subject'  => 'Confirm your subscription.',
             'link'     => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
-            'app_url'  => env('APP_URL'),
         ];
 
         $this->mailer->queue([

app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
+use Illuminate\Contracts\Mail\MailQueue;
+use Illuminate\Mail\Message;
+
+class SendInviteUserEmailHandler
+{
+    /**
+     * The mailer instance.
+     *
+     * @var \Illuminate\Contracts\Mail\MailQueue
+     */
+    protected $mailer;
+
+    /**
+     * Create a new send invite user email handler.
+     *
+     * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     *
+     * @return void
+     */
+    public function __construct(MailQueue $mailer)
+    {
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\UserWasInvitedEvent $event
+     *
+     * @return void
+     */
+    public function handle(UserWasInvitedEvent $event)
+    {
+        $mail = [
+            'email'    => $event->invite->email,
+            'subject'  => 'You have been invited.',
+            'link'     => route('signup.invite', ['code' => $event->invite->code]),
+        ];
+
+        $this->mailer->queue([
+            'html' => 'emails.users.invite-html',
+            'text' => 'emails.users.invite-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
+    }
+}

app/Composers/AppComposer.php

@@ -11,8 +11,9 @@
 
 namespace CachetHQ\Cachet\Composers;
 
-use CachetHQ\Cachet\Facades\Setting;
+use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Config;
 
 class AppComposer
 {
@@ -25,10 +26,31 @@ class AppComposer
      */
     public function compose(View $view)
     {
-        $isEnabled = (bool) Setting::get('enable_subscribers', false);
-        $mailAddress = env('MAIL_ADDRESS', false);
-        $mailFrom = env('MAIL_NAME', false);
+        $view->withAboutApp(Markdown::convertToHtml(Config::get('setting.app_about')));
+        $view->withAppAnalytics(Config::get('setting.app_analytics'));
+        $view->withAppAnalyticsGoSquared(Config::get('setting.app_analytics_gs'));
+        $view->withAppAnalyticsPiwikUrl(Config::get('setting.app_analytics_piwik_url'));
+        $view->withAppAnalyticsPiwikSiteId(Config::get('setting.app_analytics_piwik_site_id'));
+        $view->withAppBanner(Config::get('setting.app_banner'));
+        $view->withAppBannerStyleFullWidth(Config::get('setting.style_fullwidth_header'));
+        $view->withAppBannerType(Config::get('setting.app_banner_type'));
+        $view->withAppDomain(Config::get('setting.app_domain'));
+        $view->withAppGraphs(Config::get('setting.display_graphs'));
+        $view->withAppLocale(Config::get('setting.app_locale'));
+        $view->withAppStylesheet(Config::get('setting.stylesheet'));
+        $view->withAppUrl(Config::get('app.url'));
+        $view->withAppHeader(Config::get('setting.header'));
+        $view->withAppFooter(Config::get('setting.footer'));
 
-        $view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
+        $view->withAppName($name = Config::get('setting.app_name'));
+        $view->withShowSupport($support = Config::get('setting.show_support'));
+
+        if ($support) {
+            $view->withSiteTitle(Config::get('setting.app_name').' | Cachet');
+        } else {
+            $view->withSiteTitle(Config::get('setting.app_name'));
+        }
+
+        $view->withFontSubset(Config::get('langs.'.Config::get('app.locale').'.subset', 'latin'));
     }
 }