Skip to content

Commit 5c06846

Browse files
authored
Merge pull request #673 from City-of-Helsinki/update-configuration
Automatic update
2 parents 67b9abb + 002ae80 commit 5c06846

File tree

3 files changed

+69
-51
lines changed

3 files changed

+69
-51
lines changed

.deprecation-ignore.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# This file contains patterns to be ignored while testing for use of
22
# deprecated code.
33
# See https://www.drupal.org/node/3285162 for more details.
4+
5+
# Symfony 7.4
6+
%Since symfony/validator 7.4: Support for evaluating options in the base Constraint class is deprecated. Initialize properties in the constructor of .* instead.%

composer.lock

Lines changed: 51 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/sites/default/settings.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,21 @@ function drupal_get_env(string|array $variables) : mixed {
401401
$config['helfi_search.settings']['openai_model'] = getenv('OPENAI_MODEL');
402402
}
403403

404+
// E2E test users. We should never do this in production, so adding a failsafe
405+
// in case the environment variable would ever end up in production.
406+
if (getenv('APP_ENV') !== 'production' && $e2e_test_user = getenv('E2E_TEST_USER')) {
407+
$e2e_test_user = json_decode($e2e_test_user, TRUE);
408+
409+
// Make sure the user exists in Drupal.
410+
$config['helfi_api_base.api_accounts']['accounts'][] = $e2e_test_user;
411+
412+
// Some features need to be modified for the test user.
413+
// @see Drupal\helfi_tfa\Hook\UserHooks::userLogin().
414+
$config['helfi_platform_config.e2e_test_users']['users'][] = array_intersect_key($e2e_test_user, [
415+
"username" => TRUE,
416+
]);
417+
}
418+
404419
// Environment specific overrides.
405420
if (file_exists(__DIR__ . '/all.settings.php')) {
406421
// phpcs:ignore

0 commit comments

Comments
 (0)