diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index e9a3b6c80..0b2068d30 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -1,2 +1,3 @@ parameters: database_path: "%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite" + database_url: '%env(resolve:DATABASE_URL)%' diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml index 6e1a87b79..d52c9a6e9 100644 --- a/app/config/tests/parameters_test.mysql.yml +++ b/app/config/tests/parameters_test.mysql.yml @@ -1,2 +1,3 @@ parameters: env(DATABASE_URL): mysql://root:root@127.0.0.1:3306/wallabag?charset=utf8mb4 + database_url: '%env(resolve:DATABASE_URL)%' diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml index 8a3d0498e..73df12da0 100644 --- a/app/config/tests/parameters_test.pgsql.yml +++ b/app/config/tests/parameters_test.pgsql.yml @@ -1,2 +1,3 @@ parameters: env(DATABASE_URL): postgres://wallabag:wallabagrocks@localhost/wallabag?charset=utf8 + database_url: '%env(resolve:DATABASE_URL)%' diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml index 3082dffed..e34c642e4 100644 --- a/app/config/tests/parameters_test.sqlite.yml +++ b/app/config/tests/parameters_test.sqlite.yml @@ -1,2 +1,3 @@ parameters: env(DATABASE_URL): sqlite:///%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite?charset=utf8 + database_url: '%env(resolve:DATABASE_URL)%' diff --git a/tests/Command/InstallCommandTest.php b/tests/Command/InstallCommandTest.php index 9e89e30c1..42e153b52 100644 --- a/tests/Command/InstallCommandTest.php +++ b/tests/Command/InstallCommandTest.php @@ -38,7 +38,7 @@ class InstallCommandTest extends WallabagTestCase /** @var Connection $connection */ $connection = $this->getTestClient()->getContainer()->get(ManagerRegistry::class)->getConnection(); - $originalDatabaseUrl = $this->getTestClient()->getContainer()->getParameter('env(DATABASE_URL)'); + $originalDatabaseUrl = $this->getTestClient()->getContainer()->getParameter('database_url'); $dbnameSuffix = $this->getTestClient()->getContainer()->getParameter('wallabag_dbname_suffix'); $tmpDatabaseName = 'wallabag_' . bin2hex(random_bytes(5));