From 927f785a560a346346ca9cc95298d749319ce1ac Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 11 Oct 2023 07:22:37 +0000 Subject: [PATCH] Update configuration --- composer.lock | 24 ++++++++++++------------ public/sites/default/settings.php | 12 +++++++----- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/composer.lock b/composer.lock index 05dbdace..011b03d3 100644 --- a/composer.lock +++ b/composer.lock @@ -7898,33 +7898,33 @@ }, { "name": "laminas/laminas-escaper", - "version": "2.12.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490" + "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490", - "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/af459883f4018d0f8a0c69c7a209daef3bf973ba", + "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba", "shasum": "" }, "require": { "ext-ctype": "*", "ext-mbstring": "*", - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-escaper": "*" }, "require-dev": { - "infection/infection": "^0.26.6", - "laminas/laminas-coding-standard": "~2.4.0", + "infection/infection": "^0.27.0", + "laminas/laminas-coding-standard": "~2.5.0", "maglnet/composer-require-checker": "^3.8.0", - "phpunit/phpunit": "^9.5.18", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.22.0" + "phpunit/phpunit": "^9.6.7", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.9" }, "type": "library", "autoload": { @@ -7956,7 +7956,7 @@ "type": "community_bridge" } ], - "time": "2022-10-10T10:11:09+00:00" + "time": "2023-10-10T08:35:13+00:00" }, { "name": "laminas/laminas-feed", @@ -17950,5 +17950,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index e402d926..442df275 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -245,16 +245,18 @@ function drupal_get_env(string|array $variables) : mixed { 'PROJECT_NAME', ]); -if ($artemis_brokers = getenv('ARTEMIS_BROKERS') && $artemis_destination) { +$artemis_brokers = getenv('ARTEMIS_BROKERS'); + +if ($artemis_brokers && $artemis_destination) { $settings['stomp']['default'] = [ 'clientId' => getenv('ARTEMIS_CLIENT_ID') ?: 'artemis', - 'login' => getenv('ARTEMIS_LOGIN'), - 'passcode' => getenv('ARTEMIS_PASSCODE'), + 'login' => getenv('ARTEMIS_LOGIN') ?: NULL, + 'passcode' => getenv('ARTEMIS_PASSCODE') ?: NULL, 'destination' => sprintf('/queue/%s', $artemis_destination), 'brokers' => $artemis_brokers, - 'timeout' => ['read' => 15000], + 'timeout' => ['read' => 12000], 'heartbeat' => [ - 'send' => 12000, + 'send' => 20000, 'receive' => 0, 'observers' => [ [