From 9e6faa024dcc8bd15548754af4bb506c4c772f64 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/ApiController.php                 |  3 +--
 Controller/BackendController.php             | 20 ++++++++++----------
 Controller/Controller.php                    |  2 --
 Interfaces/GSD/Model/GSDAddressMapper.php    |  6 +++---
 Interfaces/GSD/Model/GSDArticleMapper.php    |  6 +++---
 Interfaces/GSD/Model/GSDCostCenter.php       |  7 +++----
 Interfaces/GSD/Model/GSDCostCenterMapper.php | 14 +++++++-------
 Interfaces/GSD/Model/GSDCostObject.php       |  7 +++----
 Interfaces/GSD/Model/GSDCostObjectMapper.php | 14 +++++++-------
 Interfaces/GSD/Model/GSDCustomerMapper.php   |  8 ++++----
 Models/InterfaceManager.php                  |  9 +++++----
 12 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 6e0e868..3cdea99 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/ApiController.php b/Controller/ApiController.php
index f43bc9f..ea2401f 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -20,7 +20,6 @@ use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 
-
 /**
  * Exchange controller class.
  *
@@ -57,7 +56,7 @@ final class ApiController extends Controller
         }
 
         $response->set($request->getUri()->__toString(), [
-            'status' => status,
+            'status' => $status,
             'title' => 'Exchange',
             'message' => $message
         ]);
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a4931a8..6fa5c35 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -16,9 +16,9 @@ namespace Modules\Exchange\Controller;
 
 use Modules\Exchange\Models\InterfaceManagerMapper;
 
+use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-
 use phpOMS\Views\View;
 
 /**
@@ -32,7 +32,7 @@ use phpOMS\Views\View;
 final class BackendController extends Controller
 {
 
-    public function viewExchangeDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewExchangeDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-dashboard');
@@ -48,12 +48,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable Serializable web view
+     * @return RenderableInterface Response can be rendered
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewExchangeExportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewExchangeExportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export-list');
@@ -80,12 +80,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable Serializable web view
+     * @return RenderableInterface Response can be rendered
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewExchangeImportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewExchangeImportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import-list');
@@ -112,12 +112,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable Serializable web view
+     * @return RenderableInterface Response can be rendered
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewExchangeExport(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewExchangeExport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export');
@@ -133,12 +133,12 @@ final class BackendController extends Controller
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return \Serializable Serializable web view
+     * @return RenderableInterface Response can be rendered
      *
      * @since  1.0.0
      * @codeCoverageIgnore
      */
-    public function viewExchangeImport(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    public function viewExchangeImport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import');
diff --git a/Controller/Controller.php b/Controller/Controller.php
index c8f10ef..701c8bb 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,8 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\Exchange\Controller;
 
-
-
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
 
diff --git a/Interfaces/GSD/Model/GSDAddressMapper.php b/Interfaces/GSD/Model/GSDAddressMapper.php
index ffa04d3..76f97fe 100644
--- a/Interfaces/GSD/Model/GSDAddressMapper.php
+++ b/Interfaces/GSD/Model/GSDAddressMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,14 +12,14 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Mapper class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Interfaces/GSD/Model/GSDArticleMapper.php b/Interfaces/GSD/Model/GSDArticleMapper.php
index 59aa6de..ddbc2f7 100644
--- a/Interfaces/GSD/Model/GSDArticleMapper.php
+++ b/Interfaces/GSD/Model/GSDArticleMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,14 +12,14 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Mapper class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Interfaces/GSD/Model/GSDCostCenter.php b/Interfaces/GSD/Model/GSDCostCenter.php
index a2417c7..eda7469 100644
--- a/Interfaces/GSD/Model/GSDCostCenter.php
+++ b/Interfaces/GSD/Model/GSDCostCenter.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,13 +12,12 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
-
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 /**
  * Cost center class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Interfaces/GSD/Model/GSDCostCenterMapper.php b/Interfaces/GSD/Model/GSDCostCenterMapper.php
index 04fab79..49fa710 100644
--- a/Interfaces/GSD/Model/GSDCostCenterMapper.php
+++ b/Interfaces/GSD/Model/GSDCostCenterMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,14 +12,14 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Mapper class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
@@ -30,7 +30,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, bool|string>>
+     * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
     protected static $columns = [
@@ -44,7 +44,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
     /**
      * Primary table.
      *
-     * @var string
+     * @var string
      * @since 1.0.0
      */
     protected static $table = 'FiKostenstellen';
@@ -52,7 +52,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
     /**
      * Created at.
      *
-     * @var string
+     * @var string
      * @since 1.0.0
      */
     protected static $createdAt = 'row_create_time';
@@ -60,7 +60,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
     /**
      * Primary field name.
      *
-     * @var string
+     * @var string
      * @since 1.0.0
      */
     protected static $primaryField = 'ROW_ID';
diff --git a/Interfaces/GSD/Model/GSDCostObject.php b/Interfaces/GSD/Model/GSDCostObject.php
index 7aa2f78..ebc7c01 100644
--- a/Interfaces/GSD/Model/GSDCostObject.php
+++ b/Interfaces/GSD/Model/GSDCostObject.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,13 +12,12 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
-
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 /**
  * Cost object class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Interfaces/GSD/Model/GSDCostObjectMapper.php b/Interfaces/GSD/Model/GSDCostObjectMapper.php
index ce6ae67..6cd4db4 100644
--- a/Interfaces/GSD/Model/GSDCostObjectMapper.php
+++ b/Interfaces/GSD/Model/GSDCostObjectMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,14 +12,14 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Mapper class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
@@ -30,7 +30,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, bool|string>>
+     * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
     protected static $columns = [
@@ -44,7 +44,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
     /**
      * Primary table.
      *
-     * @var string
+     * @var string
      * @since 1.0.0
      */
     protected static $table = 'FiKostentraeger';
@@ -52,7 +52,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
     /**
      * Created at.
      *
-     * @var string
+     * @var string
      * @since 1.0.0
      */
     protected static $createdAt = 'row_create_time';
@@ -60,7 +60,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
     /**
      * Primary field name.
      *
-     * @var string
+     * @var string
      * @since 1.0.0
      */
     protected static $primaryField = 'ROW_ID';
diff --git a/Interfaces/GSD/Model/GSDCustomerMapper.php b/Interfaces/GSD/Model/GSDCustomerMapper.php
index ea8c619..70a0b40 100644
--- a/Interfaces/GSD/Model/GSDCustomerMapper.php
+++ b/Interfaces/GSD/Model/GSDCustomerMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,14 +12,14 @@
  */
 declare(strict_types=1);
 
-namespace Interfaces\GSD\Models;
+namespace Modules\Exchange\Interfaces\GSD\Model;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Mapper class.
  *
- * @package    Interfaces\GSD\Models
+ * @package    Modules\Exchange\Interfaces\GSD\Model
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
@@ -41,7 +41,7 @@ final class GSDCustomerMapper extends DataMapperAbstract
 
     protected static $ownsOne = [
         'mainAddress' => [
-            'mapper' => GSDAddress::class,
+            'mapper' => GSDAddressMapper::class,
             'src'    => 'AddressId',
         ],
     ];
diff --git a/Models/InterfaceManager.php b/Models/InterfaceManager.php
index b8cf094..c9589da 100644
--- a/Models/InterfaceManager.php
+++ b/Models/InterfaceManager.php
@@ -68,7 +68,7 @@ class InterfaceManager
     /**
      * Get id
      *
-     * @return string
+     * @return int
      *
      * @since  1.0.0
      */
@@ -116,7 +116,7 @@ class InterfaceManager
     /**
      * Provides import interface
      *
-     * @return string
+     * @return bool
      *
      * @since  1.0.0
      */
@@ -128,7 +128,7 @@ class InterfaceManager
     /**
      * Provides export interface
      *
-     * @return string
+     * @return bool
      *
      * @since  1.0.0
      */
@@ -152,7 +152,8 @@ class InterfaceManager
             throw new PathException($this->path);
         }
 
-        $this->info = \json_decode(\file_get_contents($this->path), true);
+        $content    = \file_get_contents($this->path);
+        $this->info = \json_decode($content !== false ? $content : '[]', true);
     }
 
     /**