From cec9895c93c4c290eeb44f93aff0c586b4f8e250 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 15 Oct 2017 18:54:27 +0200
Subject: [PATCH] Fix minor bugs for full inspections

---
 Admin/Uninstall.php     |  2 +-
 Admin/Update.php        |  3 ++-
 Models/Task.php         | 10 +++++-----
 Models/TaskElement.php  |  2 +-
 Models/TaskTemplate.php |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index b782b42..6767119 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -16,8 +16,8 @@ namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
-use phpOMS\Module\InfoManager;
 use phpOMS\Module\UninstallAbstract;
+use phpOMS\Module\InfoManager;
 
 /**
  * Navigation class.
diff --git a/Admin/Update.php b/Admin/Update.php
index 3aac5da..540fc38 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -15,9 +15,10 @@ declare(strict_types=1);
 namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\Module\InfoManager;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
+use phpOMS\Module\InfoManager;
+
 
 /**
  * Navigation class.
diff --git a/Models/Task.php b/Models/Task.php
index c5d5e8b..9a0b9e8 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -351,7 +351,7 @@ class Task implements \JsonSerializable
     public function setStatus(int $status)
     {
         if(!TaskStatus::isValidValue($status)) {
-            throw new InvalidEnumValue($status);
+            throw new InvalidEnumValue((string) $status);
         }
 
         $this->status = $status;
@@ -377,7 +377,7 @@ class Task implements \JsonSerializable
     public function setPriority(int $priority)
     {
         if(!TaskStatus::isValidValue($priority)) {
-            throw new InvalidEnumValue($priority);
+            throw new InvalidEnumValue((string) $priority);
         }
 
         $this->priority = $priority;
@@ -486,17 +486,17 @@ class Task implements \JsonSerializable
         return $this->schedule;
     }
 
-    private function toArray() : array
+    public function toArray() : array
     {
         return [
             'id' => $this->id,
             'createdBy' => $this->createdBy,
-            'createdAt' => $this->createdAt,
+            'createdAt' => $this->createdAt->format('Y-m-d H:i:s'),
             'title' => $this->title,
             'description' => $this->description,
             'status' => $this->status,
             'type' => $this->type,
-            'type' => $this->type,
+            'priority' => $this->priority,
             'due' => $this->due->format('Y-m-d H:i:s'),
             'done' => (!isset($this->done) ? null : $this->done->format('Y-m-d H:i:s')),
         ];
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index 04afb27..522fec5 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -267,7 +267,7 @@ class TaskElement implements \JsonSerializable
     public function setStatus(int $status)
     {
         if(!TaskStatus::isValidValue($status)) {
-            throw new InvalidEnumValue($status);
+            throw new InvalidEnumValue((string) $status);
         }
 
         $this->status = $status;
diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php
index e621bb2..0edaca4 100644
--- a/Models/TaskTemplate.php
+++ b/Models/TaskTemplate.php
@@ -31,5 +31,5 @@ class TaskTemplate extends Task
      * @var TaskType
      * @since 1.0.0
      */
-    private $type = TaskType::TEMPLATE;
+    protected $type = TaskType::TEMPLATE;
 }