From 48e3007b7f5b542ebd8dda07a7a206f3bce69d7a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 31 Jan 2016 15:12:18 +0100 Subject: [PATCH] Fix from_email & fos_user --- app/config/parameters.yml.dist | 2 ++ app/config/tests/parameters.yml.dist.mysql | 2 ++ app/config/tests/parameters.yml.dist.pgsql | 2 ++ app/config/tests/parameters.yml.dist.sqlite | 2 ++ composer.json | 2 +- src/Wallabag/UserBundle/Resources/config/services.yml | 5 +++++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 3eeedb780..57cae9a06 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 3244fd3a2..2823a4243 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 cee344734..5b55cb643 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 a1535bc97..01589d282 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 1c07c2092..497b80121 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 d79d8fa2b..9a5893320 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: