diff --git a/.gitattributes b/.gitattributes
index 0ecc7e75..643457da 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,10 @@
 * text=auto
 
+/docs export-ignore
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /phpunit.xml export-ignore
-/README.md export-ignore
 /CONTRIBUTING.md export-ignore
+/INSTALL.md export-ignore
+/README.md export-ignore
diff --git a/app/view-composers.php b/app/composers.php
similarity index 100%
rename from app/view-composers.php
rename to app/composers.php
diff --git a/app/start/global.php b/app/start/global.php
index 2d046af7..fffabad6 100644
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -71,4 +71,4 @@ App::down(function () {
 |
 */
 
-require app_path('view-composers.php');
+require app_path('composers.php');
diff --git a/src/Models/Incident.php b/src/Models/Incident.php
index 0c1996bc..97ebd2ad 100644
--- a/src/Models/Incident.php
+++ b/src/Models/Incident.php
@@ -78,6 +78,8 @@ class Incident extends Model implements TransformableInterface
                 return 'ion ion-eye';
             case 4:
                 return 'ion ion-checkmark';
+            default:
+                return '';
         }
     }
 
diff --git a/src/Models/IncidentTemplate.php b/src/Models/IncidentTemplate.php
index 8aad1502..2bea1b8d 100644
--- a/src/Models/IncidentTemplate.php
+++ b/src/Models/IncidentTemplate.php
@@ -3,7 +3,7 @@
 namespace CachetHQ\Cachet\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Str;
+use Illuminate\Support\Str;
 use Watson\Validating\ValidatingTrait;
 
 class IncidentTemplate extends Model
diff --git a/src/Models/Setting.php b/src/Models/Setting.php
index ee9e9f4a..712cc67a 100644
--- a/src/Models/Setting.php
+++ b/src/Models/Setting.php
@@ -2,6 +2,7 @@
 
 namespace CachetHQ\Cachet\Models;
 
+use ErrorException;
 use Illuminate\Database\Eloquent\Model;
 
 class Setting extends Model
diff --git a/src/Models/WebHook.php b/src/Models/WebHook.php
index 4b52bf66..366130a0 100644
--- a/src/Models/WebHook.php
+++ b/src/Models/WebHook.php
@@ -2,6 +2,7 @@
 
 namespace CachetHQ\Cachet\Models;
 
+use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use Illuminate\Database\Eloquent\Builder;
@@ -52,11 +53,11 @@ class WebHook extends Model
      * Fires the actual web hook event.
      *
      * @param string $eventType The event to send X-Cachet-Event
-     * @param mixed  $data      Data to send to the Web Hook
+     * @param string $data      Data to send to the Web Hook
      *
      * @return \CachetHQ\Cachet\Models\WebHookResponse
      */
-    public function fire($eventType, $data = null)
+    public function fire($eventType, $data)
     {
         $startTime = microtime(true);
 
diff --git a/src/helpers.php b/src/helpers.php
index 689ef843..20e7479d 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -14,7 +14,7 @@ if (!function_exists('elixir')) {
     {
         static $manifest = null;
 
-        if (is_null($manifest)) {
+        if ($manifest === null) {
             $manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true);
         }