diff --git a/compose.yaml b/compose.yaml index 66da47ca..f24634d6 100644 --- a/compose.yaml +++ b/compose.yaml @@ -161,16 +161,6 @@ services: - "traefik.port=9200" profiles: - search - artemis: - container_name: "${COMPOSE_PROJECT_NAME}-artemis" - image: apache/activemq-artemis - depends_on: - - app - networks: - - internal - - stonehenge-network - profiles: - - queue chromium: image: selenium/standalone-chromium environment: diff --git a/composer.lock b/composer.lock index 43a7a2bb..24ea15c0 100644 --- a/composer.lock +++ b/composer.lock @@ -3593,20 +3593,20 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta25", + "version": "2.0.0-beta28", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta25" + "reference": "8.x-2.0-beta28" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta25.zip", - "reference": "8.x-2.0-beta25", - "shasum": "1579a29158648e1f65949d4aff1638ccd2c33e80" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta28.zip", + "reference": "8.x-2.0-beta28", + "shasum": "7e97367d1c583a41dfab91226e4f688309ae2ce7" }, "require": { - "drupal/core": "^10.2 || ^11" + "drupal/core": "^10.3 || ^11" }, "require-dev": { "drupal/block_field": "~1.0", @@ -3624,8 +3624,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta25", - "datestamp": "1762358229", + "version": "8.x-2.0-beta28", + "datestamp": "1771495229", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4209,16 +4209,16 @@ }, { "name": "drupal/hdbt", - "version": "6.16.34", + "version": "6.16.42", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "20110908a059cdcff76b9becbdaf29c653dabe8a" + "reference": "74427db23d2a001c5f5ba887036dfe79937818ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/20110908a059cdcff76b9becbdaf29c653dabe8a", - "reference": "20110908a059cdcff76b9becbdaf29c653dabe8a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/74427db23d2a001c5f5ba887036dfe79937818ae", + "reference": "74427db23d2a001c5f5ba887036dfe79937818ae", "shasum": "" }, "require": { @@ -4237,10 +4237,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.16.34", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.16.42", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2026-02-09T12:59:50+00:00" + "time": "2026-02-23T13:34:16+00:00" }, { "name": "drupal/hdbt_admin", @@ -4330,16 +4330,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.8.6", + "version": "2.8.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "e113eb9e541db8b7e98fbba3a817aeea29ed87e3" + "reference": "ae4d8c126cc42fd4cac3ce7ad9ac6eeea154b248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/e113eb9e541db8b7e98fbba3a817aeea29ed87e3", - "reference": "e113eb9e541db8b7e98fbba3a817aeea29ed87e3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/ae4d8c126cc42fd4cac3ce7ad9ac6eeea154b248", + "reference": "ae4d8c126cc42fd4cac3ce7ad9ac6eeea154b248", "shasum": "" }, "require": { @@ -4350,12 +4350,12 @@ "drupal/monolog": "^3.0", "drupal/raven": "^5.0 || ^6.0", "ext-curl": "*", - "firebase/php-jwt": "^6.5", + "firebase/php-jwt": "^7.0", "php": "^8.1", + "phrity/websocket": "^3.6", "symfony/polyfill-php84": "^1.0", "symfony/polyfill-php85": "^1.0", "t4web/composer-lock-parser": "^1.0", - "textalk/websocket": "^1.6", "webmozart/assert": "^1.0" }, "conflict": { @@ -4381,10 +4381,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.8.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.8.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2026-01-21T10:19:35+00:00" + "time": "2026-02-19T05:22:34+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4553,16 +4553,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "5.1.11", + "version": "5.1.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "2ae96f62f550ad380a4363f0f07c89124f510263" + "reference": "93ca32515bd2e97eda1499e6a5c90e4cab394d81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2ae96f62f550ad380a4363f0f07c89124f510263", - "reference": "2ae96f62f550ad380a4363f0f07c89124f510263", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/93ca32515bd2e97eda1499e6a5c90e4cab394d81", + "reference": "93ca32515bd2e97eda1499e6a5c90e4cab394d81", "shasum": "" }, "require": { @@ -4592,7 +4592,7 @@ "drupal/helfi_tpr": "*", "drupal/image_style_quality": "^1.4", "drupal/imagecache_external": "^3.0", - "drupal/imagemagick": "^4.0", + "drupal/imagemagick": "^5.0", "drupal/jquery_ui": "^1.6", "drupal/jquery_ui_draggable": "^2.0", "drupal/linkit": "^7.0", @@ -4641,7 +4641,6 @@ "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "./public/modules/contrib/helfi_platform_config/patches/3091246.patch", "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299)": "https://www.drupal.org/files/issues/2023-05-07/3163299-104-D10.patch", "[#UHF-4325] Strip whitespaces from twig debug comments": "./public/modules/contrib/helfi_platform_config/patches/drupal_core_strip_debug_mode_whitespaces_10.3.x.patch", - "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "./public/modules/contrib/helfi_platform_config/patches/3114824.patch", "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "./public/modules/contrib/helfi_platform_config/patches/2313309.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2025-06-27/allow-allowed-values-function-update-2873353-20.patch", @@ -4673,10 +4672,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/5.1.11", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/5.1.16", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2026-02-06T09:11:55+00:00" + "time": "2026-02-24T08:29:10+00:00" }, { "name": "drupal/helfi_proxy", @@ -4914,28 +4913,31 @@ }, { "name": "drupal/imagemagick", - "version": "4.0.2", + "version": "5.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/imagemagick.git", - "reference": "4.0.2" + "reference": "5.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/imagemagick-4.0.2.zip", - "reference": "4.0.2", - "shasum": "758bdf632dd8f2eeb97d198b692d20a59cdbdc13" + "url": "https://ftp.drupal.org/files/projects/imagemagick-5.0.1.zip", + "reference": "5.0.1", + "shasum": "3a9e70d80064b3be3f2d0b4b4a4d1beb92d6ead2" }, "require": { - "drupal/core": "^10.3 | ^11", - "drupal/file_mdm": "^3.1", - "drupal/sophron": "^2.1" + "drupal/core": "^11.3", + "drupal/file_mdm": "^3.2", + "drupal/sophron": "^3" + }, + "require-dev": { + "drupal/image_effects": "^5" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.2", - "datestamp": "1724827811", + "version": "5.0.1", + "datestamp": "1769759255", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6863,27 +6865,27 @@ }, { "name": "drupal/sophron", - "version": "2.2.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.2.1" + "reference": "3.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.2.1.zip", - "reference": "2.2.1", - "shasum": "ac116da7e6eee93594443204a17f0bcb902d7dd2" + "url": "https://ftp.drupal.org/files/projects/sophron-3.1.0.zip", + "reference": "3.1.0", + "shasum": "9c410914fda94888d2856b79c1b970d5955bee4b" }, "require": { - "drupal/core": "^10.2 || ^11", - "fileeye/mimemap": "^2.2.1" + "drupal/core": "^11.2 | ^12", + "fileeye/mimemap": "^2.2.2" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.2.1", - "datestamp": "1744800237", + "version": "3.1.0", + "datestamp": "1770724263", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8168,16 +8170,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.11.1", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66" + "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", - "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5645b43af647b6947daac1d0f659dd1fbe8d3b65", + "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65", "shasum": "" }, "require": { @@ -8225,9 +8227,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.11.1" + "source": "https://github.com/firebase/php-jwt/tree/v7.0.2" }, - "time": "2025-04-09T20:32:01+00:00" + "time": "2025-12-16T22:17:28+00:00" }, { "name": "galbar/jsonpath", @@ -8775,16 +8777,16 @@ }, { "name": "laravel/prompts", - "version": "v0.3.12", + "version": "v0.3.13", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "4861ded9003b7f8a158176a0b7666f74ee761be8" + "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/4861ded9003b7f8a158176a0b7666f74ee761be8", - "reference": "4861ded9003b7f8a158176a0b7666f74ee761be8", + "url": "https://api.github.com/repos/laravel/prompts/zipball/ed8c466571b37e977532fb2fd3c272c784d7050d", + "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d", "shasum": "" }, "require": { @@ -8828,9 +8830,9 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.3.12" + "source": "https://github.com/laravel/prompts/tree/v0.3.13" }, - "time": "2026-02-03T06:57:26+00:00" + "time": "2026-02-06T12:17:10+00:00" }, { "name": "league/container", @@ -10606,29 +10608,211 @@ }, "time": "2021-09-22T16:57:06+00:00" }, + { + "name": "phrity/comparison", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sirn-se/phrity-comparison.git", + "reference": "cf80abb822537eeaaeb4142157cd667ca6372a13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sirn-se/phrity-comparison/zipball/cf80abb822537eeaaeb4142157cd667ca6372a13", + "reference": "cf80abb822537eeaaeb4142157cd667ca6372a13", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "phpstan/phpstan": "^2.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Phrity\\Comparison\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sören Jensen", + "email": "sirn@sirn.se", + "homepage": "https://phrity.sirn.se" + } + ], + "description": "Interfaces and helper trait for comparing objects. Comparator for sort and filter applications.", + "homepage": "https://phrity.sirn.se/comparison", + "keywords": [ + "comparable", + "comparator", + "comparison", + "equalable", + "filter", + "sort" + ], + "support": { + "issues": "https://github.com/sirn-se/phrity-comparison/issues", + "source": "https://github.com/sirn-se/phrity-comparison/tree/1.4.1" + }, + "time": "2025-12-05T07:38:30+00:00" + }, + { + "name": "phrity/http", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sirn-se/phrity-http.git", + "reference": "1e7eee67359287b94aae2b7d40b730d5f5394943" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sirn-se/phrity-http/zipball/1e7eee67359287b94aae2b7d40b730d5f5394943", + "reference": "1e7eee67359287b94aae2b7d40b730d5f5394943", + "shasum": "" + }, + "require": { + "php": "^8.1", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0" + }, + "require-dev": { + "guzzlehttp/psr7": "^2.0", + "phpstan/phpstan": "^2.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Phrity\\Http\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sören Jensen", + "email": "sirn@sirn.se", + "homepage": "https://phrity.sirn.se" + } + ], + "description": "Utilities and interfaces for handling HTTP.", + "homepage": "https://phrity.sirn.se/http", + "keywords": [ + "HTTP Factories", + "HTTP Serializer", + "http", + "psr-17", + "psr-7" + ], + "support": { + "issues": "https://github.com/sirn-se/phrity-http/issues", + "source": "https://github.com/sirn-se/phrity-http/tree/1.1.0" + }, + "time": "2025-12-22T20:22:29+00:00" + }, + { + "name": "phrity/net-stream", + "version": "2.3.3", + "source": { + "type": "git", + "url": "https://github.com/sirn-se/phrity-net-stream.git", + "reference": "f46694e1b721867ec3c19731a7fcbbead3c6ac89" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sirn-se/phrity-net-stream/zipball/f46694e1b721867ec3c19731a7fcbbead3c6ac89", + "reference": "f46694e1b721867ec3c19731a7fcbbead3c6ac89", + "shasum": "" + }, + "require": { + "php": "^8.1", + "phrity/util-errorhandler": "^1.1", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0" + }, + "require-dev": { + "phpstan/phpstan": "^2.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "phrity/net-uri": "^2.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Phrity\\Net\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sören Jensen", + "email": "sirn@sirn.se", + "homepage": "https://phrity.sirn.se" + } + ], + "description": "Socket stream classes implementing PSR-7 Stream and PSR-17 StreamFactory", + "homepage": "https://phrity.sirn.se/net-stream", + "keywords": [ + "Socket", + "client", + "psr-17", + "psr-7", + "server", + "stream", + "stream factory" + ], + "support": { + "issues": "https://github.com/sirn-se/phrity-net-stream/issues", + "source": "https://github.com/sirn-se/phrity-net-stream/tree/2.3.3" + }, + "time": "2025-12-24T12:07:07+00:00" + }, { "name": "phrity/net-uri", - "version": "1.3.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-net-uri.git", - "reference": "3f458e0c4d1ddc0e218d7a5b9420127c63925f43" + "reference": "0737de026b75177ae302ac9fdbbd0ffc2610f3b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-net-uri/zipball/3f458e0c4d1ddc0e218d7a5b9420127c63925f43", - "reference": "3f458e0c4d1ddc0e218d7a5b9420127c63925f43", + "url": "https://api.github.com/repos/sirn-se/phrity-net-uri/zipball/0737de026b75177ae302ac9fdbbd0ffc2610f3b8", + "reference": "0737de026b75177ae302ac9fdbbd0ffc2610f3b8", "shasum": "" }, "require": { - "php": "^7.4 | ^8.0", + "ext-mbstring": "*", + "php": "^8.1", + "phrity/comparison": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0 | ^2.0" + "psr/http-message": "^1.1 | ^2.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", - "phpunit/phpunit": "^9.0 | ^10.0", - "squizlabs/php_codesniffer": "^3.0" + "phpstan/phpstan": "^2.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "phrity/util-errorhandler": "^1.1", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" + }, + "suggest": { + "ext-intl": "Enables IDN conversion for non-ASCII domains" }, "type": "library", "autoload": { @@ -10657,9 +10841,9 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-net-uri/issues", - "source": "https://github.com/sirn-se/phrity-net-uri/tree/1.3.0" + "source": "https://github.com/sirn-se/phrity-net-uri/tree/2.2.1" }, - "time": "2023-08-21T10:33:06+00:00" + "time": "2025-12-05T10:39:22+00:00" }, { "name": "phrity/util-errorhandler", @@ -10713,6 +10897,71 @@ }, "time": "2025-12-05T21:25:36+00:00" }, + { + "name": "phrity/websocket", + "version": "3.6.2", + "source": { + "type": "git", + "url": "https://github.com/sirn-se/websocket-php.git", + "reference": "b9816ed2b4a10c8c42bd0b6398044ab506869756" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sirn-se/websocket-php/zipball/b9816ed2b4a10c8c42bd0b6398044ab506869756", + "reference": "b9816ed2b4a10c8c42bd0b6398044ab506869756", + "shasum": "" + }, + "require": { + "php": "^8.1", + "phrity/http": "^1.0", + "phrity/net-stream": "^2.3", + "phrity/net-uri": "^2.1", + "psr/http-message": "^1.1 | ^2.0", + "psr/log": "^1.0 || ^2.0 || ^3.0" + }, + "require-dev": { + "guzzlehttp/psr7": "^2.0", + "phpstan/phpstan": "^2.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "phrity/logger-console": "^1.0", + "phrity/net-mock": "^2.3", + "phrity/util-errorhandler": "^1.1", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "WebSocket\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Fredrik Liljegren" + }, + { + "name": "Sören Jensen", + "email": "sirn@sirn.se", + "homepage": "https://phrity.sirn.se" + } + ], + "description": "WebSocket client and server", + "homepage": "https://phrity.sirn.se/websocket", + "keywords": [ + "client", + "server", + "websocket" + ], + "support": { + "issues": "https://github.com/sirn-se/websocket-php/issues", + "source": "https://github.com/sirn-se/websocket-php/tree/3.6.2" + }, + "time": "2025-12-21T09:58:16+00:00" + }, { "name": "psr/container", "version": "2.0.2", @@ -11028,16 +11277,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.19", + "version": "v0.12.20", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a4f766e5c5b6773d8399711019bb7d90875a50ee" + "reference": "19678eb6b952a03b8a1d96ecee9edba518bb0373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a4f766e5c5b6773d8399711019bb7d90875a50ee", - "reference": "a4f766e5c5b6773d8399711019bb7d90875a50ee", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/19678eb6b952a03b8a1d96ecee9edba518bb0373", + "reference": "19678eb6b952a03b8a1d96ecee9edba518bb0373", "shasum": "" }, "require": { @@ -11101,9 +11350,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.19" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.20" }, - "time": "2026-01-30T17:33:13+00:00" + "time": "2026-02-11T15:05:28+00:00" }, { "name": "ralouphie/getallheaders", @@ -11353,16 +11602,16 @@ }, { "name": "sentry/sentry", - "version": "4.19.1", + "version": "4.20.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "1c21d60bebe67c0122335bd3fe977990435af0a3" + "reference": "d7264b972e5f87110492376ade1cc20cbc049345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/1c21d60bebe67c0122335bd3fe977990435af0a3", - "reference": "1c21d60bebe67c0122335bd3fe977990435af0a3", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/d7264b972e5f87110492376ade1cc20cbc049345", + "reference": "d7264b972e5f87110492376ade1cc20cbc049345", "shasum": "" }, "require": { @@ -11385,7 +11634,7 @@ "monolog/monolog": "^1.6|^2.0|^3.0", "phpbench/phpbench": "^1.0", "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^8.5|^9.6", + "phpunit/phpunit": "^8.5.52|^9.6.34", "vimeo/psalm": "^4.17" }, "suggest": { @@ -11425,7 +11674,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.19.1" + "source": "https://github.com/getsentry/sentry-php/tree/4.20.0" }, "funding": [ { @@ -11437,7 +11686,7 @@ "type": "custom" } ], - "time": "2025-12-02T15:57:41+00:00" + "time": "2026-02-16T13:47:54+00:00" }, { "name": "stomp-php/stomp-php", @@ -14806,57 +15055,6 @@ }, "time": "2022-02-23T14:59:32+00:00" }, - { - "name": "textalk/websocket", - "version": "1.6.3", - "source": { - "type": "git", - "url": "https://github.com/Textalk/websocket-php.git", - "reference": "67de79745b1a357caf812bfc44e0abf481cee012" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/67de79745b1a357caf812bfc44e0abf481cee012", - "reference": "67de79745b1a357caf812bfc44e0abf481cee012", - "shasum": "" - }, - "require": { - "php": "^7.4 | ^8.0", - "phrity/net-uri": "^1.0", - "phrity/util-errorhandler": "^1.0", - "psr/http-message": "^1.0", - "psr/log": "^1.0 | ^2.0 | ^3.0" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.0", - "phpunit/phpunit": "^9.0", - "squizlabs/php_codesniffer": "^3.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "WebSocket\\": "lib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "ISC" - ], - "authors": [ - { - "name": "Fredrik Liljegren" - }, - { - "name": "Sören Jensen" - } - ], - "description": "WebSocket client and server", - "support": { - "issues": "https://github.com/Textalk/websocket-php/issues", - "source": "https://github.com/Textalk/websocket-php/tree/1.6.3" - }, - "time": "2022-11-07T18:59:33+00:00" - }, { "name": "twig/twig", "version": "v3.23.0", @@ -16226,16 +16424,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "6.6.4", + "version": "v6.7.2", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7" + "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/2eeb75d21cf73211335888e7f5e6fd7440723ec7", - "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/6fea66c7204683af437864e7c4e7abf383d14bc0", + "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0", "shasum": "" }, "require": { @@ -16295,9 +16493,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.4" + "source": "https://github.com/jsonrainbow/json-schema/tree/v6.7.2" }, - "time": "2025-12-19T15:01:32+00:00" + "time": "2026-02-15T15:06:22+00:00" }, { "name": "lullabot/mink-selenium2-driver", @@ -18182,16 +18380,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.52", + "version": "11.5.55", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b287d32c26f78768e391843c5a59395f24b62605" + "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b287d32c26f78768e391843c5a59395f24b62605", - "reference": "b287d32c26f78768e391843c5a59395f24b62605", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/adc7262fccc12de2b30f12a8aa0b33775d814f00", + "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00", "shasum": "" }, "require": { @@ -18264,7 +18462,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.52" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.55" }, "funding": [ { @@ -18288,7 +18486,7 @@ "type": "tidelift" } ], - "time": "2026-02-08T07:05:14+00:00" + "time": "2026-02-18T12:37:06+00:00" }, { "name": "ramsey/collection", diff --git a/conf/cmi/block.block.helfirecommendationsblock.yml b/conf/cmi/block.block.helfirecommendationsblock.yml index 683ada18..35d062a3 100644 --- a/conf/cmi/block.block.helfirecommendationsblock.yml +++ b/conf/cmi/block.block.helfirecommendationsblock.yml @@ -5,13 +5,13 @@ dependencies: module: - helfi_recommendations - language - - node + - system theme: - hdbt id: helfirecommendationsblock theme: hdbt region: content -weight: 1 +weight: 10 provider: helfi_recommendations plugin: helfi_recommendations settings: diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index bc20a374..3c3f869d 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -151,7 +151,6 @@ module: social_media: 0 sophron: 0 stage_file_proxy: 0 - stomp: 0 system: 0 taxonomy: 0 telephone: 0 diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index 22f833bf..05423fc7 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor5 _core: - default_config_hash: UZ7ojJKs8sEbFs15e0Ub1i_p9w-K20fG40pkpotEWUw + default_config_hash: oCDUwt4GjXQJeBCiJlq5NKEU0d9JP2Kx3QZKMuDAi_g format: full_html editor: ckeditor5 settings: @@ -146,6 +146,11 @@ settings: weight: 18 search: '(.*?)<\/a>' replace: $1 + - + enabled: true + weight: 19 + search: '(]*?)\s+target\s*=\s*("_blank"|_blank)' + replace: $1 ckeditor5_sourceEditing: allowed_tags: - '
' diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index d755e7b1..f785a407 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor5 _core: - default_config_hash: CbXr91M60wTYziM5ZHPNPrGb9khkUYjzkVVdyE3re9o + default_config_hash: 5XykmWxByyrIQ2N9_zHqVQlMtBUy9wc5P9lPrM_g7oQ format: minimal editor: ckeditor5 settings: @@ -128,6 +128,11 @@ settings: weight: 18 search: '(.*?)<\/a>' replace: $1 + - + enabled: true + weight: 19 + search: '(]*?)\s+target\s*=\s*("_blank"|_blank)' + replace: $1 ckeditor5_sourceEditing: allowed_tags: - '

' diff --git a/conf/cmi/imagemagick.settings.yml b/conf/cmi/imagemagick.settings.yml index 6c8cb305..9abc0c31 100644 --- a/conf/cmi/imagemagick.settings.yml +++ b/conf/cmi/imagemagick.settings.yml @@ -2,6 +2,7 @@ _core: default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ quality: 75 binaries: imagemagick +imagemagick_version: v7 path_to_binaries: '' prepend: '' log_warnings: true diff --git a/conf/cmi/language/sv/views.view.archive.yml b/conf/cmi/language/sv/views.view.archive.yml index 35b91fae..a5b73ef5 100644 --- a/conf/cmi/language/sv/views.view.archive.yml +++ b/conf/cmi/language/sv/views.view.archive.yml @@ -21,14 +21,7 @@ display: exposed_sorts_label: 'Sortera efter' sort_asc_label: Stigande sort_desc_label: Fallande - arguments: - created_year_month: - title: '{{ arguments.created_year_month }}' block_1: display_title: Block - display_options: - arguments: - created_year_month: - title: '{{ arguments.created_year_month }}' page_1: display_title: Sida diff --git a/conf/cmi/language/sv/views.view.files.yml b/conf/cmi/language/sv/views.view.files.yml index 7f71fa3d..15280eba 100644 --- a/conf/cmi/language/sv/views.view.files.yml +++ b/conf/cmi/language/sv/views.view.files.yml @@ -6,8 +6,6 @@ display: display_options: title: Filer fields: - fid: - label: Fid filename: label: Namn separator: ', ' @@ -26,8 +24,6 @@ display: label: 'Datum för ändring' count: label: 'Används i' - alter: - path: 'admin/content/files/usage/{{ fid }}' format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz pager: options: @@ -76,7 +72,6 @@ display: label: 'Registrerar modul' count: label: 'Antal använd' - format_plural_string: !!binary MQNAY291bnQ= pager: options: tags: diff --git a/conf/cmi/language/sv/views.view.user_admin_people.yml b/conf/cmi/language/sv/views.view.user_admin_people.yml index 1a06e563..fe04e8c2 100644 --- a/conf/cmi/language/sv/views.view.user_admin_people.yml +++ b/conf/cmi/language/sv/views.view.user_admin_people.yml @@ -19,9 +19,6 @@ display: label: Roller created: label: 'Medlem i' - settings: - future_format: '@interval' - past_format: '@interval' access: label: 'Senast åtkomst' settings: diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index fe8a1bc9..7d2fe927 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -258,42 +258,6 @@ function drupal_get_env(string|array $variables) : mixed { $config['helfi_proxy.settings']['session_suffix'] = $session_suffix; } -$amq_destination = drupal_get_env([ - 'PROJECT_NAME', -]); -$amq_brokers = getenv('AMQ_BROKERS'); - -if ($amq_brokers && $amq_destination) { - $settings['stomp']['default'] = [ - 'clientId' => getenv('AMQ_CLIENT_ID') ?: 'client_ ' . $amq_destination, - 'login' => getenv('AMQ_USER') ?: NULL, - 'passcode' => getenv('AMQ_PASSWORD') ?: NULL, - 'destination' => sprintf('/queue/%s', $amq_destination), - 'brokers' => $amq_brokers, - 'timeout' => ['read' => 12000], - 'heartbeat' => [ - 'send' => 20000, - 'receive' => 0, - 'observers' => [ - [ - 'class' => '\Stomp\Network\Observer\HeartbeatEmitter', - ], - ], - ], - ]; - - $queues = [ - 'helfi_navigation_menu_queue', - 'helfi_api_base_revision', - ]; - foreach ($queues as $queue) { - // $settings['queue_service_' . $queue] = 'queue.stomp.default'; - } - // You must configure project specific queues manually in 'all.settings.php' - // file. - // @see https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/queue.md -} - if ( ($redis_host = getenv('REDIS_HOST')) && file_exists('modules/contrib/redis/redis.services.yml') && @@ -401,6 +365,12 @@ function drupal_get_env(string|array $variables) : mixed { $config['helfi_search.settings']['openai_model'] = getenv('OPENAI_MODEL'); } +// Hakuvahti: +if (getenv('HAKUVAHTI_URL')) { + $config['helfi_hakuvahti.settings']['base_url'] = getenv('HAKUVAHTI_URL'); + $config['helfi_hakuvahti.settings']['api_key'] = getenv('HAKUVAHTI_API_KEY'); +} + // E2E test users. We should never do this in production, so adding a failsafe // in case the environment variable would ever end up in production. if (getenv('APP_ENV') !== 'production' && $e2e_test_user = getenv('E2E_TEST_USER')) { diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 976659ce..5067025a 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -207,27 +207,6 @@ "resolved": "../../contrib/hdbt/theme-builder", "link": true }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -579,6 +558,27 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/brace-expansion": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", + "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/braces": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", @@ -864,15 +864,15 @@ } }, "node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz", + "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==", "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk index d015b7e3..602b993e 100644 --- a/tools/make/drupal.mk +++ b/tools/make/drupal.mk @@ -116,7 +116,7 @@ drush-sanitize-database: PHONY += drush-create-dump drush-create-dump: ## Create database dump to dump.sql - $(call drush,sql-dump --structure-tables-key=common --extra-dump=--no-tablespaces --result-file=/app/dump.sql) + $(call drush,sql-dump --structure-tables-key=common --extra-dump='--no-tablespaces --skip-ssl' --result-file=/app/dump.sql) PHONY += open-db-gui open-db-gui: ## Open database with GUI tool