Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,13 @@ protected function tearDown(): void {
*/
protected function setEnvVars(array $vars): void {
// Unset the existing environment variable if not set in the test.
if (!isset($vars['TMP'])) {
$vars['TMP'] = NULL;
}
$vars['TMP'] ??= NULL;

// Unset the existing environment variable if not set in the test.
if (!isset($vars['DRUPAL_CONFIG_PATH'])) {
$vars['DRUPAL_CONFIG_PATH'] = NULL;
}
$vars['DRUPAL_CONFIG_PATH'] ??= NULL;

// Do not enforce the CI environment unless it is explicitly set.
if (!isset($vars['CI'])) {
$vars['CI'] = FALSE;
}
$vars['CI'] ??= FALSE;

// Filtered real vars without a value to unset them in the lines below.
$vars_real = self::getRealEnvVarsFilteredNoValues(static::ALLOWED_ENV_VARS);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -193,7 +193,7 @@
@@ -187,7 +187,7 @@
* Require settings file.
*/
protected function requireSettingsFile(array $pre_settings = [], array $pre_config = []): void {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -193,7 +193,7 @@
@@ -187,7 +187,7 @@
* Require settings file.
*/
protected function requireSettingsFile(array $pre_settings = [], array $pre_config = []): void {
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ services:
context: .
dockerfile: .docker/database.dockerfile
args:
IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mysql-8.4:26.8.0}" # Use custom database image (if defined) or fallback to standard database image.
IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mysql-8.4:26.8.1}" # Use custom database image (if defined) or fallback to standard database image.
environment:
<<: *default-environment
<<: *default-user
Expand All @@ -202,7 +202,7 @@ services:

#;< MIGRATION
database2:
image: "${VORTEX_DB2_IMAGE:-uselagoon/mysql-8.4:26.8.0}" # Use custom database image (if defined) or fallback to standard database image.
image: "${VORTEX_DB2_IMAGE:-uselagoon/mysql-8.4:26.8.1}" # Use custom database image (if defined) or fallback to standard database image.
environment:
<<: *default-environment
MYSQL_DATABASE: drupal
Expand Down
12 changes: 3 additions & 9 deletions tests/phpunit/Drupal/SettingsTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,13 @@ protected function tearDown(): void {
*/
protected function setEnvVars(array $vars): void {
// Unset the existing environment variable if not set in the test.
if (!isset($vars['TMP'])) {
$vars['TMP'] = NULL;
}
$vars['TMP'] ??= NULL;

// Unset the existing environment variable if not set in the test.
if (!isset($vars['DRUPAL_CONFIG_PATH'])) {
$vars['DRUPAL_CONFIG_PATH'] = NULL;
}
$vars['DRUPAL_CONFIG_PATH'] ??= NULL;

// Do not enforce the CI environment unless it is explicitly set.
if (!isset($vars['CI'])) {
$vars['CI'] = FALSE;
}
$vars['CI'] ??= FALSE;

// Filtered real vars without a value to unset them in the lines below.
$vars_real = self::getRealEnvVarsFilteredNoValues(static::ALLOWED_ENV_VARS);
Expand Down