From d0ee51050afc5590b8ece00e8bd1e5d851cb2dfe Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 13 Mar 2018 20:55:24 +0100
Subject: [PATCH] Nullable+void typehint

---
 Admin/Install/Navigation.php |  2 +-
 Admin/Installer.php          |  6 +++---
 Controller.php               | 24 ++++++++++++------------
 Models/Group.php             |  4 ++--
 Models/Module.php            |  6 +++---
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 29d31c2..6ac69b9 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -36,7 +36,7 @@ class Navigation
      *
      * @since  1.0.0
      */
-    public static function install(string $path = null, DatabasePool $dbPool = null) /* : void */
+    public static function install(string $path = null, DatabasePool $dbPool = null) : void
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
         $class   = '\\Modules\\Navigation\\Admin\\Installer';
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 50133fb..9226dc0 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -281,7 +281,7 @@ class Installer extends InstallerAbstract
      *
      * @since  1.0.0
      */
-    public static function installExternal(DatabasePool $dbPool, array $data) /* : void */
+    public static function installExternal(DatabasePool $dbPool, array $data) : void
     {
         foreach ($data as $type => $element) {
             if ($type === InstallType::PERMISSION) {
@@ -302,7 +302,7 @@ class Installer extends InstallerAbstract
      *
      * @since  1.0.0
      */
-    public static function installPermission(DatabasePool $dbPool, array $data) /* : void */
+    public static function installPermission(DatabasePool $dbPool, array $data) : void
     {
         $sth = $dbPool->get()->con->prepare(
             'INSERT INTO `' . $dbPool->get()->prefix . 'permission` (`permission_id`, `permission_name`, `permission_description`) VALUES
@@ -330,7 +330,7 @@ class Installer extends InstallerAbstract
      *
      * @since  1.0.0
      */
-    public static function installGroup(DatabasePool $dbPool, array $data) /* : void */
+    public static function installGroup(DatabasePool $dbPool, array $data) : void
     {
         $sth = $dbPool->get()->con->prepare(
             'INSERT INTO `' . $dbPool->get()->prefix . 'group` (`group_id`, `group_name`, `group_description`) VALUES
diff --git a/Controller.php b/Controller.php
index b782095..8e727f8 100644
--- a/Controller.php
+++ b/Controller.php
@@ -418,7 +418,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SETTINGS)
@@ -442,7 +442,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SETTINGS)
@@ -471,7 +471,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@@ -501,7 +501,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@@ -577,7 +577,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@@ -636,7 +636,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::GROUP)
@@ -668,7 +668,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@@ -698,7 +698,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@@ -747,7 +747,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@@ -809,7 +809,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@@ -841,7 +841,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ACCOUNT)
@@ -901,7 +901,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         $module = $request->getData('module');
         $status = $request->getData('status');
diff --git a/Models/Group.php b/Models/Group.php
index fcfb85d..ec09ec9 100644
--- a/Models/Group.php
+++ b/Models/Group.php
@@ -93,7 +93,7 @@ class Group extends \phpOMS\Account\Group
      *
      * @since  1.0.0
      */
-    public function setCreatedBy($createdBy) /* : void */
+    public function setCreatedBy($createdBy) : void
     {
         $this->createdBy = $createdBy;
     }
@@ -107,7 +107,7 @@ class Group extends \phpOMS\Account\Group
      *
      * @since  1.0.0
      */
-    public function setDescriptionRaw(string $description) /* : void */
+    public function setDescriptionRaw(string $description) : void
     {
         $this->descriptionRaw = $description;
     }
diff --git a/Models/Module.php b/Models/Module.php
index b7e33d9..5610c5d 100644
--- a/Models/Module.php
+++ b/Models/Module.php
@@ -122,7 +122,7 @@ class Module
      *
      * @since  1.0.0
      */
-    public function setName(string $name) /* : void */
+    public function setName(string $name) : void
     {
         $this->name = $name;
     }
@@ -148,7 +148,7 @@ class Module
      *
      * @since  1.0.0
      */
-    public function setDescription(string $description) /* : void */
+    public function setDescription(string $description) : void
     {
         $this->description = $description;
     }
@@ -174,7 +174,7 @@ class Module
      *
      * @since  1.0.0
      */
-    public function setStatus(int $status) /* : void */
+    public function setStatus(int $status) : void
     {
         // todo: check valid
         $this->status = $status;