Merge branch '2.4' into mysql_unix_socket_support

cachethq · Apr 24, 2017 · 565f5fc · 565f5fc
2 parents 8e8ff7a + a2026b7
commit 565f5fc
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 82 deletions.
diff --git a/app/Bus/Handlers/Events/IncidentUpdate/SendIncidentUpdateEmailNotificationHandler.php b/app/Bus/Handlers/Events/IncidentUpdate/SendIncidentUpdateEmailNotificationHandler.php
@@ -73,8 +73,8 @@ public function handle(IncidentUpdateWasReportedEvent $event)
             ->get()
             ->reject(function ($subscriber) use ($notified) {
                 return in_array($subscriber->id, $notified);
-            })->each(function ($subscriber) use ($incident) {
-                $subscriber->notify(new IncidentUpdatedNotification($incident));
+            })->each(function ($subscriber) use ($update) {
+                $subscriber->notify(new IncidentUpdatedNotification($update));
             });
     }
 }
diff --git a/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php b/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php
@@ -32,7 +32,7 @@ class IncidentUpdatedNotification extends Notification
     /**
      * The incident update.
      *
-     * @var \CachetHQ\Cachet\Models\Incident
+     * @var \CachetHQ\Cachet\Models\IncidentUpdate
      */
     protected $update;
 

diff --git a/composer.json b/composer.json
@@ -64,6 +64,9 @@
         "symfony/dom-crawler": "^3.1",
         "tightenco/mailthief": "^0.3.2"
     },
+    "suggest": {
+        "ext-apc": "APC Support cache driver."
+    },
     "autoload": {
         "classmap": [
             "database"