From 337107fe5269bbf07c90a27de9ab960f03cec7c1 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Mon, 26 Sep 2022 15:58:38 +0200
Subject: [PATCH] remove warning issues

---
 src/Application/Model/d3totp.php                       |  3 +--
 src/Application/views/admin/tpl/d3user_totp.tpl        |  2 +-
 src/Application/views/tpl/d3_account_totp.tpl          |  2 +-
 src/metadata.php                                       | 10 ++++------
 .../Application/Controller/d3_account_totpTest.php     |  4 ++--
 .../Controller/Admin/d3_totp_LoginControllerTest.php   |  4 ++--
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/Application/Model/d3totp.php b/src/Application/Model/d3totp.php
index 04041dd..99960ce 100644
--- a/src/Application/Model/d3totp.php
+++ b/src/Application/Model/d3totp.php
@@ -17,7 +17,6 @@ use BaconQrCode\Renderer\RendererInterface;
 use BaconQrCode\Writer;
 use D3\Totp\Application\Factory\BaconQrCodeFactory;
 use D3\Totp\Application\Model\Exceptions\d3totp_wrongOtpException;
-use Doctrine\DBAL\DBALException;
 use OTPHP\TOTP;
 use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\Eshop\Core\Database\Adapter\DatabaseInterface;
@@ -89,7 +88,7 @@ class d3totp extends BaseModel
      */
     public function getUser()
     {
-        $userId = $this->userId ? $this->userId : $this->getFieldData('oxuserid');
+        $userId = $this->userId ?: $this->getFieldData('oxuserid');
 
         $user = $this->d3GetUser();
         $user->load($userId);
diff --git a/src/Application/views/admin/tpl/d3user_totp.tpl b/src/Application/views/admin/tpl/d3user_totp.tpl
index e0e521d..ff09173 100644
--- a/src/Application/views/admin/tpl/d3user_totp.tpl
+++ b/src/Application/views/admin/tpl/d3user_totp.tpl
@@ -10,7 +10,7 @@
     [{assign var="readonly" value=""}]
 [{/if}]
 
-<style type="text/css">
+<style>
     td.edittext {
         white-space: normal;
     }
diff --git a/src/Application/views/tpl/d3_account_totp.tpl b/src/Application/views/tpl/d3_account_totp.tpl
index f30039e..0362b79 100644
--- a/src/Application/views/tpl/d3_account_totp.tpl
+++ b/src/Application/views/tpl/d3_account_totp.tpl
@@ -6,7 +6,7 @@
     [{assign var="userid" value=$user->getId()}]
     [{$totp->loadByUserId($userid)}]
 
-    <style type="text/css">
+    <style>
         .registerNew {
             display: none;
         }
diff --git a/src/metadata.php b/src/metadata.php
index a4fab65..231d0db 100644
--- a/src/metadata.php
+++ b/src/metadata.php
@@ -38,18 +38,16 @@ use OxidEsales\Eshop\Application\Model as OxidModel;
 $sMetadataVersion = '2.0';
 
 $sModuleId = 'd3totp';
+$logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em">';
+
 /**
  * Module information
  */
 $aModule = [
     'id'            => $sModuleId,
     'title'         => [
-        'de'        => 
-            '<svg style="height:1em;width:1em"><image xlink:href="https://logos.oxidmodule.com/d3logo.svg" style="height:1em;width:1em" /></svg> '.
-            'Zwei-Faktor-Authentisierung',
-        'en'        => 
-            '<svg style="height:1em;width:1em"><image xlink:href="https://logos.oxidmodule.com/d3logo.svg" style="height:1em;width:1em" /></svg> '.
-            'two-factor authentication',
+        'de'        => $logo . 'Zwei-Faktor-Authentisierung',
+        'en'        => $logo . 'two-factor authentication',
     ],
     'description'   => [
         'de'        => 'Zwei-Faktor-Authentisierung (TOTP) f&uuml;r OXID eSales Shop',
diff --git a/src/tests/unit/Application/Controller/d3_account_totpTest.php b/src/tests/unit/Application/Controller/d3_account_totpTest.php
index 1196f74..8cc092d 100644
--- a/src/tests/unit/Application/Controller/d3_account_totpTest.php
+++ b/src/tests/unit/Application/Controller/d3_account_totpTest.php
@@ -30,14 +30,14 @@ class d3_account_totpTest extends d3TotpUnitTestCase
     /**
      * setup basic requirements
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->_oController = oxNew(d3_account_totp::class);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php b/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php
index c7642c2..8f5e098 100644
--- a/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php
+++ b/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php
@@ -33,14 +33,14 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase
     /**
      * setup basic requirements
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->_oController = oxNew(d3_totp_LoginController::class);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();