From eeac2329baab1fdae7cbf6c707ed2ffd8beb4c1b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 24 May 2015 16:02:25 -0400
Subject: Helpers refactoring

---
 app/Subscriber/AuthSubscriber.php                  |  2 +-
 app/Subscriber/Base.php                            | 66 ----------------------
 app/Subscriber/BootstrapSubscriber.php             |  2 +-
 app/Subscriber/NotificationSubscriber.php          |  2 +-
 app/Subscriber/ProjectActivitySubscriber.php       |  2 +-
 app/Subscriber/ProjectDailySummarySubscriber.php   |  2 +-
 .../ProjectModificationDateSubscriber.php          |  2 +-
 app/Subscriber/RecurringTaskSubscriber.php         |  2 +-
 app/Subscriber/SubtaskTimesheetSubscriber.php      |  2 +-
 app/Subscriber/TaskMovedDateSubscriber.php         |  2 +-
 app/Subscriber/TransitionSubscriber.php            |  2 +-
 app/Subscriber/WebhookSubscriber.php               |  2 +-
 12 files changed, 11 insertions(+), 77 deletions(-)
 delete mode 100644 app/Subscriber/Base.php

(limited to 'app/Subscriber')

diff --git a/app/Subscriber/AuthSubscriber.php b/app/Subscriber/AuthSubscriber.php
index 161a7afd..b814057f 100644
--- a/app/Subscriber/AuthSubscriber.php
+++ b/app/Subscriber/AuthSubscriber.php
@@ -6,7 +6,7 @@ use Core\Request;
 use Event\AuthEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class AuthSubscriber extends Base implements EventSubscriberInterface
+class AuthSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/Base.php b/app/Subscriber/Base.php
deleted file mode 100644
index 10040626..00000000
--- a/app/Subscriber/Base.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Subscriber;
-
-use Pimple\Container;
-
-/**
- * Base subscriber class
- *
- * @package  subscriber
- * @author   Frederic Guillot
- *
- * @property \Integration\SlackWebhook     $slackWebhook
- * @property \Integration\HipchatWebhook   $hipchatWebhook
- * @property \Model\Board                  $board
- * @property \Model\Config                 $config
- * @property \Model\Comment                $comment
- * @property \Model\LastLogin              $lastLogin
- * @property \Model\Notification           $notification
- * @property \Model\Project                $project
- * @property \Model\ProjectPermission      $projectPermission
- * @property \Model\ProjectActivity        $projectActivity
- * @property \Model\ProjectAnalytic        $projectAnalytic
- * @property \Model\ProjectDailySummary    $projectDailySummary
- * @property \Model\Subtask                $subtask
- * @property \Model\Task                   $task
- * @property \Model\TaskDuplication        $taskDuplication
- * @property \Model\TaskExport             $taskExport
- * @property \Model\TaskFinder             $taskFinder
- * @property \Model\SubtaskTimeTracking    $subtaskTimeTracking
- * @property \Model\UserSession            $userSession
- * @property \Model\Webhook                $webhook
- */
-abstract class Base
-{
-    /**
-     * Container instance
-     *
-     * @access protected
-     * @var \Pimple\Container
-     */
-    protected $container;
-
-    /**
-     * Constructor
-     *
-     * @access public
-     * @param  \Pimple\Container   $container
-     */
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
-    }
-
-    /**
-     * Load automatically models
-     *
-     * @access public
-     * @param  string $name Model name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        return $this->container[$name];
-    }
-}
diff --git a/app/Subscriber/BootstrapSubscriber.php b/app/Subscriber/BootstrapSubscriber.php
index 35d0eff9..793ba3e7 100644
--- a/app/Subscriber/BootstrapSubscriber.php
+++ b/app/Subscriber/BootstrapSubscriber.php
@@ -4,7 +4,7 @@ namespace Subscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class BootstrapSubscriber extends Base implements EventSubscriberInterface
+class BootstrapSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index 09ca7625..92d46754 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -9,7 +9,7 @@ use Model\Subtask;
 use Model\File;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class NotificationSubscriber extends Base implements EventSubscriberInterface
+class NotificationSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     private $templates = array(
         Task::EVENT_CREATE => 'task_creation',
diff --git a/app/Subscriber/ProjectActivitySubscriber.php b/app/Subscriber/ProjectActivitySubscriber.php
index 8988d6c1..31f771f8 100644
--- a/app/Subscriber/ProjectActivitySubscriber.php
+++ b/app/Subscriber/ProjectActivitySubscriber.php
@@ -8,7 +8,7 @@ use Model\Comment;
 use Model\Subtask;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class ProjectActivitySubscriber extends Base implements EventSubscriberInterface
+class ProjectActivitySubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/ProjectDailySummarySubscriber.php b/app/Subscriber/ProjectDailySummarySubscriber.php
index f865c036..9e4f15b0 100644
--- a/app/Subscriber/ProjectDailySummarySubscriber.php
+++ b/app/Subscriber/ProjectDailySummarySubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
 use Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class ProjectDailySummarySubscriber extends Base implements EventSubscriberInterface
+class ProjectDailySummarySubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/ProjectModificationDateSubscriber.php b/app/Subscriber/ProjectModificationDateSubscriber.php
index 4c5380ff..2c01173b 100644
--- a/app/Subscriber/ProjectModificationDateSubscriber.php
+++ b/app/Subscriber/ProjectModificationDateSubscriber.php
@@ -6,7 +6,7 @@ use Event\GenericEvent;
 use Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class ProjectModificationDateSubscriber extends Base implements EventSubscriberInterface
+class ProjectModificationDateSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index 87418814..68d704f0 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
 use Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class RecurringTaskSubscriber extends Base implements EventSubscriberInterface
+class RecurringTaskSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/SubtaskTimesheetSubscriber.php b/app/Subscriber/SubtaskTimesheetSubscriber.php
index acae9a4b..fdaf442f 100644
--- a/app/Subscriber/SubtaskTimesheetSubscriber.php
+++ b/app/Subscriber/SubtaskTimesheetSubscriber.php
@@ -6,7 +6,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Model\Subtask;
 use Event\SubtaskEvent;
 
-class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterface
+class SubtaskTimesheetSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/TaskMovedDateSubscriber.php b/app/Subscriber/TaskMovedDateSubscriber.php
index 0e36acfa..eb04d62c 100644
--- a/app/Subscriber/TaskMovedDateSubscriber.php
+++ b/app/Subscriber/TaskMovedDateSubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
 use Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class TaskMovedDateSubscriber extends Base implements EventSubscriberInterface
+class TaskMovedDateSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/TransitionSubscriber.php b/app/Subscriber/TransitionSubscriber.php
index 347dd37d..5804dab7 100644
--- a/app/Subscriber/TransitionSubscriber.php
+++ b/app/Subscriber/TransitionSubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
 use Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class TransitionSubscriber extends Base implements EventSubscriberInterface
+class TransitionSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/WebhookSubscriber.php b/app/Subscriber/WebhookSubscriber.php
index e28675bd..5176a7ff 100644
--- a/app/Subscriber/WebhookSubscriber.php
+++ b/app/Subscriber/WebhookSubscriber.php
@@ -11,7 +11,7 @@ use Model\File;
 use Model\Subtask;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class WebhookSubscriber extends Base implements EventSubscriberInterface
+class WebhookSubscriber extends \Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-- 
cgit v1.2.3