From 44fa31a4d2719f2a6614461924cc39b07b8d5252 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 5 Apr 2022 20:04:47 +0200
Subject: [PATCH] static code analysis fixes

---
 Controller/ApiController.php |  2 +-
 Interfaces/OMS/Exporter.php  | 10 ----------
 Interfaces/OMS/Importer.php  | 12 +-----------
 composer.json                |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index d238f50..5a50e1d 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -99,7 +99,7 @@ final class ApiController extends Controller
         $remoteConnection = new NullConnection();
         if (!empty($request->getData('dbtype'))) {
             $remoteConnection = ConnectionFactory::create([
-                'db'       => $request->getData('dbtype') ?? null,
+                'db'       => $request->getData('dbtype'),
                 'host'     => $request->getData('dbhost') ?? null,
                 'port'     => $request->getData('dbport') ?? null,
                 'database' => $request->getData('dbdatabase') ?? null,
diff --git a/Interfaces/OMS/Exporter.php b/Interfaces/OMS/Exporter.php
index 6ce44d1..cb58f35 100755
--- a/Interfaces/OMS/Exporter.php
+++ b/Interfaces/OMS/Exporter.php
@@ -17,8 +17,6 @@ namespace Modules\Exchange\Interfaces\OMS;
 use Modules\Exchange\Models\ExchangeLog;
 use Modules\Exchange\Models\ExchangeType;
 use Modules\Exchange\Models\ExporterAbstract;
-use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
-use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Utils\StringUtils;
 
@@ -40,14 +38,6 @@ final class Exporter extends ExporterAbstract
      */
     private int $account = 1;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(ConnectionAbstract $local, L11nManager $l11n)
-    {
-        parent::__construct($local, $l11n);
-    }
-
     /**
      * Export all data in time span
      *
diff --git a/Interfaces/OMS/Importer.php b/Interfaces/OMS/Importer.php
index d1e178e..82bdc7b 100755
--- a/Interfaces/OMS/Importer.php
+++ b/Interfaces/OMS/Importer.php
@@ -18,10 +18,8 @@ use Modules\Exchange\Models\ExchangeLog;
 use Modules\Exchange\Models\ExchangeType;
 use Modules\Exchange\Models\ImporterAbstract;
 use Modules\Media\Controller\ApiController;
-use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
 use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
 use phpOMS\DataStorage\Database\DatabaseStatus;
-use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\RequestAbstract;
 
@@ -43,14 +41,6 @@ final class Importer extends ImporterAbstract
      */
     private int $account = 1;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(ConnectionAbstract $local, ConnectionAbstract $remote, L11nManager $l11n)
-    {
-        parent::__construct($local, $remote, $l11n);
-    }
-
     /**
      * Import all data in time span
      *
@@ -87,7 +77,7 @@ final class Importer extends ImporterAbstract
 
         if ($request->getData('db') !== null) {
             $this->remote = ConnectionFactory::create([
-                'db'             => (string) ($request->getData('db') ?? ''),
+                'db'             => (string) ($request->getData('db')),
                 'host'           => (string) ($request->getData('host') ?? ''),
                 'port'           => (int) ($request->getData('port') ?? 0),
                 'database'       => (string) ($request->getData('database') ?? ''),
diff --git a/composer.json b/composer.json
index b90cb5e..10044a1 100755
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "friendsofphp/php-cs-fixer": ">=3.2",
         "squizlabs/php_codesniffer": ">=3.6",
         "phpmd/phpmd": ">=2.9",
-        "phpstan/phpstan": ">=0.12.58",
+        "phpstan/phpstan": ">=1.5.4",
         "phan/phan": ">=3.2.6"
     },
     "minimum-stability": "dev",