Merge branch 'master' into feature/532_show_validation_errors_during_registration

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Enh: Keycloak auth client (e.luhr)
 - Fix: Social Network Auth (eluhr)
 - Enh #532: /user/registration/register now shows form validation errors
+- Enh: Allow/suggest new v3 releases of 2amigos 2fa dependencies: 2fa-library, qrcode-library (TonisOrmisson) 
 
 ## 1.6.2 Jan 4th, 2024
 

composer.json

@@ -49,13 +49,13 @@
     },
     "suggest": {
         "yiisoft/yii2-symfonymailer": "A mailer driver is needed to send e-mails. Older versions use abandoned Swiftmailer which can be replaced with symfonymailer",
-        "2amigos/2fa-library": "Needed if you want to enable 2 Factor Authentication. Require version ^1.0",
-        "2amigos/qrcode-library": "Needed if you want to enable 2FA with QR Code generation. Require version ^1.1"
+        "2amigos/2fa-library": "Needed if you want to enable 2 Factor Authentication. Require version ^2 or ^3",
+        "2amigos/qrcode-library": "Needed if you want to enable 2FA with QR Code generation. Require version ^2 or ^3"
     },
     "require-dev": {
         "php": ">=7.4",
-        "2amigos/2fa-library": "^2.0",
-        "2amigos/qrcode-library": "^2.0",
+        "2amigos/2fa-library": "^2.0|^3.0",
+        "2amigos/qrcode-library": "^2.0|^3.0",
         "friendsofphp/php-cs-fixer": "^3",
         "yiisoft/yii2-symfonymailer": "^2|^3",
         "squizlabs/php_codesniffer": "*",