From 4165be9c4f04af315834b29a8eb84b381b38f8b8 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                  | 4 ++--
 Controller/ApiController.php       | 8 +++++++-
 Controller/BackendController.php   | 4 +++-
 Models/AccountPermission.php       | 2 +-
 Models/AccountPermissionMapper.php | 2 +-
 Models/GroupMapper.php             | 2 +-
 Models/GroupPermissionMapper.php   | 2 +-
 Models/ModuleMapper.php            | 2 +-
 8 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Admin/Updater.php b/Admin/Updater.php
index 51a0bab..c8120b0 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -17,7 +17,7 @@ namespace Modules\Admin\Admin;
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdaterAbstract;
 use phpOMS\Module\InfoManager;
-use phpOMS\System\File\Directory;
+use phpOMS\System\File\Local\Directory;
 
 /**
  * Update class.
@@ -35,7 +35,7 @@ class Updater extends UpdaterAbstract
      */
     public static function update(DatabasePool $dbPool, InfoManager $info) : void
     {
-        Directory::deletePath(__DIR__ . '/Update');
+        Directory::delete(__DIR__ . '/Update');
         \mkdir('Update');
         parent::update($dbPool, $info);
     }
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 076d7d2..d21ac7d 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -553,7 +553,13 @@ final class ApiController extends Controller
         $status = (int) $request->getData('status');
 
         if (empty($module) || empty($status)) {
-            $response->set('module_stutus_update', null);
+            $response->set($request->getUri()->__toString(), [
+                'status' => 'warning',
+                'title' => 'Module',
+                'message' => 'Invalid module or status',
+                'response' => []
+            ]);
+
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
             return;
         }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 49f0400..16f92b9 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -318,7 +318,9 @@ final class BackendController extends Controller
         $view->setData('installed', $installed = $this->app->moduleManager->getInstalledModules());
         $view->setData('id', $id);
 
-        if (isset($installed[$id]) && ($path = \realpath(__DIR__ . '/../' . $id . '/info.json')) !== false) {
+        $path = \realpath(__DIR__ . '/../' . $id . '/info.json');
+
+        if (isset($installed[$id]) && $path !== false) {
             $info = new InfoManager($path);
             $info->load();
 
diff --git a/Models/AccountPermission.php b/Models/AccountPermission.php
index 21c457a..b0cbe8e 100644
--- a/Models/AccountPermission.php
+++ b/Models/AccountPermission.php
@@ -39,7 +39,7 @@ class AccountPermission extends PermissionAbstract
     /**
      * Constructor.
      *
-     * @param int $group Group id
+     * @param int $account Group id
      *
      * @since  1.0.0
      */
diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php
index b0358c3..d4877f3 100644
--- a/Models/AccountPermissionMapper.php
+++ b/Models/AccountPermissionMapper.php
@@ -30,7 +30,7 @@ class AccountPermissionMapper 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/GroupMapper.php b/Models/GroupMapper.php
index a3db6a6..72d71c8 100644
--- a/Models/GroupMapper.php
+++ b/Models/GroupMapper.php
@@ -30,7 +30,7 @@ class GroupMapper 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/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php
index e215d05..4f4a584 100644
--- a/Models/GroupPermissionMapper.php
+++ b/Models/GroupPermissionMapper.php
@@ -30,7 +30,7 @@ class GroupPermissionMapper 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/ModuleMapper.php b/Models/ModuleMapper.php
index acb994b..8391cdd 100644
--- a/Models/ModuleMapper.php
+++ b/Models/ModuleMapper.php
@@ -30,7 +30,7 @@ class ModuleMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array<string, string|bool>>
      * @since 1.0.0
      */
     protected static $columns = [