webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Mail: Removed custom symfony/mailer fork

Browse Source 
Moved to standard symfony mailer now that my patches have been
upstreamed. This changes the config to work with the symfony option,
following the same overall logic.
Also updated testing to allow test runs via mulitple custom env options.

Closes #5636
This commit is contained in:
Dan Brown
2025-07-15 15:24:31 +01:00
parent 2442829ef2
commit d13abc7e1d
8 changed files with 155 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/TestCase.php
View File

@@ -118,15 +118,18 @@ abstract class TestCase extends BaseTestCase
* Database config is juggled so the value can be restored when
* parallel testing are used, where multiple databases exist.
*/
protected function runWithEnv(string $name, $value, callable $callback, bool $handleDatabase = true)
protected function runWithEnv(array $valuesByKey, callable $callback, bool $handleDatabase = true): void
{
Env::disablePutenv();
$originalVal = $_SERVER[$name] ?? null;
$originals = [];
foreach ($valuesByKey as $key => $value) {
$originals[$key] = $_SERVER[$key] ?? null;
if (is_null($value)) {
unset($_SERVER[$name]);
} else {
$_SERVER[$name] = $value;
if (is_null($value)) {
unset($_SERVER[$key]);
} else {
$_SERVER[$key] = $value;
}
}
$database = config('database.connections.mysql_testing.database');
@@ -144,10 +147,12 @@ abstract class TestCase extends BaseTestCase
DB::rollBack();
}
if (is_null($originalVal)) {
unset($_SERVER[$name]);
} else {
$_SERVER[$name] = $originalVal;
foreach ($originals as $key => $value) {
if (is_null($value)) {
unset($_SERVER[$key]);
} else {
$_SERVER[$key] = $value;
}
}
}