aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2018-12-02 12:43:05 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-01-23 13:28:02 +0100
commita6b242a1fd6f8900d80354361449f1bf62506ef9 (patch)
treef69d87208d0ebbdb8517529582280b174af74a16 /composer.json
parentacd4412080dfb73ecaa7f9983728d1d55bc27ea4 (diff)
downloadwallabag-a6b242a1fd6f8900d80354361449f1bf62506ef9.tar.gz
wallabag-a6b242a1fd6f8900d80354361449f1bf62506ef9.tar.zst
wallabag-a6b242a1fd6f8900d80354361449f1bf62506ef9.zip
Enable OTP 2FA
- Update SchebTwoFactorBundle to version 3 - Enable Google 2fa on the bundle - Disallow ability to use both email and google as 2fa - Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7) - use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add` - update admin to be able to create/reset the 2fa
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 21d71b74..771580c6 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
31 "issues": "https://github.com/wallabag/wallabag/issues" 31 "issues": "https://github.com/wallabag/wallabag/issues"
32 }, 32 },
33 "require": { 33 "require": {
34 "php": ">=7.1.0", 34 "php": ">=7.1.3",
35 "ext-pcre": "*", 35 "ext-pcre": "*",
36 "ext-dom": "*", 36 "ext-dom": "*",
37 "ext-curl": "*", 37 "ext-curl": "*",
@@ -70,7 +70,7 @@
70 "friendsofsymfony/user-bundle": "2.0.*", 70 "friendsofsymfony/user-bundle": "2.0.*",
71 "friendsofsymfony/oauth-server-bundle": "^1.5", 71 "friendsofsymfony/oauth-server-bundle": "^1.5",
72 "stof/doctrine-extensions-bundle": "^1.2", 72 "stof/doctrine-extensions-bundle": "^1.2",
73 "scheb/two-factor-bundle": "^2.14", 73 "scheb/two-factor-bundle": "^3.0",
74 "grandt/phpepub": "dev-master", 74 "grandt/phpepub": "dev-master",
75 "wallabag/php-mobi": "~1.0", 75 "wallabag/php-mobi": "~1.0",
76 "kphoen/rulerz-bundle": "~0.13", 76 "kphoen/rulerz-bundle": "~0.13",
@@ -147,7 +147,7 @@
147 "config": { 147 "config": {
148 "bin-dir": "bin", 148 "bin-dir": "bin",
149 "platform": { 149 "platform": {
150 "php": "7.1" 150 "php": "7.1.3"
151 } 151 }
152 }, 152 },
153 "minimum-stability": "dev", 153 "minimum-stability": "dev",