Use dependency injection in trails, closes #1714.

Closes #1714

Merge request studip/studip!1118

3 files changed, 3 insertions, 9 deletions

diff --git a/lib/modules/EvaluationsWidget.php b/lib/modules/EvaluationsWidget.php
index bfe7cd8..3c5cf6f 100644
--- a/lib/modules/EvaluationsWidget.php
+++ b/lib/modules/EvaluationsWidget.php
@@ -43,7 +43,7 @@ class EvaluationsWidget extends CorePlugin implements PortalPlugin
         }
 
         // include and show votes and tests
-        $controller = new AuthenticatedController(new StudipDispatcher());
+        $controller = app(AuthenticatedController::class, ['dispatcher' => app(\Trails_Dispatcher::class)]);
         $controller->suppress_empty_output = true;
 
         $response = $controller->relay('evaluation/display/studip')->body;
diff --git a/lib/modules/NewsWidget.php b/lib/modules/NewsWidget.php
index f158631..73f4c3b 100644
--- a/lib/modules/NewsWidget.php
+++ b/lib/modules/NewsWidget.php
@@ -9,8 +9,6 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'app/controllers/news.php';
-
 class NewsWidget extends CorePlugin implements PortalPlugin
 {
     public function getPluginName()
@@ -27,8 +25,7 @@ class NewsWidget extends CorePlugin implements PortalPlugin
 
     function getPortalTemplate()
     {
-        $dispatcher = new StudipDispatcher();
-        $controller = new NewsController($dispatcher);
+        $controller = app(\Trails_Dispatcher::class)->load_controller('news');
         $response = $controller->relayWithRedirect('news/display/studip');
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;
diff --git a/lib/modules/TerminWidget.php b/lib/modules/TerminWidget.php
index c92f1d2..c9cf854 100644
--- a/lib/modules/TerminWidget.php
+++ b/lib/modules/TerminWidget.php
@@ -10,8 +10,6 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'app/controllers/calendar/contentbox.php';
-
 class TerminWidget extends CorePlugin implements PortalPlugin
 {
     public function getPluginName()
@@ -28,8 +26,7 @@ class TerminWidget extends CorePlugin implements PortalPlugin
 
     public function getPortalTemplate()
     {
-        $dispatcher = new StudipDispatcher();
-        $controller = new Calendar_ContentboxController($dispatcher);
+        $controller = app(\Trails_Dispatcher::class)->load_controller('calendar/contentbox');
         $response = $controller->relay('calendar/contentbox/display/'.$GLOBALS['user']->id);
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;