Rename subtask model

4 files changed, 15 insertions, 15 deletions

diff --git a/app/Subscriber/Base.php b/app/Subscriber/Base.php
index 4616b179..19f41c84 100644
--- a/app/Subscriber/Base.php
+++ b/app/Subscriber/Base.php
@@ -18,7 +18,7 @@ use Pimple\Container;
  * @property \Model\ProjectPermission      $projectPermission
  * @property \Model\ProjectAnalytic        $projectAnalytic
  * @property \Model\ProjectDailySummary    $projectDailySummary
- * @property \Model\SubTask                $subTask
+ * @property \Model\Subtask                $subtask
  * @property \Model\Task                   $task
  * @property \Model\TaskExport             $taskExport
  * @property \Model\TaskFinder             $taskFinder
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index 1580f6dc..1b7187fe 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -5,7 +5,7 @@ namespace Subscriber;
 use Event\GenericEvent;
 use Model\Task;
 use Model\Comment;
-use Model\SubTask;
+use Model\Subtask;
 use Model\File;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -19,8 +19,8 @@ class NotificationSubscriber extends Base implements EventSubscriberInterface
         Task::EVENT_MOVE_COLUMN => 'task_move_column',
         Task::EVENT_MOVE_POSITION => 'task_move_position',
         Task::EVENT_ASSIGNEE_CHANGE => 'task_assignee_change',
-        SubTask::EVENT_CREATE => 'subtask_creation',
-        SubTask::EVENT_UPDATE => 'subtask_update',
+        Subtask::EVENT_CREATE => 'subtask_creation',
+        Subtask::EVENT_UPDATE => 'subtask_update',
         Comment::EVENT_CREATE => 'comment_creation',
         Comment::EVENT_UPDATE => 'comment_update',
         File::EVENT_CREATE => 'file_creation',
@@ -36,8 +36,8 @@ class NotificationSubscriber extends Base implements EventSubscriberInterface
             Task::EVENT_MOVE_COLUMN => array('execute', 0),
             Task::EVENT_MOVE_POSITION => array('execute', 0),
             Task::EVENT_ASSIGNEE_CHANGE => array('execute', 0),
-            SubTask::EVENT_CREATE => array('execute', 0),
-            SubTask::EVENT_UPDATE => array('execute', 0),
+            Subtask::EVENT_CREATE => array('execute', 0),
+            Subtask::EVENT_UPDATE => array('execute', 0),
             Comment::EVENT_CREATE => array('execute', 0),
             Comment::EVENT_UPDATE => array('execute', 0),
             File::EVENT_CREATE => array('execute', 0),
@@ -63,7 +63,7 @@ class NotificationSubscriber extends Base implements EventSubscriberInterface
                 $values['task'] = $this->taskFinder->getDetails($event['task_id']);
                 break;
             case 'Event\SubtaskEvent':
-                $values['subtask'] = $this->subTask->getById($event['id'], true);
+                $values['subtask'] = $this->subtask->getById($event['id'], true);
                 $values['task'] = $this->taskFinder->getDetails($event['task_id']);
                 break;
             case 'Event\FileEvent':
diff --git a/app/Subscriber/ProjectActivitySubscriber.php b/app/Subscriber/ProjectActivitySubscriber.php
index aae09ae2..00f5b044 100644
--- a/app/Subscriber/ProjectActivitySubscriber.php
+++ b/app/Subscriber/ProjectActivitySubscriber.php
@@ -5,7 +5,7 @@ namespace Subscriber;
 use Event\GenericEvent;
 use Model\Task;
 use Model\Comment;
-use Model\SubTask;
+use Model\Subtask;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class ProjectActivitySubscriber extends Base implements EventSubscriberInterface
@@ -22,8 +22,8 @@ class ProjectActivitySubscriber extends Base implements EventSubscriberInterface
             Task::EVENT_MOVE_POSITION => array('execute', 0),
             Comment::EVENT_UPDATE => array('execute', 0),
             Comment::EVENT_CREATE => array('execute', 0),
-            SubTask::EVENT_UPDATE => array('execute', 0),
-            SubTask::EVENT_CREATE => array('execute', 0),
+            Subtask::EVENT_UPDATE => array('execute', 0),
+            Subtask::EVENT_CREATE => array('execute', 0),
         );
     }
 
@@ -51,7 +51,7 @@ class ProjectActivitySubscriber extends Base implements EventSubscriberInterface
 
         switch (get_class($event)) {
             case 'Event\SubtaskEvent':
-                $values['subtask'] = $this->subTask->getById($event['id'], true);
+                $values['subtask'] = $this->subtask->getById($event['id'], true);
                 break;
             case 'Event\CommentEvent':
                 $values['comment'] = $this->comment->getById($event['id']);
diff --git a/app/Subscriber/SubtaskTimesheetSubscriber.php b/app/Subscriber/SubtaskTimesheetSubscriber.php
index 687db80a..df10fc43 100644
--- a/app/Subscriber/SubtaskTimesheetSubscriber.php
+++ b/app/Subscriber/SubtaskTimesheetSubscriber.php
@@ -3,7 +3,7 @@
 namespace Subscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Model\SubTask;
+use Model\Subtask;
 use Event\SubtaskEvent;
 
 class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterface
@@ -11,7 +11,7 @@ class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterfac
     public static function getSubscribedEvents()
     {
         return array(
-            SubTask::EVENT_UPDATE => array('log', 0),
+            Subtask::EVENT_UPDATE => array('log', 0),
         );
     }
 
@@ -19,9 +19,9 @@ class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterfac
     {
         if (isset($event['status'])) {
 
-            $subtask = $this->subTask->getById($event['id']);
+            $subtask = $this->subtask->getById($event['id']);
 
-            if ($subtask['status'] == SubTask::STATUS_INPROGRESS) {
+            if ($subtask['status'] == Subtask::STATUS_INPROGRESS) {
                 $this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']);
             }
             else {