From 61c640ed313c6f04e08a3568f9aae9d457c27aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 1 Feb 2016 13:22:34 +0100 Subject: Fix #1635: change database name for test environments (mysql/pgsql) --- app/config/tests/parameters.yml.dist.mysql | 2 +- app/config/tests/parameters.yml.dist.pgsql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index f902f239..3b9262bb 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -12,7 +12,7 @@ parameters: test_database_driver: pdo_mysql test_database_host: localhost test_database_port: 3306 - test_database_name: wallabag + test_database_name: wallabag_test test_database_user: root test_database_password: ~ test_database_path: ~ diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 76685b14..a5aef028 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -12,7 +12,7 @@ parameters: test_database_driver: pdo_pgsql test_database_host: localhost test_database_port: - test_database_name: wallabag + test_database_name: wallabag_test test_database_user: travis test_database_password: ~ test_database_path: ~ -- cgit v1.2.3 From c7eef67291469631309844dc21f2744dfc699dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 1 Feb 2016 13:38:33 +0100 Subject: Fix fos_user --- src/Wallabag/UserBundle/Resources/config/services.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index bf9e036a..8321473a 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: -- cgit v1.2.3