6 files changed, 14 insertions, 1 deletions

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 3eeedb78..57cae9a0 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -40,3 +40,5 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 3244fd3a..2823a424 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -30,3 +30,5 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index cee34473..5b55cb64 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -30,3 +30,5 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index a1535bc9..01589d28 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -30,3 +30,5 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    from_email: no-reply@wallabag.org
diff --git a/composer.json b/composer.json
index 1c07c209..497b8012 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "pagerfanta/pagerfanta": "~1.0.3",
         "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/user-bundle": "~2.0@dev",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2@dev",
         "scheb/two-factor-bundle": "~2.0",
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index d79d8fa2..9a589332 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -1,4 +1,9 @@
 services:
+    # might be fixed in the symfony release
+    # https://github.com/FriendsOfSymfony/FOSUserBundle/issues/2048
+    fos_user.doctrine_registry:
+        alias: doctrine
+
     wallabag_user.auth_code_mailer:
         class: Wallabag\UserBundle\Mailer\AuthCodeMailer
         arguments: