Fix from_email & fos_user

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 3eeedb7805f2bdb1d8d99b9a8c99f8a16649b6a1..57cae9a062a66b3d8f8e55f84f872432ef8cbf33 100644 (file)
--- 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 3244fd3a20b45d411d1187276956a8280f506ba9..2823a4243f30b3c23653fa500f7bee1f42679f02 100644 (file)
--- 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 cee34473414dc17e8ef9120510793271ad00fc07..5b55cb64305ea16c37ade9c7b843e02cd1298011 100644 (file)
--- 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 a1535bc978f79d54cc78417c68c0a951e7f3c57b..01589d2821e74fe0bd4e67fc99cb01067d2d05ce 100644 (file)
--- 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 1c07c2092936c369d96862bb85b0e59f2e348af2..497b80121dbee95bfdca9ee352b7adc91b785a52 100644 (file)
--- 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 d79d8fa2bacf2a5ecc1823e29d5a108ee7ba4b62..9a589332076e367673a29c6fbf463bd9181425b3 100644 (file)
--- 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: