From afc22852499c62bdaa359efaefda60e5d60cbe82 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   | 16 ++++++++--------
 Models/Collection.php              |  2 +-
 Models/CollectionMapper.php        | 16 ++++++++++++----
 Theme/Backend/media-single.tpl.php |  2 --
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 33f24e7..8fe55fe 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 6d97751..938af31 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -20,9 +20,9 @@ use Modules\Media\Models\MediaMapper;
 use Modules\Media\Views\MediaView;
 
 use phpOMS\Asset\AssetType;
+use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Model\Html\Head;
 use phpOMS\Views\View;
 
 /**
@@ -96,7 +96,7 @@ final class BackendController extends Controller
      */
     public static function setUpFileUploader(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
-        /** @var Head $head */
+        /** @var \phpOMS\Model\Html\Head $head */
         $head = $response->get('Content')->getData('head');
         $head->addAsset(AssetType::JSLATE, '/Modules/Media/Models/Upload.js');
         $head->addAsset(AssetType::JSLATE, '/Modules/Media/Controller.js');
@@ -107,12 +107,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 viewMediaList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewMediaList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Media/Theme/Backend/media-list');
@@ -129,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 viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new MediaView($this->app, $request, $response);
         $view->setTemplate('/Modules/Media/Theme/Backend/media-single');
@@ -155,12 +155,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 viewMediaCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewMediaCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Media/Theme/Backend/media-create');
diff --git a/Models/Collection.php b/Models/Collection.php
index d24e426..7c8be62 100644
--- a/Models/Collection.php
+++ b/Models/Collection.php
@@ -28,7 +28,7 @@ class Collection extends Media implements \Iterator
     /**
      * Resource id.
      *
-     * @var int[]
+     * @var array<int|Media>
      * @since 1.0.0
      */
     private $sources = [];
diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php
index 85febac..e6a229a 100644
--- a/Models/CollectionMapper.php
+++ b/Models/CollectionMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Media
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -14,12 +14,20 @@ declare(strict_types=1);
 
 namespace Modules\Media\Models;
 
-
+/**
+ * Mapper class.
+ *
+ * @package    Modules\Media
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
+ * @since      1.0.0
+ */
 final class CollectionMapper extends MediaMapper
-{    /**
+{
+    /**
      * Has many relation.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array<string, null|string>>
      * @since 1.0.0
      */
     protected static $hasMany = [
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index 137ce4e..232aa64 100644
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -19,8 +19,6 @@ include __DIR__ . '/template-functions.php';
 
 /**
  * @var \phpOMS\Views\View $this
- */
-/**
  * @var $media \Modules\Media\Models\Media
  */
 $media = $this->getData('media');