Improve notification classes and move interface to core

5 files changed, 12 insertions, 40 deletions

diff --git a/app/Notification/ActivityStream.php b/app/Notification/ActivityStreamNotification.php
index 325732ec..8ac265d3 100644
--- a/app/Notification/ActivityStream.php
+++ b/app/Notification/ActivityStreamNotification.php
@@ -3,14 +3,15 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 
 /**
  * Activity Stream Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class ActivityStream extends Base implements NotificationInterface
+class ActivityStreamNotification extends Base implements NotificationInterface
 {
     /**
      * Send notification to a user
diff --git a/app/Notification/Mail.php b/app/Notification/MailNotification.php
index c924fb50..0ba06715 100644
--- a/app/Notification/Mail.php
+++ b/app/Notification/MailNotification.php
@@ -3,6 +3,7 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 use Kanboard\Model\Task;
 use Kanboard\Model\TaskFile;
 use Kanboard\Model\Comment;
@@ -11,10 +12,10 @@ use Kanboard\Model\Subtask;
 /**
  * Email Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class Mail extends Base implements NotificationInterface
+class MailNotification extends Base implements NotificationInterface
 {
     /**
      * Notification type
diff --git a/app/Notification/NotificationInterface.php b/app/Notification/NotificationInterface.php
deleted file mode 100644
index 8431a77c..00000000
--- a/app/Notification/NotificationInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Kanboard\Notification;
-
-/**
- * Notification Interface
- *
- * @package  core
- * @author   Frederic Guillot
- */
-interface NotificationInterface
-{
-    /**
-     * Send notification to a user
-     *
-     * @access public
-     * @param  array     $user
-     * @param  string    $event_name
-     * @param  array     $event_data
-     */
-    public function notifyUser(array $user, $event_name, array $event_data);
-
-    /**
-     * Send notification to a project
-     *
-     * @access public
-     * @param  array     $project
-     * @param  string    $event_name
-     * @param  array     $event_data
-     */
-    public function notifyProject(array $project, $event_name, array $event_data);
-}
diff --git a/app/Notification/Web.php b/app/Notification/WebNotification.php
index 9271c193..99c0c903 100644
--- a/app/Notification/Web.php
+++ b/app/Notification/WebNotification.php
@@ -3,14 +3,15 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 
 /**
  * Web Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class Web extends Base implements NotificationInterface
+class WebNotification extends Base implements NotificationInterface
 {
     /**
      * Notification type
diff --git a/app/Notification/Webhook.php b/app/Notification/WebhookNotification.php
index e187909f..25d59251 100644
--- a/app/Notification/Webhook.php
+++ b/app/Notification/WebhookNotification.php
@@ -3,14 +3,15 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 
 /**
  * Webhook Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class Webhook extends Base implements NotificationInterface
+class WebhookNotification extends Base implements NotificationInterface
 {
     /**
      * Send notification to a user