From 139ba35a0d32de9f8fd3756f50db7bc48c15196e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 22 Sep 2018 18:22:44 +0200
Subject: [PATCH] Docblock fix

---
 Admin/Updater.php            |  2 +-
 Controller/ApiController.php |  2 +-
 Models/Task.php              |  2 +-
 Models/TaskElementMapper.php |  2 +-
 Models/TaskMapper.php        | 14 +++++++-------
 Models/TaskTemplate.php      |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Admin/Updater.php b/Admin/Updater.php
index 03d0634..367214f 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -16,7 +16,7 @@ namespace Modules\Tasks\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdaterAbstract;
-use phpOMS\System\File\Directory;
+use phpOMS\System\File\Local\Directory;
 use phpOMS\Module\InfoManager;
 
 /**
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5fdc2bb..e9b06f4 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -343,6 +343,6 @@ class ApiController extends Controller
         $element->setDescription(Markdown::parse((string) ($request->getData('description') ?? $element->getDescriptionRaw())));
         $element->setDescriptionRaw((string) ($request->getData('description') ?? $element->getDescriptionRaw()));
 
-        return $task;
+        return $element;
     }
 }
diff --git a/Models/Task.php b/Models/Task.php
index 8d62935..7de9a41 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -214,7 +214,7 @@ class Task implements \JsonSerializable
         $this->taskElements[] = $element;
 
         \end($this->taskElements);
-        $key = \key($this->taskElements);
+        $key = (int) \key($this->taskElements);
         \reset($this->taskElements);
 
         return $key;
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index 3905adc..a0fd814 100644
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -33,7 +33,7 @@ class TaskElementMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array<string, string|bool>>
      * @since 1.0.0
      */
     protected static $columns = [
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index 6410945..2229a7c 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -37,7 +37,7 @@ class TaskMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array<string, string|bool>>
      * @since 1.0.0
      */
     protected static $columns = [
@@ -164,14 +164,14 @@ class TaskMapper extends DataMapperAbstract
 
         $query = self::getQuery();
 
-        $whereClause1 = new Builder();
-        $whereClause1->select(TaskElementMapper::$table . '.task_element_task')
+        $whereClause1 = new Builder(self::$db);
+        $whereClause1->select(TaskElementMapper::getTable() . '.task_element_task')
             ->distinct()
-            ->from(TaskElementMapper::$table)
-            ->where(TaskElementMapper::$table . '.task_elment_created_by', '=', $user)
-            ->orWhere(TaskElementMapper::$table . '.task_element_forwarded', '=', $user);
+            ->from(TaskElementMapper::getTable())
+            ->where(TaskElementMapper::getTable() . '.task_elment_created_by', '=', $user)
+            ->orWhere(TaskElementMapper::getTable() . '.task_element_forwarded', '=', $user);
 
-        $whereClause2 = new Builder();
+        $whereClause2 = new Builder(self::$db);
         $whereClause2->select(self::$table . '.' . self::$primaryField)
             ->from(self::$table)
             ->where(self::$table . '.task_created_by', '=', $user);
diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php
index 111512b..48e6aed 100644
--- a/Models/TaskTemplate.php
+++ b/Models/TaskTemplate.php
@@ -27,7 +27,7 @@ class TaskTemplate extends Task
     /**
      * Type.
      *
-     * @var TaskType
+     * @var int
      * @since 1.0.0
      */
     protected $type = TaskType::TEMPLATE;