diff --git a/src/Application/Controller/Admin/d3force_2fa.php b/Application/Controller/Admin/d3force_2fa.php similarity index 100% rename from src/Application/Controller/Admin/d3force_2fa.php rename to Application/Controller/Admin/d3force_2fa.php diff --git a/src/Application/Controller/Admin/d3totpadminlogin.php b/Application/Controller/Admin/d3totpadminlogin.php similarity index 100% rename from src/Application/Controller/Admin/d3totpadminlogin.php rename to Application/Controller/Admin/d3totpadminlogin.php diff --git a/src/Application/Controller/Admin/d3user_totp.php b/Application/Controller/Admin/d3user_totp.php similarity index 100% rename from src/Application/Controller/Admin/d3user_totp.php rename to Application/Controller/Admin/d3user_totp.php diff --git a/src/Application/Controller/d3_account_totp.php b/Application/Controller/d3_account_totp.php similarity index 100% rename from src/Application/Controller/d3_account_totp.php rename to Application/Controller/d3_account_totp.php diff --git a/src/Application/Controller/d3totplogin.php b/Application/Controller/d3totplogin.php similarity index 100% rename from src/Application/Controller/d3totplogin.php rename to Application/Controller/d3totplogin.php diff --git a/src/Application/Factory/BaconQrCodeFactory.php b/Application/Factory/BaconQrCodeFactory.php similarity index 100% rename from src/Application/Factory/BaconQrCodeFactory.php rename to Application/Factory/BaconQrCodeFactory.php diff --git a/src/Application/Model/Exceptions/d3totp_wrongOtpException.php b/Application/Model/Exceptions/d3totp_wrongOtpException.php similarity index 100% rename from src/Application/Model/Exceptions/d3totp_wrongOtpException.php rename to Application/Model/Exceptions/d3totp_wrongOtpException.php diff --git a/src/Application/Model/d3RandomGenerator.php b/Application/Model/d3RandomGenerator.php similarity index 100% rename from src/Application/Model/d3RandomGenerator.php rename to Application/Model/d3RandomGenerator.php diff --git a/src/Application/Model/d3backupcode.php b/Application/Model/d3backupcode.php similarity index 100% rename from src/Application/Model/d3backupcode.php rename to Application/Model/d3backupcode.php diff --git a/src/Application/Model/d3backupcodelist.php b/Application/Model/d3backupcodelist.php similarity index 100% rename from src/Application/Model/d3backupcodelist.php rename to Application/Model/d3backupcodelist.php diff --git a/src/Application/Model/d3totp.php b/Application/Model/d3totp.php similarity index 100% rename from src/Application/Model/d3totp.php rename to Application/Model/d3totp.php diff --git a/src/Application/Model/d3totp_conf.php b/Application/Model/d3totp_conf.php similarity index 100% rename from src/Application/Model/d3totp_conf.php rename to Application/Model/d3totp_conf.php diff --git a/src/Application/translations/de/d3_totp_lang.php b/Application/translations/de/d3_totp_lang.php similarity index 100% rename from src/Application/translations/de/d3_totp_lang.php rename to Application/translations/de/d3_totp_lang.php diff --git a/src/Application/translations/en/d3_totp_lang.php b/Application/translations/en/d3_totp_lang.php similarity index 100% rename from src/Application/translations/en/d3_totp_lang.php rename to Application/translations/en/d3_totp_lang.php diff --git a/src/Application/views/admin/blocks/d3totp_login_admin_login_form.tpl b/Application/views/admin/blocks/d3totp_login_admin_login_form.tpl similarity index 100% rename from src/Application/views/admin/blocks/d3totp_login_admin_login_form.tpl rename to Application/views/admin/blocks/d3totp_login_admin_login_form.tpl diff --git a/src/Application/views/admin/de/d3totp_lang.php b/Application/views/admin/de/d3totp_lang.php similarity index 100% rename from src/Application/views/admin/de/d3totp_lang.php rename to Application/views/admin/de/d3totp_lang.php diff --git a/src/Application/views/admin/en/d3totp_lang.php b/Application/views/admin/en/d3totp_lang.php similarity index 100% rename from src/Application/views/admin/en/d3totp_lang.php rename to Application/views/admin/en/d3totp_lang.php diff --git a/src/Application/views/admin/tpl/d3totplogin.tpl b/Application/views/admin/tpl/d3totplogin.tpl similarity index 100% rename from src/Application/views/admin/tpl/d3totplogin.tpl rename to Application/views/admin/tpl/d3totplogin.tpl diff --git a/src/Application/views/admin/tpl/d3user_totp.tpl b/Application/views/admin/tpl/d3user_totp.tpl similarity index 100% rename from src/Application/views/admin/tpl/d3user_totp.tpl rename to Application/views/admin/tpl/d3user_totp.tpl diff --git a/src/Application/views/blocks/page/account/account_dashboard_col2_flow.tpl b/Application/views/blocks/page/account/account_dashboard_col2_flow.tpl similarity index 100% rename from src/Application/views/blocks/page/account/account_dashboard_col2_flow.tpl rename to Application/views/blocks/page/account/account_dashboard_col2_flow.tpl diff --git a/src/Application/views/blocks/page/account/account_dashboard_col2_wave.tpl b/Application/views/blocks/page/account/account_dashboard_col2_wave.tpl similarity index 100% rename from src/Application/views/blocks/page/account/account_dashboard_col2_wave.tpl rename to Application/views/blocks/page/account/account_dashboard_col2_wave.tpl diff --git a/src/Application/views/blocks/page/account/inc/account_menu.tpl b/Application/views/blocks/page/account/inc/account_menu.tpl similarity index 100% rename from src/Application/views/blocks/page/account/inc/account_menu.tpl rename to Application/views/blocks/page/account/inc/account_menu.tpl diff --git a/src/Application/views/blocks/widget/header/widget_header_servicebox_items.tpl b/Application/views/blocks/widget/header/widget_header_servicebox_items.tpl similarity index 100% rename from src/Application/views/blocks/widget/header/widget_header_servicebox_items.tpl rename to Application/views/blocks/widget/header/widget_header_servicebox_items.tpl diff --git a/src/Application/views/tpl/d3_account_totp.tpl b/Application/views/tpl/d3_account_totp.tpl similarity index 100% rename from src/Application/views/tpl/d3_account_totp.tpl rename to Application/views/tpl/d3_account_totp.tpl diff --git a/src/Application/views/tpl/d3totplogin.tpl b/Application/views/tpl/d3totplogin.tpl similarity index 100% rename from src/Application/views/tpl/d3totplogin.tpl rename to Application/views/tpl/d3totplogin.tpl diff --git a/src/IntelliSenseHelper.php b/IntelliSenseHelper.php similarity index 100% rename from src/IntelliSenseHelper.php rename to IntelliSenseHelper.php diff --git a/src/Modules/Application/Component/d3_totp_UserComponent.php b/Modules/Application/Component/d3_totp_UserComponent.php similarity index 100% rename from src/Modules/Application/Component/d3_totp_UserComponent.php rename to Modules/Application/Component/d3_totp_UserComponent.php diff --git a/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php b/Modules/Application/Controller/Admin/d3_totp_LoginController.php similarity index 100% rename from src/Modules/Application/Controller/Admin/d3_totp_LoginController.php rename to Modules/Application/Controller/Admin/d3_totp_LoginController.php diff --git a/src/Modules/Application/Controller/d3_totp_OrderController.php b/Modules/Application/Controller/d3_totp_OrderController.php similarity index 100% rename from src/Modules/Application/Controller/d3_totp_OrderController.php rename to Modules/Application/Controller/d3_totp_OrderController.php diff --git a/src/Modules/Application/Controller/d3_totp_PaymentController.php b/Modules/Application/Controller/d3_totp_PaymentController.php similarity index 100% rename from src/Modules/Application/Controller/d3_totp_PaymentController.php rename to Modules/Application/Controller/d3_totp_PaymentController.php diff --git a/src/Modules/Application/Controller/d3_totp_UserController.php b/Modules/Application/Controller/d3_totp_UserController.php similarity index 100% rename from src/Modules/Application/Controller/d3_totp_UserController.php rename to Modules/Application/Controller/d3_totp_UserController.php diff --git a/src/Modules/Application/Controller/d3_totp_getUserTrait.php b/Modules/Application/Controller/d3_totp_getUserTrait.php similarity index 100% rename from src/Modules/Application/Controller/d3_totp_getUserTrait.php rename to Modules/Application/Controller/d3_totp_getUserTrait.php diff --git a/src/Modules/Application/Model/d3_totp_user.php b/Modules/Application/Model/d3_totp_user.php similarity index 100% rename from src/Modules/Application/Model/d3_totp_user.php rename to Modules/Application/Model/d3_totp_user.php diff --git a/src/Modules/Core/d3_totp_utils.php b/Modules/Core/d3_totp_utils.php similarity index 100% rename from src/Modules/Core/d3_totp_utils.php rename to Modules/Core/d3_totp_utils.php diff --git a/src/Modules/Core/totpSystemEventHandler.php b/Modules/Core/totpSystemEventHandler.php similarity index 100% rename from src/Modules/Core/totpSystemEventHandler.php rename to Modules/Core/totpSystemEventHandler.php diff --git a/src/Setup/Events.php b/Setup/Events.php similarity index 100% rename from src/Setup/Events.php rename to Setup/Events.php diff --git a/src/tests/phpunit.xml b/Tests/phpunit.xml similarity index 100% rename from src/tests/phpunit.xml rename to Tests/phpunit.xml diff --git a/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php b/Tests/unit/Application/Controller/Admin/d3force_2faTest.php similarity index 100% rename from src/tests/unit/Application/Controller/Admin/d3force_2faTest.php rename to Tests/unit/Application/Controller/Admin/d3force_2faTest.php diff --git a/src/tests/unit/Application/Controller/Admin/d3totpadminloginTest.php b/Tests/unit/Application/Controller/Admin/d3totpadminloginTest.php similarity index 100% rename from src/tests/unit/Application/Controller/Admin/d3totpadminloginTest.php rename to Tests/unit/Application/Controller/Admin/d3totpadminloginTest.php diff --git a/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php b/Tests/unit/Application/Controller/Admin/d3user_totpTest.php similarity index 100% rename from src/tests/unit/Application/Controller/Admin/d3user_totpTest.php rename to Tests/unit/Application/Controller/Admin/d3user_totpTest.php diff --git a/src/tests/unit/Application/Controller/d3_account_totpTest.php b/Tests/unit/Application/Controller/d3_account_totpTest.php similarity index 100% rename from src/tests/unit/Application/Controller/d3_account_totpTest.php rename to Tests/unit/Application/Controller/d3_account_totpTest.php diff --git a/src/tests/unit/Application/Controller/d3totploginTest.php b/Tests/unit/Application/Controller/d3totploginTest.php similarity index 100% rename from src/tests/unit/Application/Controller/d3totploginTest.php rename to Tests/unit/Application/Controller/d3totploginTest.php diff --git a/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php b/Tests/unit/Application/Factory/BaconQrCodeFactoryTest.php similarity index 100% rename from src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php rename to Tests/unit/Application/Factory/BaconQrCodeFactoryTest.php diff --git a/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php b/Tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php similarity index 100% rename from src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php rename to Tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php diff --git a/src/tests/unit/Application/Model/d3RandomGeneratorTest.php b/Tests/unit/Application/Model/d3RandomGeneratorTest.php similarity index 100% rename from src/tests/unit/Application/Model/d3RandomGeneratorTest.php rename to Tests/unit/Application/Model/d3RandomGeneratorTest.php diff --git a/src/tests/unit/Application/Model/d3backupcodeTest.php b/Tests/unit/Application/Model/d3backupcodeTest.php similarity index 100% rename from src/tests/unit/Application/Model/d3backupcodeTest.php rename to Tests/unit/Application/Model/d3backupcodeTest.php diff --git a/src/tests/unit/Application/Model/d3backupcodelistTest.php b/Tests/unit/Application/Model/d3backupcodelistTest.php similarity index 100% rename from src/tests/unit/Application/Model/d3backupcodelistTest.php rename to Tests/unit/Application/Model/d3backupcodelistTest.php diff --git a/src/tests/unit/Application/Model/d3totpTest.php b/Tests/unit/Application/Model/d3totpTest.php similarity index 100% rename from src/tests/unit/Application/Model/d3totpTest.php rename to Tests/unit/Application/Model/d3totpTest.php diff --git a/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php b/Tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php similarity index 100% rename from src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php rename to Tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php diff --git a/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php b/Tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php similarity index 100% rename from src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php rename to Tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php b/Tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php similarity index 100% rename from src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php rename to Tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php b/Tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php similarity index 100% rename from src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php rename to Tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php b/Tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php similarity index 100% rename from src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php rename to Tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php b/Tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php similarity index 100% rename from src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php rename to Tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php diff --git a/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php b/Tests/unit/Modules/Application/Model/d3_totp_userTest.php similarity index 100% rename from src/tests/unit/Modules/Application/Model/d3_totp_userTest.php rename to Tests/unit/Modules/Application/Model/d3_totp_userTest.php diff --git a/src/tests/unit/Modules/Core/d3_totp_utilsTest.php b/Tests/unit/Modules/Core/d3_totp_utilsTest.php similarity index 100% rename from src/tests/unit/Modules/Core/d3_totp_utilsTest.php rename to Tests/unit/Modules/Core/d3_totp_utilsTest.php diff --git a/src/tests/unit/Modules/Core/totpSystemEventHandlerTest.php b/Tests/unit/Modules/Core/totpSystemEventHandlerTest.php similarity index 100% rename from src/tests/unit/Modules/Core/totpSystemEventHandlerTest.php rename to Tests/unit/Modules/Core/totpSystemEventHandlerTest.php diff --git a/src/tests/unit/d3TotpUnitTestCase.php b/Tests/unit/d3TotpUnitTestCase.php similarity index 100% rename from src/tests/unit/d3TotpUnitTestCase.php rename to Tests/unit/d3TotpUnitTestCase.php diff --git a/src/out/admin/src/css/d3totplogin.css b/assets/out/admin/src/css/d3totplogin.css similarity index 100% rename from src/out/admin/src/css/d3totplogin.css rename to assets/out/admin/src/css/d3totplogin.css diff --git a/src/out/flow/src/css/d3totplogin.css b/assets/out/flow/src/css/d3totplogin.css similarity index 100% rename from src/out/flow/src/css/d3totplogin.css rename to assets/out/flow/src/css/d3totplogin.css diff --git a/src/picture.svg b/assets/picture.svg similarity index 100% rename from src/picture.svg rename to assets/picture.svg diff --git a/composer.json b/composer.json index f93da6e..e09459b 100644 --- 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." diff --git a/src/menu.xml b/menu.xml similarity index 100% rename from src/menu.xml rename to menu.xml diff --git a/src/metadata.php b/metadata.php similarity index 100% rename from src/metadata.php rename to metadata.php