From aafe8769726c5c997bc17e466d34893fe3465e6c 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                     | 4 ++--
 Controller.php                            | 4 ++--
 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 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Admin/Installer.php b/Admin/Installer.php
index 3ddc660..51c1884 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\Draw\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 fa27521..c48aa85 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,12 +1,12 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/draw/create.*$' => [
         [
             'dest' => '\Modules\Draw\Controller:setUpDrawEditor', 
             'verb' => RouteVerb::GET,
-            'result' => ViewType::HTML,
-            'layout' => ViewLayout::NULL,
         ],
         [
             'dest' => '\Modules\Draw\Controller:viewDrawCreate', 
diff --git a/Controller.php b/Controller.php
index 20ad9f4..a2cdd4d 100644
--- a/Controller.php
+++ b/Controller.php
@@ -107,7 +107,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewDrawCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewDrawCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Draw/Theme/Backend/draw-create');
@@ -126,7 +126,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewDrawList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewDrawList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Draw/Theme/Backend/draw-list');
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 d66270d..81c780f 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['Draw'] = [
+return ['Draw' => [
     'Created'    => 'Created',
     'Creator'    => 'Creator',
     'Draw'       => 'Draw',
@@ -23,4 +23,4 @@ $MODLANG['Draw'] = [
     'Name'       => 'Name',
     'Permission' => 'Permission',
     'Start'      => 'Start',
-];
+]];
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index dac6410..77f067e 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -13,8 +13,8 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
+return ['Navigation' => [
     'Create' => 'Create',
     'Draw'   => 'Draw',
     'List'   => 'List',
-];
+]];
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' => [
+]];