diff --git a/.gitignore b/.gitignore
index abbffaa2..318172de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,10 @@ public/sites/simpletest/
# Ignore the folder created by PhpStorm
.idea/*
+
+# Ignore local settings
public/sites/default/local.settings.php
+public/sites/default/local.services.yml
*.sql
*.env.local
diff --git a/composer.lock b/composer.lock
index 2fd9d8c5..26450658 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2493,6 +2493,10 @@
"homepage": "https://www.drupal.org/u/realityloop",
"role": "Maintainer"
},
+ {
+ "name": "Junyor",
+ "homepage": "https://www.drupal.org/user/7006"
+ },
{
"name": "lhangea",
"homepage": "https://www.drupal.org/user/2743803"
@@ -3560,17 +3564,17 @@
},
{
"name": "drupal/gin",
- "version": "3.0.0-rc9",
+ "version": "3.0.0-rc10",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/gin.git",
- "reference": "8.x-3.0-rc9"
+ "reference": "8.x-3.0-rc10"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc9.zip",
- "reference": "8.x-3.0-rc9",
- "shasum": "130dec0ea8152bc796d8bbca1bc97b2ae0c381f4"
+ "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc10.zip",
+ "reference": "8.x-3.0-rc10",
+ "shasum": "f79fd895dd1f16c3af457bfaed5527f5b5bc752c"
},
"require": {
"drupal/core": "^9 || ^10",
@@ -3579,8 +3583,8 @@
"type": "drupal-theme",
"extra": {
"drupal": {
- "version": "8.x-3.0-rc9",
- "datestamp": "1706705034",
+ "version": "8.x-3.0-rc10",
+ "datestamp": "1712686345",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
@@ -4057,16 +4061,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.3.43",
+ "version": "4.3.44",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "ffe4c5eb30c980ff3bb8a859d7064d58ffad7234"
+ "reference": "cb2337998747dfdef4dd046276bf40407d51c20b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ffe4c5eb30c980ff3bb8a859d7064d58ffad7234",
- "reference": "ffe4c5eb30c980ff3bb8a859d7064d58ffad7234",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/cb2337998747dfdef4dd046276bf40407d51c20b",
+ "reference": "cb2337998747dfdef4dd046276bf40407d51c20b",
"shasum": ""
},
"require": {
@@ -4152,7 +4156,8 @@
"[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch",
"[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch",
"[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.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/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.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/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch",
+ "[#UHF-9952] Convert line breaks into HTML filter generates duplicate br tags after a line ending (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-02-29/3083786-br-generates-duplicate-tags.patch"
},
"drupal/default_content": {
"https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch"
@@ -4182,10 +4187,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.43",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.44",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-04-09T14:05:57+00:00"
+ "time": "2024-04-11T11:45:16+00:00"
},
{
"name": "drupal/helfi_proxy",
diff --git a/phpunit.platform.xml b/phpunit.platform.xml
index 9e15d136..e4464310 100644
--- a/phpunit.platform.xml
+++ b/phpunit.platform.xml
@@ -11,7 +11,6 @@
-
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b4434b3c..22d88d29 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,6 @@
-