Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 9 insertions, 5 deletions

diff --git a/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index b03ffcf8..09a5665a 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -6,22 +6,24 @@ use Kanboard\Event\TaskEvent;
 use Kanboard\Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class RecurringTaskSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
+class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN => array('onMove', 0),
-            Task::EVENT_CLOSE => array('onClose', 0),
+            Task::EVENT_MOVE_COLUMN => 'onMove',
+            Task::EVENT_CLOSE => 'onClose',
         );
     }
 
     public function onMove(TaskEvent $event)
     {
+        $this->logger->debug('Subscriber executed: '.__METHOD__);
+
         if ($event['recurrence_status'] == Task::RECURRING_STATUS_PENDING) {
-            if ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_FIRST_COLUMN && $this->board->getFirstColumn($event['project_id']) == $event['src_column_id']) {
+            if ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_FIRST_COLUMN && $this->column->getFirstColumnId($event['project_id']) == $event['src_column_id']) {
                 $this->taskDuplication->duplicateRecurringTask($event['task_id']);
-            } elseif ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_LAST_COLUMN && $this->board->getLastColumn($event['project_id']) == $event['dst_column_id']) {
+            } elseif ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_LAST_COLUMN && $this->column->getLastColumnId($event['project_id']) == $event['dst_column_id']) {
                 $this->taskDuplication->duplicateRecurringTask($event['task_id']);
             }
         }
@@ -29,6 +31,8 @@ class RecurringTaskSubscriber extends \Kanboard\Core\Base implements EventSubscr
 
     public function onClose(TaskEvent $event)
     {
+        $this->logger->debug('Subscriber executed: '.__METHOD__);
+
         if ($event['recurrence_status'] == Task::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == Task::RECURRING_TRIGGER_CLOSE) {
             $this->taskDuplication->duplicateRecurringTask($event['task_id']);
         }