From 402d793d83954a17f62b49af49bc29bd69133f33 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 7 Feb 2019 00:05:31 +0100
Subject: [PATCH] phpcs+phpstan fixes

---
 Admin/Install/Navigation.php     |  2 +-
 Controller/BackendController.php | 29 +++++++++++++++--------------
 Controller/Controller.php        |  1 -
 Models/WikiDocMapper.php         | 10 ++--------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index e413960..d064295 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, DatabasePool $dbPool) : void
     {
         \Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']);
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index f1eb117..ceeab2a 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -22,6 +22,7 @@ use Modules\Knowledgebase\Models\WikiDocMapper;
 
 use phpOMS\Account\PermissionType;
 use phpOMS\Asset\AssetType;
+use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
@@ -59,12 +60,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
 
@@ -82,12 +83,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseCategoryList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseCategoryList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
 
@@ -105,12 +106,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseDocList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseDocList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
 
@@ -128,12 +129,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseCategory(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseCategory(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
 
@@ -151,12 +152,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseCategoryCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseCategoryCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-single');
@@ -172,12 +173,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseDoc(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseDoc(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
 
@@ -204,12 +205,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable
+     * @return RenderableInterface
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewKnowledgebaseDocCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewKnowledgebaseDocCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
 
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 47d9b5d..6ff0287 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\Controller;
 
-
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
 
diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php
index 80b7de5..7af60c8 100644
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -50,12 +50,6 @@ final class WikiDocMapper extends DataMapperAbstract
      * @var array<string, array<string, null|string>>
      * @since 1.0.0
      */
-    /*    /**
-     * Has many relation.
-     *
-     * @var array<string, array<string, string>>
-     * @since 1.0.0
-     */
     protected static $hasMany = [
         'badges' => [
             'mapper' => BadgeMapper::class,
@@ -63,10 +57,10 @@ final class WikiDocMapper extends DataMapperAbstract
             'src'    => 'wiki_article_badge_badge',
             'dst'    => 'wiki_article_badge_article',
         ],
-    ];*/
+    ];
 
     /**
-     * Has many relation.
+     * Has owns one relation.
      *
      * @var array<string, array<string, null|string>>
      * @since 1.0.0