oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-11 17:51:02 +00:00
Code Wiki Activity

Make install command uses PHP globals for DATABASE_URL

Browse source
This commit is contained in:
Yassine Guedidi 2025-02-18 00:04:52 +01:00
parent 06a05ed88a
commit cbd37b2fe2
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/Command/InstallCommandTest.php
View file

@ -50,7 +50,7 @@ class InstallCommandTest extends WallabagTestCase
$tmpDatabaseUrl = (string) (new Uri($this->originalDatabaseUrl))->withPath($tmpDatabaseName); $tmpDatabaseUrl = (string) (new Uri($this->originalDatabaseUrl))->withPath($tmpDatabaseName);
} }
putenv("DATABASE_URL=$tmpDatabaseUrl"); $_ENV['DATABASE_URL'] = $_SERVER['DATABASE_URL'] = $tmpDatabaseUrl;
if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) { if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
// PostgreSQL requires that the database exists before connecting to it // PostgreSQL requires that the database exists before connecting to it
@ -64,13 +64,13 @@ class InstallCommandTest extends WallabagTestCase
protected function tearDown(): void protected function tearDown(): void
{ {
$databaseUrl = getenv('DATABASE_URL'); $databaseUrl = $_SERVER['DATABASE_URL'];
/** @var Connection $connection */ /** @var Connection $connection */
$connection = $this->getTestClient()->getContainer()->get(ManagerRegistry::class)->getConnection(); $connection = $this->getTestClient()->getContainer()->get(ManagerRegistry::class)->getConnection();
if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {// Remove the real environnement variable if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {// Remove the real environnement variable
putenv('DATABASE_URL=' . $this->originalDatabaseUrl); $_ENV['DATABASE_URL'] = $_SERVER['DATABASE_URL'] = $this->originalDatabaseUrl;
$databasePath = parse_url($databaseUrl, \PHP_URL_PATH); $databasePath = parse_url($databaseUrl, \PHP_URL_PATH);
@ -81,7 +81,7 @@ class InstallCommandTest extends WallabagTestCase
$testDatabaseName = $connection->getDatabase(); $testDatabaseName = $connection->getDatabase();
$connection->close(); $connection->close();
putenv('DATABASE_URL=' . $this->originalDatabaseUrl); $_ENV['DATABASE_URL'] = $_SERVER['DATABASE_URL'] = $this->originalDatabaseUrl;
// Create a new client to avoid the error: // Create a new client to avoid the error:
// Transaction commit failed because the transaction has been marked for rollback only. // Transaction commit failed because the transaction has been marked for rollback only.