make installable in OXID 7

2024-09-05 22:33:57 +02:00 · 2024-09-05 22:33:57 +02:00 · 9f6b689a56
Commit 9f6b689a56
--- a/src/Application/Controller/Admin/d3force_2fa.php
+++ b/src/Application/Controller/Admin/d3force_2fa.php
--- a/src/Application/Controller/Admin/d3totpadminlogin.php
+++ b/src/Application/Controller/Admin/d3totpadminlogin.php
--- a/src/Application/Controller/Admin/d3user_totp.php
+++ b/src/Application/Controller/Admin/d3user_totp.php
--- a/src/Application/Controller/d3_account_totp.php
+++ b/src/Application/Controller/d3_account_totp.php
--- a/src/Application/Controller/d3totplogin.php
+++ b/src/Application/Controller/d3totplogin.php
--- a/src/Application/Factory/BaconQrCodeFactory.php
+++ b/src/Application/Factory/BaconQrCodeFactory.php
--- a/src/Application/Model/Exceptions/d3totp_wrongOtpException.php
+++ b/src/Application/Model/Exceptions/d3totp_wrongOtpException.php
--- a/src/Application/Model/d3RandomGenerator.php
+++ b/src/Application/Model/d3RandomGenerator.php
--- a/src/Application/Model/d3backupcode.php
+++ b/src/Application/Model/d3backupcode.php
--- a/src/Application/Model/d3backupcodelist.php
+++ b/src/Application/Model/d3backupcodelist.php
--- a/src/Application/Model/d3totp.php
+++ b/src/Application/Model/d3totp.php
--- a/src/Application/Model/d3totp_conf.php
+++ b/src/Application/Model/d3totp_conf.php
--- a/src/Application/translations/de/d3_totp_lang.php
+++ b/src/Application/translations/de/d3_totp_lang.php
--- a/src/Application/translations/en/d3_totp_lang.php
+++ b/src/Application/translations/en/d3_totp_lang.php
--- a/src/Application/views/admin/blocks/d3totp_login_admin_login_form.tpl
+++ b/src/Application/views/admin/blocks/d3totp_login_admin_login_form.tpl
--- a/src/Application/views/admin/de/d3totp_lang.php
+++ b/src/Application/views/admin/de/d3totp_lang.php
--- a/src/Application/views/admin/en/d3totp_lang.php
+++ b/src/Application/views/admin/en/d3totp_lang.php
--- a/src/Application/views/admin/tpl/d3totplogin.tpl
+++ b/src/Application/views/admin/tpl/d3totplogin.tpl
--- a/src/Application/views/admin/tpl/d3user_totp.tpl
+++ b/src/Application/views/admin/tpl/d3user_totp.tpl
--- a/src/Application/views/blocks/page/account/account_dashboard_col2_flow.tpl
+++ b/src/Application/views/blocks/page/account/account_dashboard_col2_flow.tpl
--- a/src/Application/views/blocks/page/account/account_dashboard_col2_wave.tpl
+++ b/src/Application/views/blocks/page/account/account_dashboard_col2_wave.tpl
--- a/src/Application/views/blocks/page/account/inc/account_menu.tpl
+++ b/src/Application/views/blocks/page/account/inc/account_menu.tpl
--- a/src/Application/views/blocks/widget/header/widget_header_servicebox_items.tpl
+++ b/src/Application/views/blocks/widget/header/widget_header_servicebox_items.tpl
--- a/src/Application/views/tpl/d3_account_totp.tpl
+++ b/src/Application/views/tpl/d3_account_totp.tpl
--- a/src/Application/views/tpl/d3totplogin.tpl
+++ b/src/Application/views/tpl/d3totplogin.tpl
--- a/src/IntelliSenseHelper.php
+++ b/src/IntelliSenseHelper.php
--- a/src/Modules/Application/Component/d3_totp_UserComponent.php
+++ b/src/Modules/Application/Component/d3_totp_UserComponent.php
--- a/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php
+++ b/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php
--- a/src/Modules/Application/Controller/d3_totp_OrderController.php
+++ b/src/Modules/Application/Controller/d3_totp_OrderController.php
--- a/src/Modules/Application/Controller/d3_totp_PaymentController.php
+++ b/src/Modules/Application/Controller/d3_totp_PaymentController.php
--- a/src/Modules/Application/Controller/d3_totp_UserController.php
+++ b/src/Modules/Application/Controller/d3_totp_UserController.php
--- a/src/Modules/Application/Controller/d3_totp_getUserTrait.php
+++ b/src/Modules/Application/Controller/d3_totp_getUserTrait.php
--- a/src/Modules/Application/Model/d3_totp_user.php
+++ b/src/Modules/Application/Model/d3_totp_user.php
--- a/src/Modules/Core/d3_totp_utils.php
+++ b/src/Modules/Core/d3_totp_utils.php
--- a/src/Modules/Core/totpSystemEventHandler.php
+++ b/src/Modules/Core/totpSystemEventHandler.php
--- a/src/Setup/Events.php
+++ b/src/Setup/Events.php
--- a/src/tests/phpunit.xml
+++ b/src/tests/phpunit.xml
--- a/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php
+++ b/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php
--- a/src/tests/unit/Application/Controller/Admin/d3totpadminloginTest.php
+++ b/src/tests/unit/Application/Controller/Admin/d3totpadminloginTest.php
--- a/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php
+++ b/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php
--- a/src/tests/unit/Application/Controller/d3_account_totpTest.php
+++ b/src/tests/unit/Application/Controller/d3_account_totpTest.php
--- a/src/tests/unit/Application/Controller/d3totploginTest.php
+++ b/src/tests/unit/Application/Controller/d3totploginTest.php
--- a/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php
+++ b/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php
--- a/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php
+++ b/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php
--- a/src/tests/unit/Application/Model/d3RandomGeneratorTest.php
+++ b/src/tests/unit/Application/Model/d3RandomGeneratorTest.php
--- a/src/tests/unit/Application/Model/d3backupcodeTest.php
+++ b/src/tests/unit/Application/Model/d3backupcodeTest.php
--- a/src/tests/unit/Application/Model/d3backupcodelistTest.php
+++ b/src/tests/unit/Application/Model/d3backupcodelistTest.php
--- a/src/tests/unit/Application/Model/d3totpTest.php
+++ b/src/tests/unit/Application/Model/d3totpTest.php
--- a/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php
+++ b/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php
--- a/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php
+++ b/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php
--- a/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php
+++ b/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php
--- a/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php
+++ b/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php
--- a/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php
+++ b/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php
--- a/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php
+++ b/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php
--- a/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php
+++ b/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php
--- a/src/tests/unit/Modules/Core/d3_totp_utilsTest.php
+++ b/src/tests/unit/Modules/Core/d3_totp_utilsTest.php
--- a/src/tests/unit/Modules/Core/totpSystemEventHandlerTest.php
+++ b/src/tests/unit/Modules/Core/totpSystemEventHandlerTest.php
--- a/src/tests/unit/d3TotpUnitTestCase.php
+++ b/src/tests/unit/d3TotpUnitTestCase.php
--- a/assets/out/admin/src/css/d3totplogin.css
+++ b/assets/out/admin/src/css/d3totplogin.css
--- a/assets/out/flow/src/css/d3totplogin.css
+++ b/assets/out/flow/src/css/d3totplogin.css
--- a/assets/picture.svg
+++ b/assets/picture.svg
--- a/composer.json
+++ b/composer.json
@ -36,33 +36,35 @@
  "license": [
    "GPL-3.0-only"
  ],
-  "extra": {
-    "oxideshop": {
-      "source-directory": "/src",
-      "target-directory": "d3/totp"
-    }
-  },
  "require": {
-    "php": ">=7.2",
+    "php": ">=8.0",
    "ext-xmlwriter": "*",
    "ext-openssl": "*",
-    "oxid-esales/oxideshop-ce": "6.8.0 - 6.14",
+    "oxid-esales/oxideshop-ce": "7.0 - 7.1",
    "spomky-labs/otphp": "^10.0 || ^11.0",
-    "bacon/bacon-qr-code": "^2.0",
+    "bacon/bacon-qr-code": "^2.0 || ^3.0",
    "laminas/laminas-math": "^3.2",
    "d3/testingtools": "^1.0"
  },
  "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2.19",
-    "phpstan/phpstan": "^1.8"
+    "friendsofphp/php-cs-fixer": "^3.9",
+    "phpstan/phpstan": "^1.8",
+    "boxblinkracer/phpunuhi": "^1.12"
  },
  "autoload": {
    "psr-4": {
-      "D3\\Totp\\": "../../../source/modules/d3/totp"
+      "D3\\Totp\\": ""
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "D3\\Totp\\tests\\": "Tests"
    }
  },
  "scripts": {
-      "totp_phpstan": "./vendor/bin/phpstan -c./vendor/d3/oxtotp/phpstan.neon"
+      "php-cs-fixer": "./vendor/bin/php-cs-fixer fix --config=vendor/d3/oxid-twofactor-onetimepassword/.php-cs-fixer.php",
+      "phpstan": "./vendor/bin/phpstan --configuration=./vendor/d3/oxid-twofactor-onetimepassword/phpstan.neon",
+      "phpunuhi": "./vendor/bin/phpunuhi --configuration=vendor/d3/oxid-twofactor-onetimepassword/phpunuhi.xml validate"
  },
  "suggest": {
    "d3/oxid-twofactor-passwordless": "Passwordless login with FIDO2 hardware token."
--- a/src/menu.xml
+++ b/src/menu.xml
--- a/src/metadata.php
+++ b/src/metadata.php