From 5cfc5d2515a21ae0b6d0d8b3a58874743b661ed8 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 9 Apr 2016 10:42:22 +0200
Subject: [PATCH] Fixing remaining bugs for route-restructure

---
 Admin/Installer.php                       | 1 +
 Admin/Routes/http.php                     | 2 ++
 Controller.php                            | 6 +++---
 Theme/Backend/Lang/api.en.lang.php        | 4 ++--
 Theme/Backend/Lang/en.lang.php            | 4 ++--
 Theme/backend/Lang/Navigation.en.lang.php | 4 ++--
 Theme/backend/Lang/api.en.lang.php        | 4 ++--
 Theme/backend/Lang/en.lang.php            | 4 ++--
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Admin/Installer.php b/Admin/Installer.php
index 6b638ed..f216f44 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\Checklist\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\Pool;
+use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
 /**
diff --git a/Admin/Routes/http.php b/Admin/Routes/http.php
index 547c192..e4448fc 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,5 +1,7 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/checklist/list.*$' => [
         [
diff --git a/Controller.php b/Controller.php
index ec6b128..43005d7 100644
--- a/Controller.php
+++ b/Controller.php
@@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewChecklistList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewChecklistList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Checklist/Theme/Backend/checklist-list');
@@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewChecklistTemplateList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewChecklistTemplateList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Checklist/Theme/Backend/checklist-template-list');
@@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewChecklistTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewChecklistTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Checklist/Theme/Backend/checklist-template-create');
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index a2fa112..754d136 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.en.lang.php
@@ -13,5 +13,5 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
-];
+return ['Navigation' => [
+]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 6170a53..e8307e9 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Checklist'] = [
+return ['Checklist' => [
     'Checklist'   => 'Checklist',
     'Checklists'  => 'Checklists',
     'Created'     => 'Created',
@@ -27,4 +27,4 @@ $MODLANG['Checklist'] = [
     'Tasks'       => 'Tasks',
     'Templates'   => 'Templates',
     'Title'       => 'Title',
-];
+]];
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index ed7cd0a..be596f5 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -13,9 +13,9 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
+return ['Navigation' => [
     'Checklist' => 'Checklist',
     'Checklists' => 'Checklists',
     'CreateCheclist' => 'CreateCheclist',
     'Templates' => 'Templates',
-];
+]];
diff --git a/Theme/backend/Lang/api.en.lang.php b/Theme/backend/Lang/api.en.lang.php
index a2fa112..754d136 100644
--- a/Theme/backend/Lang/api.en.lang.php
+++ b/Theme/backend/Lang/api.en.lang.php
@@ -13,5 +13,5 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
-];
+return ['Navigation' => [
+]];
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
index 6170a53..e8307e9 100644
--- a/Theme/backend/Lang/en.lang.php
+++ b/Theme/backend/Lang/en.lang.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Checklist'] = [
+return ['Checklist' => [
     'Checklist'   => 'Checklist',
     'Checklists'  => 'Checklists',
     'Created'     => 'Created',
@@ -27,4 +27,4 @@ $MODLANG['Checklist'] = [
     'Tasks'       => 'Tasks',
     'Templates'   => 'Templates',
     'Title'       => 'Title',
-];
+]];