3 files changed, 12 insertions, 17 deletions

diff --git a/app/Helper/CalendarHelper.php b/app/Helper/CalendarHelper.php
index 4f78b673..0942177d 100644
--- a/app/Helper/CalendarHelper.php
+++ b/app/Helper/CalendarHelper.php
@@ -5,8 +5,6 @@ namespace Kanboard\Helper;
 use Kanboard\Core\Base;
 use Kanboard\Core\Filter\QueryBuilder;
 use Kanboard\Filter\TaskDueDateRangeFilter;
-use Kanboard\Formatter\SubtaskTimeTrackingCalendarFormatter;
-use Kanboard\Formatter\TaskCalendarFormatter;
 
 /**
  * Calendar Helper
@@ -44,7 +42,7 @@ class CalendarHelper extends Base
      */
     public function getTaskDateDueEvents(QueryBuilder $queryBuilder, $start, $end)
     {
-        $formatter = new TaskCalendarFormatter($this->container);
+        $formatter = $this->taskCalendarFormatter;
         $formatter->setFullDay();
         $formatter->setColumns('date_due');
 
@@ -73,7 +71,7 @@ class CalendarHelper extends Base
             'date_due'
         ));
 
-        $formatter = new TaskCalendarFormatter($this->container);
+        $formatter = $this->taskCalendarFormatter;
         $formatter->setColumns($startColumn, 'date_due');
 
         return $queryBuilder->format($formatter);
@@ -90,8 +88,7 @@ class CalendarHelper extends Base
      */
     public function getSubtaskTimeTrackingEvents($user_id, $start, $end)
     {
-        $formatter = new SubtaskTimeTrackingCalendarFormatter($this->container);
-        return $formatter
+        return $this->subtaskTimeTrackingCalendarFormatter
             ->withQuery($this->subtaskTimeTrackingModel->getUserQuery($user_id)
                 ->addCondition($this->getCalendarCondition(
                     $this->dateParser->getTimestampFromIsoFormat($start),
diff --git a/app/Helper/ICalHelper.php b/app/Helper/ICalHelper.php
index dc399bf8..95723417 100644
--- a/app/Helper/ICalHelper.php
+++ b/app/Helper/ICalHelper.php
@@ -5,7 +5,6 @@ namespace Kanboard\Helper;
 use Kanboard\Core\Base;
 use Kanboard\Core\Filter\QueryBuilder;
 use Kanboard\Filter\TaskDueDateRangeFilter;
-use Kanboard\Formatter\TaskICalFormatter;
 use Eluceo\iCal\Component\Calendar as iCalendar;
 
 /**
@@ -29,10 +28,10 @@ class ICalHelper extends Base
     {
         $queryBuilder->withFilter(new TaskDueDateRangeFilter(array($start, $end)));
 
-        $formatter = new TaskICalFormatter($this->container);
-        $formatter->setColumns('date_due');
-        $formatter->setCalendar($calendar);
-        $formatter->withQuery($queryBuilder->getQuery());
-        $formatter->addFullDayEvents();
+        $this->taskICalFormatter
+            ->setColumns('date_due')
+            ->setCalendar($calendar)
+            ->withQuery($queryBuilder->getQuery())
+            ->addFullDayEvents();
     }
 }
diff --git a/app/Helper/ProjectActivityHelper.php b/app/Helper/ProjectActivityHelper.php
index 704cd4fe..480db3d5 100644
--- a/app/Helper/ProjectActivityHelper.php
+++ b/app/Helper/ProjectActivityHelper.php
@@ -6,7 +6,6 @@ use Kanboard\Core\Base;
 use Kanboard\Filter\ProjectActivityProjectIdFilter;
 use Kanboard\Filter\ProjectActivityProjectIdsFilter;
 use Kanboard\Filter\ProjectActivityTaskIdFilter;
-use Kanboard\Formatter\ProjectActivityEventFormatter;
 use Kanboard\Model\ProjectActivityModel;
 
 /**
@@ -38,7 +37,7 @@ class ProjectActivityHelper extends Base
                 ->limit(500)
             ;
 
-            $events = $queryBuilder->format(new ProjectActivityEventFormatter($this->container));
+            $events = $queryBuilder->format($this->projectActivityEventFormatter);
         }
 
         return $events;
@@ -62,7 +61,7 @@ class ProjectActivityHelper extends Base
             ->limit($limit)
         ;
 
-        return $queryBuilder->format(new ProjectActivityEventFormatter($this->container));
+        return $queryBuilder->format($this->projectActivityEventFormatter);
     }
 
     /**
@@ -83,7 +82,7 @@ class ProjectActivityHelper extends Base
             ->limit($limit)
         ;
 
-        return $queryBuilder->format(new ProjectActivityEventFormatter($this->container));
+        return $queryBuilder->format($this->projectActivityEventFormatter);
     }
 
     /**
@@ -100,6 +99,6 @@ class ProjectActivityHelper extends Base
 
         $queryBuilder->getQuery()->desc(ProjectActivityModel::TABLE.'.id');
 
-        return $queryBuilder->format(new ProjectActivityEventFormatter($this->container));
+        return $queryBuilder->format($this->projectActivityEventFormatter);
     }
 }