diff --git a/.platform/schema b/.platform/schema
index e440e5c8..bf0d87ab 100644
--- a/.platform/schema
+++ b/.platform/schema
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index fd51a1b9..16a294c1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,31 +8,31 @@
"packages": [
{
"name": "asm89/stack-cors",
- "version": "v2.1.1",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/asm89/stack-cors.git",
- "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"
+ "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
- "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
+ "url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea",
+ "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea",
"shasum": ""
},
"require": {
- "php": "^7.2|^8.0",
- "symfony/http-foundation": "^4|^5|^6",
- "symfony/http-kernel": "^4|^5|^6"
+ "php": "^7.3|^8.0",
+ "symfony/http-foundation": "^5.3|^6|^7",
+ "symfony/http-kernel": "^5.3|^6|^7"
},
"require-dev": {
- "phpunit/phpunit": "^7|^9",
+ "phpunit/phpunit": "^9",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
}
},
"autoload": {
@@ -58,9 +58,9 @@
],
"support": {
"issues": "https://github.com/asm89/stack-cors/issues",
- "source": "https://github.com/asm89/stack-cors/tree/v2.1.1"
+ "source": "https://github.com/asm89/stack-cors/tree/v2.2.0"
},
- "time": "2022-01-18T09:12:03+00:00"
+ "time": "2023-11-14T13:51:46+00:00"
},
{
"name": "caxy/php-htmldiff",
@@ -3495,6 +3495,10 @@
"name": "mglaman",
"homepage": "https://www.drupal.org/user/2416470"
},
+ {
+ "name": "robbin.zhao",
+ "homepage": "https://www.drupal.org/user/616818"
+ },
{
"name": "twistor",
"homepage": "https://www.drupal.org/user/473738"
@@ -3743,16 +3747,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.0.5",
+ "version": "6.1.6",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "efd761c50d0f7cee7ee65e366d1038cb65bcbe86"
+ "reference": "1a0cc85d2c2e1de14e13530709693bf9c9100273"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/efd761c50d0f7cee7ee65e366d1038cb65bcbe86",
- "reference": "efd761c50d0f7cee7ee65e366d1038cb65bcbe86",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1a0cc85d2c2e1de14e13530709693bf9c9100273",
+ "reference": "1a0cc85d2c2e1de14e13530709693bf9c9100273",
"shasum": ""
},
"require": {
@@ -3770,10 +3774,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.0.5",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.1.6",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-11-29T06:49:13+00:00"
+ "time": "2023-12-05T12:50:03+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -3950,21 +3954,25 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-tools.git",
- "reference": "f063599143079b099b49e613eb7691662958a3b1"
+ "reference": "218297db1a13ae4dbae519ce5f81bf64277fe36d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/f063599143079b099b49e613eb7691662958a3b1",
- "reference": "f063599143079b099b49e613eb7691662958a3b1",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/218297db1a13ae4dbae519ce5f81bf64277fe36d",
+ "reference": "218297db1a13ae4dbae519ce5f81bf64277fe36d",
"shasum": ""
},
"require": {
- "drush/drush": "^10 || ^11 || ^12"
+ "drush/drush": "^11 || ^12"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"drupal/coder": "^8.3",
+ "jangregor/phpstan-prophecy": "^1.0",
"phpspec/prophecy-phpunit": "^2",
+ "phpstan/extension-installer": "^1.3",
+ "phpstan/phpstan": "^1.10",
+ "phpstan/phpstan-deprecation-rules": "^1.1",
"phpunit/phpunit": "^9.6"
},
"default-branch": true,
@@ -3993,7 +4001,7 @@
"source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
"issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
},
- "time": "2023-10-27T06:16:44+00:00"
+ "time": "2023-11-30T13:43:09+00:00"
},
{
"name": "drupal/helfi_navigation",
@@ -4032,16 +4040,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.1.0",
+ "version": "4.1.4",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "ecd95e8af96d428d11f911a10caa796514bbdaa7"
+ "reference": "9adcf9998ab020196f6803538d8192d245560866"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ecd95e8af96d428d11f911a10caa796514bbdaa7",
- "reference": "ecd95e8af96d428d11f911a10caa796514bbdaa7",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9adcf9998ab020196f6803538d8192d245560866",
+ "reference": "9adcf9998ab020196f6803538d8192d245560866",
"shasum": ""
},
"require": {
@@ -4153,10 +4161,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.1.0",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.1.4",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-11-28T09:06:16+00:00"
+ "time": "2023-12-01T11:23:19+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -5365,10 +5373,6 @@
{
"name": "nielsvm",
"homepage": "https://www.drupal.org/user/163285"
- },
- {
- "name": "SqyD",
- "homepage": "https://www.drupal.org/user/106525"
}
],
"description": "Provides a generic external cache invalidation API and queue service.",
@@ -5379,17 +5383,17 @@
},
{
"name": "drupal/raven",
- "version": "3.2.25",
+ "version": "3.2.27",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/raven.git",
- "reference": "3.2.25"
+ "reference": "3.2.27"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/raven-3.2.25.zip",
- "reference": "3.2.25",
- "shasum": "f9df003a7c011519ec30de2010a5dc334027b620"
+ "url": "https://ftp.drupal.org/files/projects/raven-3.2.27.zip",
+ "reference": "3.2.27",
+ "shasum": "a6b53c905800332f52a6a0907a27b60b8967d407"
},
"require": {
"drupal/core": "^8 || ^9 || ^10",
@@ -5397,14 +5401,15 @@
},
"require-dev": {
"drupal/csp": "^1.17",
+ "drupal/monitoring": "^1.13",
"drupal/seckit": "^2.0",
- "drush/drush": "^10.6 || ^11.0"
+ "drush/drush": "^10.6 || ^11.0 || ^12.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.2.25",
- "datestamp": "1682747654",
+ "version": "3.2.27",
+ "datestamp": "1701127672",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -5412,7 +5417,7 @@
},
"drush": {
"services": {
- "drush.services.yml": "^9 || ^10 || ^11"
+ "drush.services.yml": "^9 || ^10 || ^11 || ^12"
}
}
},
@@ -6039,6 +6044,10 @@
"name": "cbccharlie",
"homepage": "https://www.drupal.org/user/616836"
},
+ {
+ "name": "Hjalteschurmann",
+ "homepage": "https://www.drupal.org/user/3730405"
+ },
{
"name": "kreynen",
"homepage": "https://www.drupal.org/user/48877"
@@ -6174,29 +6183,31 @@
},
{
"name": "drupal/stage_file_proxy",
- "version": "2.0.3",
+ "version": "2.1.2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/stage_file_proxy.git",
- "reference": "2.0.3"
+ "reference": "2.1.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.0.3.zip",
- "reference": "2.0.3",
- "shasum": "74833f98bee96a108516bbd1cad3b728b735918c"
+ "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.2.zip",
+ "reference": "2.1.2",
+ "shasum": "a25c395022f6ff39aa290c6eca3ead6028bac664"
},
"require": {
- "drupal/core": "^9 || ^10"
+ "drupal/core": "^9 || ^10",
+ "php": ">=8"
},
"require-dev": {
+ "drupal/coder": "^8.3",
"drush/drush": "^11"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.3",
- "datestamp": "1688053826",
+ "version": "2.1.2",
+ "datestamp": "1697812711",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -6209,6 +6220,17 @@
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
+ "scripts": {
+ "phpcs": [
+ "vendor/bin/phpcs -p ."
+ ],
+ "phpcbf": [
+ "vendor/bin/phpcbf -p ."
+ ],
+ "test": [
+ "@phpcs"
+ ]
+ },
"license": [
"GPL-2.0-or-later"
],
@@ -7472,16 +7494,16 @@
},
{
"name": "firebase/php-jwt",
- "version": "v6.9.0",
+ "version": "v6.10.0",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
- "reference": "f03270e63eaccf3019ef0f32849c497385774e11"
+ "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11",
- "reference": "f03270e63eaccf3019ef0f32849c497385774e11",
+ "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
+ "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
"shasum": ""
},
"require": {
@@ -7529,9 +7551,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
- "source": "https://github.com/firebase/php-jwt/tree/v6.9.0"
+ "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
},
- "time": "2023-10-05T00:24:42+00:00"
+ "time": "2023-12-01T16:26:39+00:00"
},
{
"name": "galbar/jsonpath",
@@ -7694,16 +7716,16 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.8.0",
+ "version": "7.8.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9"
+ "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9",
- "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
+ "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
"shasum": ""
},
"require": {
@@ -7718,11 +7740,11 @@
"psr/http-client-implementation": "1.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
+ "bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
"php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
"php-http/message-factory": "^1.1",
- "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+ "phpunit/phpunit": "^8.5.36 || ^9.6.15",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -7800,7 +7822,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.8.0"
+ "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
},
"funding": [
{
@@ -7816,28 +7838,28 @@
"type": "tidelift"
}
],
- "time": "2023-08-27T10:20:53+00:00"
+ "time": "2023-12-03T20:35:24+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "111166291a0f8130081195ac4556a5587d7f1b5d"
+ "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d",
- "reference": "111166291a0f8130081195ac4556a5587d7f1b5d",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
+ "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
- "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.36 || ^9.6.15"
},
"type": "library",
"extra": {
@@ -7883,7 +7905,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.1"
+ "source": "https://github.com/guzzle/promises/tree/2.0.2"
},
"funding": [
{
@@ -7899,20 +7921,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-03T15:11:55+00:00"
+ "time": "2023-12-03T20:19:20+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.6.1",
+ "version": "2.6.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727"
+ "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727",
- "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
+ "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
"shasum": ""
},
"require": {
@@ -7926,9 +7948,9 @@
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
+ "bamarni/composer-bin-plugin": "^1.8.2",
"http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+ "phpunit/phpunit": "^8.5.36 || ^9.6.15"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -7999,7 +8021,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.6.1"
+ "source": "https://github.com/guzzle/psr7/tree/2.6.2"
},
"funding": [
{
@@ -8015,7 +8037,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-27T10:13:57+00:00"
+ "time": "2023-12-03T20:05:35+00:00"
},
{
"name": "http-interop/http-factory-guzzle",
@@ -9455,16 +9477,16 @@
},
{
"name": "php-http/client-common",
- "version": "2.7.0",
+ "version": "2.7.1",
"source": {
"type": "git",
"url": "https://github.com/php-http/client-common.git",
- "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b"
+ "reference": "1e19c059b0e4d5f717bf5d524d616165aeab0612"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-http/client-common/zipball/880509727a447474d2a71b7d7fa5d268ddd3db4b",
- "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b",
+ "url": "https://api.github.com/repos/php-http/client-common/zipball/1e19c059b0e4d5f717bf5d524d616165aeab0612",
+ "reference": "1e19c059b0e4d5f717bf5d524d616165aeab0612",
"shasum": ""
},
"require": {
@@ -9474,7 +9496,7 @@
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0 || ^2.0",
- "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0",
+ "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0 || ^7.0",
"symfony/polyfill-php80": "^1.17"
},
"require-dev": {
@@ -9518,22 +9540,22 @@
],
"support": {
"issues": "https://github.com/php-http/client-common/issues",
- "source": "https://github.com/php-http/client-common/tree/2.7.0"
+ "source": "https://github.com/php-http/client-common/tree/2.7.1"
},
- "time": "2023-05-17T06:46:59+00:00"
+ "time": "2023-11-30T10:31:25+00:00"
},
{
"name": "php-http/discovery",
- "version": "1.19.1",
+ "version": "1.19.2",
"source": {
"type": "git",
"url": "https://github.com/php-http/discovery.git",
- "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e"
+ "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-http/discovery/zipball/57f3de01d32085fea20865f9b16fb0e69347c39e",
- "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e",
+ "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb",
+ "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb",
"shasum": ""
},
"require": {
@@ -9596,9 +9618,9 @@
],
"support": {
"issues": "https://github.com/php-http/discovery/issues",
- "source": "https://github.com/php-http/discovery/tree/1.19.1"
+ "source": "https://github.com/php-http/discovery/tree/1.19.2"
},
- "time": "2023-07-11T07:02:26+00:00"
+ "time": "2023-11-30T16:49:05+00:00"
},
{
"name": "php-http/httplug",
@@ -10743,16 +10765,16 @@
},
{
"name": "sentry/sentry",
- "version": "3.20.1",
+ "version": "3.22.1",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
- "reference": "644ad9768c18139a80ac510090fad000d9ffd8a4"
+ "reference": "8859631ba5ab15bc1af420b0eeed19ecc6c9d81d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/644ad9768c18139a80ac510090fad000d9ffd8a4",
- "reference": "644ad9768c18139a80ac510090fad000d9ffd8a4",
+ "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/8859631ba5ab15bc1af420b0eeed19ecc6c9d81d",
+ "reference": "8859631ba5ab15bc1af420b0eeed19ecc6c9d81d",
"shasum": ""
},
"require": {
@@ -10770,7 +10792,7 @@
"psr/http-factory": "^1.0",
"psr/http-factory-implementation": "^1.0",
"psr/log": "^1.0|^2.0|^3.0",
- "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0",
+ "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0|^7.0",
"symfony/polyfill-php80": "^1.17"
},
"conflict": {
@@ -10796,11 +10818,6 @@
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.13.x-dev"
- }
- },
"autoload": {
"files": [
"src/functions.php"
@@ -10832,7 +10849,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-php/issues",
- "source": "https://github.com/getsentry/sentry-php/tree/3.20.1"
+ "source": "https://github.com/getsentry/sentry-php/tree/3.22.1"
},
"funding": [
{
@@ -10844,7 +10861,7 @@
"type": "custom"
}
],
- "time": "2023-06-26T11:01:40+00:00"
+ "time": "2023-11-13T11:47:28+00:00"
},
{
"name": "stomp-php/stomp-php",
@@ -10921,16 +10938,16 @@
},
{
"name": "symfony/console",
- "version": "v6.3.8",
+ "version": "v6.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92"
+ "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
- "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
+ "url": "https://api.github.com/repos/symfony/console/zipball/a550a7c99daeedef3f9d23fb82e3531525ff11fd",
+ "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd",
"shasum": ""
},
"require": {
@@ -10938,7 +10955,7 @@
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/string": "^5.4|^6.0"
+ "symfony/string": "^5.4|^6.0|^7.0"
},
"conflict": {
"symfony/dependency-injection": "<5.4",
@@ -10952,12 +10969,16 @@
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/lock": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/var-dumper": "^5.4|^6.0"
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/lock": "^5.4|^6.0|^7.0",
+ "symfony/messenger": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "symfony/stopwatch": "^5.4|^6.0|^7.0",
+ "symfony/var-dumper": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -10991,7 +11012,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.3.8"
+ "source": "https://github.com/symfony/console/tree/v6.4.1"
},
"funding": [
{
@@ -11007,20 +11028,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-31T08:09:35+00:00"
+ "time": "2023-11-30T10:54:28+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v6.3.8",
+ "version": "v6.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc"
+ "reference": "f88ff6428afbeb17cc648c8003bd608534750baf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc",
- "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f88ff6428afbeb17cc648c8003bd608534750baf",
+ "reference": "f88ff6428afbeb17cc648c8003bd608534750baf",
"shasum": ""
},
"require": {
@@ -11028,7 +11049,7 @@
"psr/container": "^1.1|^2.0",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/service-contracts": "^2.5|^3.0",
- "symfony/var-exporter": "^6.2.10"
+ "symfony/var-exporter": "^6.2.10|^7.0"
},
"conflict": {
"ext-psr": "<1.1|>=2",
@@ -11042,9 +11063,9 @@
"symfony/service-implementation": "1.1|2.0|3.0"
},
"require-dev": {
- "symfony/config": "^6.1",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/config": "^6.1|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -11072,7 +11093,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v6.3.8"
+ "source": "https://github.com/symfony/dependency-injection/tree/v6.4.1"
},
"funding": [
{
@@ -11088,7 +11109,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-31T08:07:48+00:00"
+ "time": "2023-12-01T14:56:37+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -11159,30 +11180,31 @@
},
{
"name": "symfony/error-handler",
- "version": "v6.3.5",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "1f69476b64fb47105c06beef757766c376b548c4"
+ "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/1f69476b64fb47105c06beef757766c376b548c4",
- "reference": "1f69476b64fb47105c06beef757766c376b548c4",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/c873490a1c97b3a0a4838afc36ff36c112d02788",
+ "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788",
"shasum": ""
},
"require": {
"php": ">=8.1",
"psr/log": "^1|^2|^3",
- "symfony/var-dumper": "^5.4|^6.0"
+ "symfony/var-dumper": "^5.4|^6.0|^7.0"
},
"conflict": {
- "symfony/deprecation-contracts": "<2.5"
+ "symfony/deprecation-contracts": "<2.5",
+ "symfony/http-kernel": "<6.4"
},
"require-dev": {
"symfony/deprecation-contracts": "^2.5|^3",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/serializer": "^5.4|^6.0"
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/serializer": "^5.4|^6.0|^7.0"
},
"bin": [
"Resources/bin/patch-type-declarations"
@@ -11213,7 +11235,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v6.3.5"
+ "source": "https://github.com/symfony/error-handler/tree/v6.4.0"
},
"funding": [
{
@@ -11229,20 +11251,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-12T06:57:20+00:00"
+ "time": "2023-10-18T09:43:34+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v6.3.2",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e"
+ "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
- "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d76d2632cfc2206eecb5ad2b26cd5934082941b6",
+ "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6",
"shasum": ""
},
"require": {
@@ -11259,13 +11281,13 @@
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/error-handler": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^5.4|^6.0|^7.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/stopwatch": "^5.4|^6.0"
+ "symfony/stopwatch": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -11293,7 +11315,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.0"
},
"funding": [
{
@@ -11309,7 +11331,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-06T06:56:43+00:00"
+ "time": "2023-07-27T06:52:43+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -11389,16 +11411,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v6.3.1",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+ "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
- "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+ "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
"shasum": ""
},
"require": {
@@ -11432,7 +11454,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+ "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
},
"funding": [
{
@@ -11448,27 +11470,27 @@
"type": "tidelift"
}
],
- "time": "2023-06-01T08:30:39+00:00"
+ "time": "2023-07-26T17:27:13+00:00"
},
{
"name": "symfony/finder",
- "version": "v6.3.5",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
+ "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
- "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
+ "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
"require-dev": {
- "symfony/filesystem": "^6.0"
+ "symfony/filesystem": "^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -11496,7 +11518,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.3.5"
+ "source": "https://github.com/symfony/finder/tree/v6.4.0"
},
"funding": [
{
@@ -11512,36 +11534,38 @@
"type": "tidelift"
}
],
- "time": "2023-09-26T12:56:25+00:00"
+ "time": "2023-10-31T17:30:12+00:00"
},
{
"name": "symfony/http-client",
- "version": "v5.4.25",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
- "reference": "ccbb572627466f03a3d7aa1b23483787f5969afc"
+ "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client/zipball/ccbb572627466f03a3d7aa1b23483787f5969afc",
- "reference": "ccbb572627466f03a3d7aa1b23483787f5969afc",
+ "url": "https://api.github.com/repos/symfony/http-client/zipball/5c584530b77aa10ae216989ffc48b4bedc9c0b29",
+ "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.1",
"psr/log": "^1|^2|^3",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/http-client-contracts": "^2.4",
- "symfony/polyfill-php73": "^1.11",
- "symfony/polyfill-php80": "^1.16",
- "symfony/service-contracts": "^1.0|^2|^3"
+ "symfony/deprecation-contracts": "^2.5|^3",
+ "symfony/http-client-contracts": "^3",
+ "symfony/service-contracts": "^2.5|^3"
+ },
+ "conflict": {
+ "php-http/discovery": "<1.15",
+ "symfony/http-foundation": "<6.3"
},
"provide": {
"php-http/async-client-implementation": "*",
"php-http/client-implementation": "*",
"psr/http-client-implementation": "1.0",
- "symfony/http-client-implementation": "2.4"
+ "symfony/http-client-implementation": "3.0"
},
"require-dev": {
"amphp/amp": "^2.5",
@@ -11551,12 +11575,12 @@
"guzzlehttp/promises": "^1.4",
"nyholm/psr7": "^1.0",
"php-http/httplug": "^1.0|^2.0",
- "php-http/message-factory": "^1.0",
"psr/http-client": "^1.0",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/http-kernel": "^4.4.13|^5.1.5|^6.0",
- "symfony/process": "^4.4|^5.0|^6.0",
- "symfony/stopwatch": "^4.4|^5.0|^6.0"
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/messenger": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "symfony/stopwatch": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -11587,7 +11611,7 @@
"http"
],
"support": {
- "source": "https://github.com/symfony/http-client/tree/v5.4.25"
+ "source": "https://github.com/symfony/http-client/tree/v6.4.0"
},
"funding": [
{
@@ -11603,32 +11627,29 @@
"type": "tidelift"
}
],
- "time": "2023-06-21T14:44:30+00:00"
+ "time": "2023-11-28T20:55:58+00:00"
},
{
"name": "symfony/http-client-contracts",
- "version": "v2.5.2",
+ "version": "v3.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
- "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70"
+ "reference": "1ee70e699b41909c209a0c930f11034b93578654"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
- "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654",
+ "reference": "1ee70e699b41909c209a0c930f11034b93578654",
"shasum": ""
},
"require": {
- "php": ">=7.2.5"
- },
- "suggest": {
- "symfony/http-client-implementation": ""
+ "php": ">=8.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
+ "dev-main": "3.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -11638,7 +11659,10 @@
"autoload": {
"psr-4": {
"Symfony\\Contracts\\HttpClient\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Test/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -11665,7 +11689,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0"
},
"funding": [
{
@@ -11681,20 +11705,20 @@
"type": "tidelift"
}
],
- "time": "2022-04-12T15:48:08+00:00"
+ "time": "2023-07-30T20:28:31+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "ce332676de1912c4389222987193c3ef38033df6"
+ "reference": "44a6d39a9cc11e154547d882d5aac1e014440771"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce332676de1912c4389222987193c3ef38033df6",
- "reference": "ce332676de1912c4389222987193c3ef38033df6",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/44a6d39a9cc11e154547d882d5aac1e014440771",
+ "reference": "44a6d39a9cc11e154547d882d5aac1e014440771",
"shasum": ""
},
"require": {
@@ -11709,12 +11733,12 @@
"require-dev": {
"doctrine/dbal": "^2.13.1|^3|^4",
"predis/predis": "^1.1|^2.0",
- "symfony/cache": "^6.3",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
- "symfony/mime": "^5.4|^6.0",
- "symfony/rate-limiter": "^5.2|^6.0"
+ "symfony/cache": "^6.3|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
+ "symfony/mime": "^5.4|^6.0|^7.0",
+ "symfony/rate-limiter": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -11742,7 +11766,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v6.3.8"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.4.0"
},
"funding": [
{
@@ -11758,29 +11782,29 @@
"type": "tidelift"
}
],
- "time": "2023-11-07T10:17:15+00:00"
+ "time": "2023-11-20T16:41:16+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.3.8",
+ "version": "v6.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "929202375ccf44a309c34aeca8305408442ebcc1"
+ "reference": "2953274c16a229b3933ef73a6898e18388e12e1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/929202375ccf44a309c34aeca8305408442ebcc1",
- "reference": "929202375ccf44a309c34aeca8305408442ebcc1",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2953274c16a229b3933ef73a6898e18388e12e1b",
+ "reference": "2953274c16a229b3933ef73a6898e18388e12e1b",
"shasum": ""
},
"require": {
"php": ">=8.1",
"psr/log": "^1|^2|^3",
"symfony/deprecation-contracts": "^2.5|^3",
- "symfony/error-handler": "^6.3",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/http-foundation": "^6.3.4",
+ "symfony/error-handler": "^6.4|^7.0",
+ "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
@@ -11788,7 +11812,7 @@
"symfony/cache": "<5.4",
"symfony/config": "<6.1",
"symfony/console": "<5.4",
- "symfony/dependency-injection": "<6.3.4",
+ "symfony/dependency-injection": "<6.4",
"symfony/doctrine-bridge": "<5.4",
"symfony/form": "<5.4",
"symfony/http-client": "<5.4",
@@ -11798,7 +11822,7 @@
"symfony/translation": "<5.4",
"symfony/translation-contracts": "<2.5",
"symfony/twig-bridge": "<5.4",
- "symfony/validator": "<5.4",
+ "symfony/validator": "<6.4",
"symfony/var-dumper": "<6.3",
"twig/twig": "<2.13"
},
@@ -11807,26 +11831,26 @@
},
"require-dev": {
"psr/cache": "^1.0|^2.0|^3.0",
- "symfony/browser-kit": "^5.4|^6.0",
- "symfony/clock": "^6.2",
- "symfony/config": "^6.1",
- "symfony/console": "^5.4|^6.0",
- "symfony/css-selector": "^5.4|^6.0",
- "symfony/dependency-injection": "^6.3.4",
- "symfony/dom-crawler": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/finder": "^5.4|^6.0",
+ "symfony/browser-kit": "^5.4|^6.0|^7.0",
+ "symfony/clock": "^6.2|^7.0",
+ "symfony/config": "^6.1|^7.0",
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/css-selector": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/dom-crawler": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/finder": "^5.4|^6.0|^7.0",
"symfony/http-client-contracts": "^2.5|^3",
- "symfony/process": "^5.4|^6.0",
- "symfony/property-access": "^5.4.5|^6.0.5",
- "symfony/routing": "^5.4|^6.0",
- "symfony/serializer": "^6.3",
- "symfony/stopwatch": "^5.4|^6.0",
- "symfony/translation": "^5.4|^6.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
+ "symfony/routing": "^5.4|^6.0|^7.0",
+ "symfony/serializer": "^6.3|^7.0",
+ "symfony/stopwatch": "^5.4|^6.0|^7.0",
+ "symfony/translation": "^5.4|^6.0|^7.0",
"symfony/translation-contracts": "^2.5|^3",
- "symfony/uid": "^5.4|^6.0",
- "symfony/validator": "^6.3",
- "symfony/var-exporter": "^6.2",
+ "symfony/uid": "^5.4|^6.0|^7.0",
+ "symfony/validator": "^6.4|^7.0",
+ "symfony/var-exporter": "^6.2|^7.0",
"twig/twig": "^2.13|^3.0.4"
},
"type": "library",
@@ -11855,7 +11879,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v6.3.8"
+ "source": "https://github.com/symfony/http-kernel/tree/v6.4.1"
},
"funding": [
{
@@ -11871,20 +11895,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-10T13:47:32+00:00"
+ "time": "2023-12-01T17:02:02+00:00"
},
{
"name": "symfony/mime",
- "version": "v6.3.5",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e"
+ "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
- "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/ca4f58b2ef4baa8f6cecbeca2573f88cd577d205",
+ "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205",
"shasum": ""
},
"require": {
@@ -11898,16 +11922,16 @@
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<5.4",
- "symfony/serializer": "<6.2.13|>=6.3,<6.3.2"
+ "symfony/serializer": "<6.3.2"
},
"require-dev": {
"egulias/email-validator": "^2.1.10|^3.1|^4",
"league/html-to-markdown": "^5.0",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/property-access": "^5.4|^6.0",
- "symfony/property-info": "^5.4|^6.0",
- "symfony/serializer": "~6.2.13|^6.3.2"
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/property-access": "^5.4|^6.0|^7.0",
+ "symfony/property-info": "^5.4|^6.0|^7.0",
+ "symfony/serializer": "^6.3.2|^7.0"
},
"type": "library",
"autoload": {
@@ -11939,7 +11963,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v6.3.5"
+ "source": "https://github.com/symfony/mime/tree/v6.4.0"
},
"funding": [
{
@@ -11955,24 +11979,24 @@
"type": "tidelift"
}
],
- "time": "2023-09-29T06:59:36+00:00"
+ "time": "2023-10-17T11:49:05+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v6.3.0",
+ "version": "v7.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd"
+ "reference": "700ff4096e346f54cb628ea650767c8130f1001f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd",
- "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f",
+ "reference": "700ff4096e346f54cb628ea650767c8130f1001f",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/deprecation-contracts": "^2.5|^3"
},
"type": "library",
@@ -12006,7 +12030,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/v6.3.0"
+ "source": "https://github.com/symfony/options-resolver/tree/v7.0.0"
},
"funding": [
{
@@ -12022,7 +12046,7 @@
"type": "tidelift"
}
],
- "time": "2023-05-12T14:21:09+00:00"
+ "time": "2023-08-08T10:20:21+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -12923,16 +12947,16 @@
},
{
"name": "symfony/process",
- "version": "v6.3.4",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54"
+ "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54",
- "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54",
+ "url": "https://api.github.com/repos/symfony/process/zipball/191703b1566d97a5425dc969e4350d32b8ef17aa",
+ "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa",
"shasum": ""
},
"require": {
@@ -12964,7 +12988,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v6.3.4"
+ "source": "https://github.com/symfony/process/tree/v6.4.0"
},
"funding": [
{
@@ -12980,7 +13004,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-07T10:39:22+00:00"
+ "time": "2023-11-17T21:06:49+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -13073,16 +13097,16 @@
},
{
"name": "symfony/routing",
- "version": "v6.3.5",
+ "version": "v6.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31"
+ "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/82616e59acd3e3d9c916bba798326cb7796d7d31",
- "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/0c95c164fdba18b12523b75e64199ca3503e6d40",
+ "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40",
"shasum": ""
},
"require": {
@@ -13098,11 +13122,11 @@
"require-dev": {
"doctrine/annotations": "^1.12|^2",
"psr/log": "^1|^2|^3",
- "symfony/config": "^6.2",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/config": "^6.2|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -13136,7 +13160,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v6.3.5"
+ "source": "https://github.com/symfony/routing/tree/v6.4.1"
},
"funding": [
{
@@ -13152,20 +13176,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-20T16:05:51+00:00"
+ "time": "2023-12-01T14:54:37+00:00"
},
{
"name": "symfony/serializer",
- "version": "v6.3.8",
+ "version": "v6.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf"
+ "reference": "7ead272e62c9567df619ef3c49809bf934ddbc1f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/b3ad1515a276473f7919ac97e560017284a7c4bf",
- "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/7ead272e62c9567df619ef3c49809bf934ddbc1f",
+ "reference": "7ead272e62c9567df619ef3c49809bf934ddbc1f",
"shasum": ""
},
"require": {
@@ -13181,28 +13205,32 @@
"symfony/property-access": "<5.4",
"symfony/property-info": "<5.4.24|>=6,<6.2.11",
"symfony/uid": "<5.4",
+ "symfony/validator": "<6.4",
"symfony/yaml": "<5.4"
},
"require-dev": {
"doctrine/annotations": "^1.12|^2",
"phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
- "symfony/cache": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
- "symfony/console": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/filesystem": "^5.4|^6.0",
- "symfony/form": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/mime": "^5.4|^6.0",
- "symfony/property-access": "^5.4|^6.0",
- "symfony/property-info": "^5.4.24|^6.2.11",
- "symfony/uid": "^5.4|^6.0",
- "symfony/validator": "^5.4|^6.0",
- "symfony/var-dumper": "^5.4|^6.0",
- "symfony/var-exporter": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "seld/jsonlint": "^1.10",
+ "symfony/cache": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/error-handler": "^5.4|^6.0|^7.0",
+ "symfony/filesystem": "^5.4|^6.0|^7.0",
+ "symfony/form": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/messenger": "^5.4|^6.0|^7.0",
+ "symfony/mime": "^5.4|^6.0|^7.0",
+ "symfony/property-access": "^5.4|^6.0|^7.0",
+ "symfony/property-info": "^5.4.24|^6.2.11|^7.0",
+ "symfony/translation-contracts": "^2.5|^3",
+ "symfony/uid": "^5.4|^6.0|^7.0",
+ "symfony/validator": "^6.4|^7.0",
+ "symfony/var-dumper": "^5.4|^6.0|^7.0",
+ "symfony/var-exporter": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -13230,7 +13258,7 @@
"description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/serializer/tree/v6.3.8"
+ "source": "https://github.com/symfony/serializer/tree/v6.4.1"
},
"funding": [
{
@@ -13246,7 +13274,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-07T10:11:25+00:00"
+ "time": "2023-12-01T14:54:37+00:00"
},
{
"name": "symfony/service-contracts",
@@ -13332,16 +13360,16 @@
},
{
"name": "symfony/string",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "13880a87790c76ef994c91e87efb96134522577a"
+ "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a",
- "reference": "13880a87790c76ef994c91e87efb96134522577a",
+ "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809",
+ "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809",
"shasum": ""
},
"require": {
@@ -13355,11 +13383,11 @@
"symfony/translation-contracts": "<2.5"
},
"require-dev": {
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/http-client": "^5.4|^6.0",
- "symfony/intl": "^6.2",
+ "symfony/error-handler": "^5.4|^6.0|^7.0",
+ "symfony/http-client": "^5.4|^6.0|^7.0",
+ "symfony/intl": "^6.2|^7.0",
"symfony/translation-contracts": "^2.5|^3.0",
- "symfony/var-exporter": "^5.4|^6.0"
+ "symfony/var-exporter": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -13398,7 +13426,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.3.8"
+ "source": "https://github.com/symfony/string/tree/v6.4.0"
},
"funding": [
{
@@ -13414,7 +13442,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-09T08:28:21+00:00"
+ "time": "2023-11-28T20:41:49+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -13496,16 +13524,16 @@
},
{
"name": "symfony/validator",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "f75b40e088d095db1e788b81605a76f4563cb80e"
+ "reference": "33e1f3bb76ef70e3170e12f878aefb9c69b0fc4c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/f75b40e088d095db1e788b81605a76f4563cb80e",
- "reference": "f75b40e088d095db1e788b81605a76f4563cb80e",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/33e1f3bb76ef70e3170e12f878aefb9c69b0fc4c",
+ "reference": "33e1f3bb76ef70e3170e12f878aefb9c69b0fc4c",
"shasum": ""
},
"require": {
@@ -13530,21 +13558,21 @@
"require-dev": {
"doctrine/annotations": "^1.13|^2",
"egulias/email-validator": "^2.1.10|^3|^4",
- "symfony/cache": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
- "symfony/console": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/finder": "^5.4|^6.0",
- "symfony/http-client": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/intl": "^5.4|^6.0",
- "symfony/mime": "^5.4|^6.0",
- "symfony/property-access": "^5.4|^6.0",
- "symfony/property-info": "^5.4|^6.0",
- "symfony/translation": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/cache": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/finder": "^5.4|^6.0|^7.0",
+ "symfony/http-client": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/intl": "^5.4|^6.0|^7.0",
+ "symfony/mime": "^5.4|^6.0|^7.0",
+ "symfony/property-access": "^5.4|^6.0|^7.0",
+ "symfony/property-info": "^5.4|^6.0|^7.0",
+ "symfony/translation": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -13572,7 +13600,7 @@
"description": "Provides tools to validate values",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/validator/tree/v6.3.8"
+ "source": "https://github.com/symfony/validator/tree/v6.4.0"
},
"funding": [
{
@@ -13588,20 +13616,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-07T10:17:15+00:00"
+ "time": "2023-11-29T07:47:42+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a"
+ "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a",
- "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c40f7d17e91d8b407582ed51a2bbf83c52c367f6",
+ "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6",
"shasum": ""
},
"require": {
@@ -13614,10 +13642,11 @@
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/uid": "^5.4|^6.0",
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/error-handler": "^6.3|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "symfony/uid": "^5.4|^6.0|^7.0",
"twig/twig": "^2.13|^3.0.4"
},
"bin": [
@@ -13656,7 +13685,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.3.8"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.4.0"
},
"funding": [
{
@@ -13672,27 +13701,27 @@
"type": "tidelift"
}
],
- "time": "2023-11-08T10:42:36+00:00"
+ "time": "2023-11-09T08:28:32+00:00"
},
{
"name": "symfony/var-exporter",
- "version": "v6.3.6",
+ "version": "v7.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "374d289c13cb989027274c86206ddc63b16a2441"
+ "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/374d289c13cb989027274c86206ddc63b16a2441",
- "reference": "374d289c13cb989027274c86206ddc63b16a2441",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
+ "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "symfony/var-dumper": "^5.4|^6.0"
+ "symfony/var-dumper": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -13730,7 +13759,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v6.3.6"
+ "source": "https://github.com/symfony/var-exporter/tree/v7.0.1"
},
"funding": [
{
@@ -13746,20 +13775,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-13T09:16:49+00:00"
+ "time": "2023-11-30T11:38:21+00:00"
},
{
"name": "symfony/yaml",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92"
+ "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92",
- "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587",
+ "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587",
"shasum": ""
},
"require": {
@@ -13771,7 +13800,7 @@
"symfony/console": "<5.4"
},
"require-dev": {
- "symfony/console": "^5.4|^6.0"
+ "symfony/console": "^5.4|^6.0|^7.0"
},
"bin": [
"Resources/bin/yaml-lint"
@@ -13802,7 +13831,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.3.8"
+ "source": "https://github.com/symfony/yaml/tree/v6.4.0"
},
"funding": [
{
@@ -13818,7 +13847,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-06T10:58:05+00:00"
+ "time": "2023-11-06T11:00:25+00:00"
},
{
"name": "t4web/composer-lock-parser",
@@ -14381,16 +14410,16 @@
},
{
"name": "colinodell/psr-testlogger",
- "version": "v1.2.0",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/colinodell/psr-testlogger.git",
- "reference": "9246155e688b310fb3d0f201ead2445686b5844e"
+ "reference": "291f5b70ea0d3139787d18f442365a8e2784a462"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinodell/psr-testlogger/zipball/9246155e688b310fb3d0f201ead2445686b5844e",
- "reference": "9246155e688b310fb3d0f201ead2445686b5844e",
+ "url": "https://api.github.com/repos/colinodell/psr-testlogger/zipball/291f5b70ea0d3139787d18f442365a8e2784a462",
+ "reference": "291f5b70ea0d3139787d18f442365a8e2784a462",
"shasum": ""
},
"require": {
@@ -14456,7 +14485,7 @@
"type": "github"
}
],
- "time": "2023-03-14T19:12:55+00:00"
+ "time": "2023-11-29T23:03:34+00:00"
},
{
"name": "composer/ca-bundle",
@@ -14863,16 +14892,16 @@
},
{
"name": "composer/spdx-licenses",
- "version": "1.5.7",
+ "version": "1.5.8",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "c848241796da2abf65837d51dce1fae55a960149"
+ "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149",
- "reference": "c848241796da2abf65837d51dce1fae55a960149",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a",
+ "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a",
"shasum": ""
},
"require": {
@@ -14921,9 +14950,9 @@
"validator"
],
"support": {
- "irc": "irc://irc.freenode.org/composer",
+ "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/spdx-licenses/issues",
- "source": "https://github.com/composer/spdx-licenses/tree/1.5.7"
+ "source": "https://github.com/composer/spdx-licenses/tree/1.5.8"
},
"funding": [
{
@@ -14939,7 +14968,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-23T07:37:50+00:00"
+ "time": "2023-11-20T07:44:33+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -16161,16 +16190,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.41",
+ "version": "1.10.46",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "c6174523c2a69231df55bdc65b61655e72876d76"
+ "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76",
- "reference": "c6174523c2a69231df55bdc65b61655e72876d76",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/90d3d25c5b98b8068916bbf08ce42d5cb6c54e70",
+ "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70",
"shasum": ""
},
"require": {
@@ -16219,7 +16248,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-05T12:57:57+00:00"
+ "time": "2023-11-28T14:57:26+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -17996,27 +18025,27 @@
},
{
"name": "symfony/browser-kit",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe"
+ "reference": "a3bb210e001580ec75e1d02b27fae3452e6bf502"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e270297dbee59168274c2b535ab1bccd593e6ffe",
- "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/a3bb210e001580ec75e1d02b27fae3452e6bf502",
+ "reference": "a3bb210e001580ec75e1d02b27fae3452e6bf502",
"shasum": ""
},
"require": {
"php": ">=8.1",
- "symfony/dom-crawler": "^5.4|^6.0"
+ "symfony/dom-crawler": "^5.4|^6.0|^7.0"
},
"require-dev": {
- "symfony/css-selector": "^5.4|^6.0",
- "symfony/http-client": "^5.4|^6.0",
- "symfony/mime": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0"
+ "symfony/css-selector": "^5.4|^6.0|^7.0",
+ "symfony/http-client": "^5.4|^6.0|^7.0",
+ "symfony/mime": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -18044,7 +18073,7 @@
"description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/browser-kit/tree/v6.3.8"
+ "source": "https://github.com/symfony/browser-kit/tree/v6.4.0"
},
"funding": [
{
@@ -18060,20 +18089,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-31T08:07:48+00:00"
+ "time": "2023-10-31T08:18:17+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v6.3.2",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "883d961421ab1709877c10ac99451632a3d6fa57"
+ "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/883d961421ab1709877c10ac99451632a3d6fa57",
- "reference": "883d961421ab1709877c10ac99451632a3d6fa57",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4",
+ "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4",
"shasum": ""
},
"require": {
@@ -18109,7 +18138,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v6.3.2"
+ "source": "https://github.com/symfony/css-selector/tree/v6.4.0"
},
"funding": [
{
@@ -18125,20 +18154,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-12T16:00:22+00:00"
+ "time": "2023-10-31T08:40:20+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v6.3.4",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1"
+ "reference": "14ff4fd2a5c8969d6158dbe7ef5b17d6a9c6ba33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1",
- "reference": "3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/14ff4fd2a5c8969d6158dbe7ef5b17d6a9c6ba33",
+ "reference": "14ff4fd2a5c8969d6158dbe7ef5b17d6a9c6ba33",
"shasum": ""
},
"require": {
@@ -18148,7 +18177,7 @@
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
- "symfony/css-selector": "^5.4|^6.0"
+ "symfony/css-selector": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -18176,7 +18205,7 @@
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dom-crawler/tree/v6.3.4"
+ "source": "https://github.com/symfony/dom-crawler/tree/v6.4.0"
},
"funding": [
{
@@ -18192,20 +18221,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-01T07:43:40+00:00"
+ "time": "2023-11-20T16:41:16+00:00"
},
{
"name": "symfony/lock",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/lock.git",
- "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca"
+ "reference": "49c2d0ae4777d118edb13f23d0b4f125d7302cb3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/lock/zipball/5379d56b6cedba2d9dfb86563c4ed73de5b194ca",
- "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca",
+ "url": "https://api.github.com/repos/symfony/lock/zipball/49c2d0ae4777d118edb13f23d0b4f125d7302cb3",
+ "reference": "49c2d0ae4777d118edb13f23d0b4f125d7302cb3",
"shasum": ""
},
"require": {
@@ -18255,7 +18284,7 @@
"semaphore"
],
"support": {
- "source": "https://github.com/symfony/lock/tree/v6.3.8"
+ "source": "https://github.com/symfony/lock/tree/v6.4.0"
},
"funding": [
{
@@ -18271,20 +18300,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-07T10:17:15+00:00"
+ "time": "2023-11-21T09:41:01+00:00"
},
{
"name": "symfony/phpunit-bridge",
- "version": "v6.3.8",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "45610900872a35b77db7698651f36129906041ea"
+ "reference": "36bc5bc71fff1f6ca9c7c7fe1e7e23f4c1ca2aa3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/45610900872a35b77db7698651f36129906041ea",
- "reference": "45610900872a35b77db7698651f36129906041ea",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/36bc5bc71fff1f6ca9c7c7fe1e7e23f4c1ca2aa3",
+ "reference": "36bc5bc71fff1f6ca9c7c7fe1e7e23f4c1ca2aa3",
"shasum": ""
},
"require": {
@@ -18295,7 +18324,7 @@
},
"require-dev": {
"symfony/deprecation-contracts": "^2.5|^3.0",
- "symfony/error-handler": "^5.4|^6.0",
+ "symfony/error-handler": "^5.4|^6.0|^7.0",
"symfony/polyfill-php81": "^1.27"
},
"bin": [
@@ -18336,7 +18365,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.8"
+ "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.0"
},
"funding": [
{
@@ -18352,20 +18381,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-31T08:07:48+00:00"
+ "time": "2023-10-31T08:18:17+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.1",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+ "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
- "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+ "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
"shasum": ""
},
"require": {
@@ -18394,7 +18423,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
},
"funding": [
{
@@ -18402,20 +18431,20 @@
"type": "github"
}
],
- "time": "2021-07-28T10:34:58+00:00"
+ "time": "2023-11-20T00:12:19+00:00"
},
{
"name": "weitzman/drupal-test-traits",
- "version": "2.1.0",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "git@gitlab.com:weitzman/drupal-test-traits.git",
- "reference": "e40ee4e8e41f229d297c5e714fd63c4a00c633a2"
+ "reference": "9ef44f5cd5eef942c84f2d2ffd21734944d566f8"
},
"dist": {
"type": "zip",
- "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=e40ee4e8e41f229d297c5e714fd63c4a00c633a2",
- "reference": "e40ee4e8e41f229d297c5e714fd63c4a00c633a2",
+ "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=9ef44f5cd5eef942c84f2d2ffd21734944d566f8",
+ "reference": "9ef44f5cd5eef942c84f2d2ffd21734944d566f8",
"shasum": ""
},
"require": {
@@ -18455,7 +18484,7 @@
}
],
"description": "Traits for testing Drupal sites that have user content (versus unpopulated sites).",
- "time": "2023-04-23T03:17:53+00:00"
+ "time": "2023-10-13T22:55:15+00:00"
}
],
"aliases": [],
diff --git a/conf/cmi/core.entity_form_display.media.file.default.yml b/conf/cmi/core.entity_form_display.media.file.default.yml
index 08829e96..ad56a0ad 100644
--- a/conf/cmi/core.entity_form_display.media.file.default.yml
+++ b/conf/cmi/core.entity_form_display.media.file.default.yml
@@ -9,7 +9,7 @@ dependencies:
- file
- path
_core:
- default_config_hash: gl0sXDsaNKQXVtRsPqp-E_NPZEmscOm6LSEg3kIQ40w
+ default_config_hash: YBhsPqN0Om3wNF6ncvCTPmcaEKaSI2L3KYiAUXKn4Bc
id: media.file.default
targetEntityType: media
bundle: file
diff --git a/conf/cmi/core.entity_form_display.media.file.media_library.yml b/conf/cmi/core.entity_form_display.media.file.media_library.yml
index 946880a9..d3d8f5be 100644
--- a/conf/cmi/core.entity_form_display.media.file.media_library.yml
+++ b/conf/cmi/core.entity_form_display.media.file.media_library.yml
@@ -7,7 +7,7 @@ dependencies:
- field.field.media.file.field_media_file
- media.type.file
_core:
- default_config_hash: wVUR6Bbq1Kk8i3ZrVcFM5cOehVHYrZwa8E8hrxlnV28
+ default_config_hash: mRld0RXUfZ-E4SFgfwE7yxhNEmvkYrMGQq8-u8OK7Qw
id: media.file.media_library
targetEntityType: media
bundle: file
diff --git a/conf/cmi/core.entity_form_display.media.image.default.yml b/conf/cmi/core.entity_form_display.media.image.default.yml
index d61a30ba..b48f8841 100644
--- a/conf/cmi/core.entity_form_display.media.image.default.yml
+++ b/conf/cmi/core.entity_form_display.media.image.default.yml
@@ -11,7 +11,7 @@ dependencies:
- focal_point
- path
_core:
- default_config_hash: _j-Y1d8xzIrrkE3VLGHbEks1vFdg7kMl68UaYmxSGBo
+ default_config_hash: 5XnT1z-KXlCTKfoiiLcFYke20noXvN-0yvpgXChCMnI
id: media.image.default
targetEntityType: media
bundle: image
diff --git a/conf/cmi/core.entity_form_display.media.image.media_library.yml b/conf/cmi/core.entity_form_display.media.image.media_library.yml
index 4717765c..5fe14f0b 100644
--- a/conf/cmi/core.entity_form_display.media.image.media_library.yml
+++ b/conf/cmi/core.entity_form_display.media.image.media_library.yml
@@ -11,7 +11,7 @@ dependencies:
module:
- focal_point
_core:
- default_config_hash: _WTCyWUZlB2FyBSgpuey9Y9okHz6R8gcAWQ3DUiyNuA
+ default_config_hash: vNE5u1kEJ_9nu7Y_xefiuMX65oWNd8CFdUNL-Jdp9F0
id: media.image.media_library
targetEntityType: media
bundle: image
diff --git a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml
index 9d84b09a..9313ff92 100644
--- a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml
+++ b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml
@@ -82,5 +82,4 @@ content:
third_party_settings: { }
hidden:
created: true
- field_load_more: true
status: true
diff --git a/conf/cmi/core.entity_view_display.media.file.default.yml b/conf/cmi/core.entity_view_display.media.file.default.yml
index 8b0bd203..c8d725a9 100644
--- a/conf/cmi/core.entity_view_display.media.file.default.yml
+++ b/conf/cmi/core.entity_view_display.media.file.default.yml
@@ -8,7 +8,7 @@ dependencies:
module:
- file
_core:
- default_config_hash: jwQKir29dK1SOV5MVD2m4ZqCY6UdoUVAgBUBKkCu518
+ default_config_hash: waIRQfagGQIcsgt0xZpGzidwdNx3AL8JjnqNoyGJAgo
id: media.file.default
targetEntityType: media
bundle: file
diff --git a/conf/cmi/core.entity_view_display.media.file.media_library.yml b/conf/cmi/core.entity_view_display.media.file.media_library.yml
index f84b0f02..6aca38b1 100644
--- a/conf/cmi/core.entity_view_display.media.file.media_library.yml
+++ b/conf/cmi/core.entity_view_display.media.file.media_library.yml
@@ -10,7 +10,7 @@ dependencies:
module:
- image
_core:
- default_config_hash: yHkqxsBlN9eCZF8Nou1B9HEiZbF0JrCZWxpBMaHIj7E
+ default_config_hash: 5EJMyp2xv5WssrIWMB9S3x4dgQM5S55hAHjmMeZXQqI
id: media.file.media_library
targetEntityType: media
bundle: file
diff --git a/conf/cmi/core.entity_view_display.media.image.default.yml b/conf/cmi/core.entity_view_display.media.image.default.yml
index bbf3ce66..95966abd 100644
--- a/conf/cmi/core.entity_view_display.media.image.default.yml
+++ b/conf/cmi/core.entity_view_display.media.image.default.yml
@@ -10,7 +10,7 @@ dependencies:
module:
- image
_core:
- default_config_hash: in_XCvnpxCs_Bfi1xBUEGLq1TwGghNZOnnJsyyeWqQE
+ default_config_hash: KH58kRvqbHk5S2FzcEOu1SXfBx587AEtktvTDOEp17k
id: media.image.default
targetEntityType: media
bundle: image
diff --git a/conf/cmi/core.entity_view_display.media.image.image.yml b/conf/cmi/core.entity_view_display.media.image.image.yml
index 2e2565c3..81084d47 100644
--- a/conf/cmi/core.entity_view_display.media.image.image.yml
+++ b/conf/cmi/core.entity_view_display.media.image.image.yml
@@ -11,7 +11,7 @@ dependencies:
module:
- responsive_image
_core:
- default_config_hash: wdX63yVbYS8fYfKSEdSMocu8z7Qep0ykcBTiFZfJLpI
+ default_config_hash: bwhS_zSf5sFH12_PlhJrKLJ-kSvuUI_5V3YHwS5A0sM
id: media.image.image
targetEntityType: media
bundle: image
diff --git a/conf/cmi/core.entity_view_display.media.image.media_library.yml b/conf/cmi/core.entity_view_display.media.image.media_library.yml
index d46c8423..e67064ce 100644
--- a/conf/cmi/core.entity_view_display.media.image.media_library.yml
+++ b/conf/cmi/core.entity_view_display.media.image.media_library.yml
@@ -11,7 +11,7 @@ dependencies:
module:
- image
_core:
- default_config_hash: tIr0c3VKCjIEwona_CNdAizKfL6Ila8H7tXqFA3IsOU
+ default_config_hash: 1TB-RghsNkJMtH5f31w2WE6YuMXWk9jvDipHKDfv4Jk
id: media.image.media_library
targetEntityType: media
bundle: image
diff --git a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml
index 3c6278f9..2acad1f3 100644
--- a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml
+++ b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml
@@ -15,6 +15,8 @@ dependencies:
module:
- options
- text
+_core:
+ default_config_hash: dMZ_8jKpOaA7CkuxlB2baa1apQcQ_vFlXM04jq4bqQY
id: paragraph.event_list.default
targetEntityType: paragraph
bundle: event_list
@@ -84,4 +86,3 @@ content:
region: content
hidden:
field_api_url: true
- field_load_more: true
diff --git a/conf/cmi/field.field.media.file.field_media_file.yml b/conf/cmi/field.field.media.file.field_media_file.yml
index ef8eb999..09c9f5d7 100644
--- a/conf/cmi/field.field.media.file.field_media_file.yml
+++ b/conf/cmi/field.field.media.file.field_media_file.yml
@@ -8,7 +8,7 @@ dependencies:
module:
- file
_core:
- default_config_hash: MGPZP_ILmtxTXuDm5AM6F5LncCv2HOsZOjBWNb_1JZ0
+ default_config_hash: tbQBN7Wysi_LBf7nY27B36duCI9IYPDydIRf_KP5qvY
id: media.file.field_media_file
field_name: field_media_file
entity_type: media
diff --git a/conf/cmi/field.field.media.image.field_media_image.yml b/conf/cmi/field.field.media.image.field_media_image.yml
index 9141545f..f3667c2f 100644
--- a/conf/cmi/field.field.media.image.field_media_image.yml
+++ b/conf/cmi/field.field.media.image.field_media_image.yml
@@ -15,7 +15,7 @@ third_party_settings:
title: title
file: '0'
_core:
- default_config_hash: fmlnh5VWRobLBxFZVcdtGoVBXeWcn_qqx7Daj0_2hI0
+ default_config_hash: ey2E4vPs6v0OHpJwtAyInKn8XaolkmyLYn0sWzjRJ7A
id: media.image.field_media_image
field_name: field_media_image
entity_type: media
diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
index 0dc3bfd5..78a0e892 100644
--- a/conf/cmi/field.field.node.landing_page.field_content.yml
+++ b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -57,10 +57,10 @@ settings:
phasing: phasing
popular_services: popular_services
target_group_links: target_group_links
+ hearings: hearings
unit_search: unit_search
service_list: service_list
service_list_search: service_list_search
- hearings: hearings
negate: 0
target_bundles_drag_drop:
banner:
diff --git a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
index 8c3aa21c..ad6231c7 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
@@ -8,7 +8,7 @@ dependencies:
module:
- link
_core:
- default_config_hash: lGeClo15Zf7kvOo9oZobBROAy8-TnAFRtIwnSvDIArY
+ default_config_hash: Y-6hGxIpid7_ScRXE2GozslolF7R3tkTNiJFFaLEw4Y
id: paragraph.event_list.field_api_url
field_name: field_api_url
entity_type: paragraph
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_count.yml b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml
index d40c8749..2041e041 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_event_count.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml
@@ -7,6 +7,8 @@ dependencies:
- paragraphs.paragraphs_type.event_list
module:
- options
+_core:
+ default_config_hash: 6AMaHxUxptC9tDiCGTiCpFWXBHfR4tUUSdMY9Q5BD6Q
id: paragraph.event_list.field_event_count
field_name: field_event_count
entity_type: paragraph
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
index d33bf246..e3c1e964 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
@@ -5,6 +5,10 @@ dependencies:
config:
- field.storage.paragraph.field_event_list_description
- paragraphs.paragraphs_type.event_list
+ module:
+ - text
+_core:
+ default_config_hash: oPuSy256H3spbbctja0gZ-kBYwVQNKt-K6vBYmtoJlo
id: paragraph.event_list.field_event_list_description
field_name: field_event_list_description
entity_type: paragraph
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_list_title.yml b/conf/cmi/field.field.paragraph.event_list.field_event_list_title.yml
index 51e95305..4144dec6 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_event_list_title.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_event_list_title.yml
@@ -6,7 +6,7 @@ dependencies:
- field.storage.paragraph.field_event_list_title
- paragraphs.paragraphs_type.event_list
_core:
- default_config_hash: uB2i15UibWJ0pcAIh5PjKDoPfEpaGZ4uyD3FSBh-a1Q
+ default_config_hash: YtZI3MFPiwRz3HS_ODT2W5QE2B2zp66zUg_lkae9g04
id: paragraph.event_list.field_event_list_title
field_name: field_event_list_title
entity_type: paragraph
diff --git a/conf/cmi/field.field.paragraph.event_list.field_load_more.yml b/conf/cmi/field.field.paragraph.event_list.field_load_more.yml
deleted file mode 100644
index c02ca436..00000000
--- a/conf/cmi/field.field.paragraph.event_list.field_load_more.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 25468e03-6f4c-4b5c-b619-f92681a7307e
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.paragraph.field_load_more
- - paragraphs.paragraphs_type.event_list
-_core:
- default_config_hash: f7uvTDx_Sw-4P3jqDPmYSK3pL1_yd4JtZFXqfrRXwDM
-id: paragraph.event_list.field_load_more
-field_name: field_load_more
-entity_type: paragraph
-bundle: event_list
-label: 'Load more'
-description: 'Show load more -button at the bottom of the list.'
-required: false
-translatable: false
-default_value:
- -
- value: 1
-default_value_callback: ''
-settings:
- on_label: 'On'
- off_label: 'Off'
-field_type: boolean
diff --git a/conf/cmi/field.field.paragraph.phasing.field_phasing_item.yml b/conf/cmi/field.field.paragraph.phasing.field_phasing_item.yml
index d0eba842..b15ee15d 100644
--- a/conf/cmi/field.field.paragraph.phasing.field_phasing_item.yml
+++ b/conf/cmi/field.field.paragraph.phasing.field_phasing_item.yml
@@ -9,7 +9,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: OTsGV_59l_hoG4pPwa4NOFiR0nrv7j3iu9ErgLB1BZY
+ default_config_hash: j9vXfG4WtTJEuXDEXQawwjoMBldaY-cXXWRdb8KH9SE
id: paragraph.phasing.field_phasing_item
field_name: field_phasing_item
entity_type: paragraph
diff --git a/conf/cmi/field.field.paragraph.phasing.field_show_phase_numbers.yml b/conf/cmi/field.field.paragraph.phasing.field_show_phase_numbers.yml
index 3d2fc139..db192ba9 100644
--- a/conf/cmi/field.field.paragraph.phasing.field_show_phase_numbers.yml
+++ b/conf/cmi/field.field.paragraph.phasing.field_show_phase_numbers.yml
@@ -6,7 +6,7 @@ dependencies:
- field.storage.paragraph.field_show_phase_numbers
- paragraphs.paragraphs_type.phasing
_core:
- default_config_hash: QfUIGnsQrMlJ3FapMiG5pWo99cMyYNhO4asvnzSBRw0
+ default_config_hash: vRDcTxBYT2IaBCzFycJac7bbk2kSY5cabGnoZ1hrVW4
id: paragraph.phasing.field_show_phase_numbers
field_name: field_show_phase_numbers
entity_type: paragraph
@@ -20,6 +20,6 @@ default_value:
value: 0
default_value_callback: ''
settings:
- on_label: Käytössä
- off_label: 'Pois päältä'
+ on_label: 'Yes'
+ off_label: 'No'
field_type: boolean
diff --git a/conf/cmi/field.field.paragraph.phasing_item.field_description.yml b/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
index f41fda6c..96100db7 100644
--- a/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
+++ b/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
@@ -13,7 +13,7 @@ third_party_settings:
allowed_formats:
- minimal
_core:
- default_config_hash: yaQCIyGcgu2Tqe21GcXwcnBdE_hkxj_zuqFvF25JrQc
+ default_config_hash: R3xpZBQW6GkrWie9LRvO70PI9g5nYvm4VLVJ0ZFNmDY
id: paragraph.phasing_item.field_description
field_name: field_description
entity_type: paragraph
diff --git a/conf/cmi/field.field.paragraph.popular_services.field_service_items.yml b/conf/cmi/field.field.paragraph.popular_services.field_service_items.yml
index e53e87b9..4a152e9e 100644
--- a/conf/cmi/field.field.paragraph.popular_services.field_service_items.yml
+++ b/conf/cmi/field.field.paragraph.popular_services.field_service_items.yml
@@ -9,7 +9,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: CKBAqZLhH7NPdYAd8slbfxF_oRCcDykEhCHy7D8vxjA
+ default_config_hash: qTYm0oKa6o6y-wT_dXGAcVv6ChPrGltXGrpRXuqL7_I
id: paragraph.popular_services.field_service_items
field_name: field_service_items
entity_type: paragraph
diff --git a/conf/cmi/field.storage.media.field_media_image.yml b/conf/cmi/field.storage.media.field_media_image.yml
index 31b2a6fc..05cd4f6c 100644
--- a/conf/cmi/field.storage.media.field_media_image.yml
+++ b/conf/cmi/field.storage.media.field_media_image.yml
@@ -7,7 +7,7 @@ dependencies:
- image
- media
_core:
- default_config_hash: 24BCckkDO8WPYuWP-5Hz6VjlxJN_Bd6mvrTQrZiRxbs
+ default_config_hash: qtrsOGvJ2v_3m7oOVdW72qSNB-ooDXrPEWFbJmihnD0
id: media.field_media_image
field_name: field_media_image
entity_type: media
diff --git a/conf/cmi/field.storage.media.field_media_oembed_video.yml b/conf/cmi/field.storage.media.field_media_oembed_video.yml
index ba9b5388..0b4bcca8 100644
--- a/conf/cmi/field.storage.media.field_media_oembed_video.yml
+++ b/conf/cmi/field.storage.media.field_media_oembed_video.yml
@@ -5,7 +5,7 @@ dependencies:
module:
- media
_core:
- default_config_hash: SJgxR5XWOesQbEKqp8VgInPyJjCFU_t2pi7UzYB78xg
+ default_config_hash: cNf_852Dq-fNnSaMI4LxL-J6N7bLkHuDbD9EUqOn4_U
id: media.field_media_oembed_video
field_name: field_media_oembed_video
entity_type: media
diff --git a/conf/cmi/field.storage.media.field_photographer.yml b/conf/cmi/field.storage.media.field_photographer.yml
index 763084dd..503362d5 100644
--- a/conf/cmi/field.storage.media.field_photographer.yml
+++ b/conf/cmi/field.storage.media.field_photographer.yml
@@ -5,7 +5,7 @@ dependencies:
module:
- media
_core:
- default_config_hash: 8Z0eiVit80ouZV9CZXXe4h7P6SnIaIJnWjN1HRrSj8A
+ default_config_hash: XhAv2_bHVk7jzaAbzP4SHkvVHDG0Xsy5ItNLgSXkHcE
id: media.field_photographer
field_name: field_photographer
entity_type: media
diff --git a/conf/cmi/field.storage.paragraph.field_api_url.yml b/conf/cmi/field.storage.paragraph.field_api_url.yml
index b27825c5..3f63ce91 100644
--- a/conf/cmi/field.storage.paragraph.field_api_url.yml
+++ b/conf/cmi/field.storage.paragraph.field_api_url.yml
@@ -6,7 +6,7 @@ dependencies:
- link
- paragraphs
_core:
- default_config_hash: 51_U0q_ZRkzJI7CM6e-IfQjlpG0EZ6HCo2z3ETeQgE8
+ default_config_hash: 15a2QmfffR33UXmxDvkHEN7LpCrI4xTdCDyDJ-pna5I
id: paragraph.field_api_url
field_name: field_api_url
entity_type: paragraph
diff --git a/conf/cmi/field.storage.paragraph.field_event_list_description.yml b/conf/cmi/field.storage.paragraph.field_event_list_description.yml
index e8a1b967..b1ca8ddf 100644
--- a/conf/cmi/field.storage.paragraph.field_event_list_description.yml
+++ b/conf/cmi/field.storage.paragraph.field_event_list_description.yml
@@ -6,7 +6,7 @@ dependencies:
- paragraphs
- text
_core:
- default_config_hash: XT3rdLmDpDOSog8-dJ5PcIVRB8LbZ_uzZeRTU-anZS0
+ default_config_hash: O1iPiA9_ifYbXRj2_Yf1s6fiFDHiaxqs71MDvuzheMQ
id: paragraph.field_event_list_description
field_name: field_event_list_description
entity_type: paragraph
diff --git a/conf/cmi/field.storage.paragraph.field_event_list_title.yml b/conf/cmi/field.storage.paragraph.field_event_list_title.yml
index f4a513c8..50d2a44b 100644
--- a/conf/cmi/field.storage.paragraph.field_event_list_title.yml
+++ b/conf/cmi/field.storage.paragraph.field_event_list_title.yml
@@ -5,7 +5,7 @@ dependencies:
module:
- paragraphs
_core:
- default_config_hash: 7-99kJ5z0R9O67TSmgkU34HhwloQMhPUZbhVAlbHiv0
+ default_config_hash: OwiT8ZGCn9OBU10vF7-dKTnGU2rJoyIxzXaQqYubNtQ
id: paragraph.field_event_list_title
field_name: field_event_list_title
entity_type: paragraph
diff --git a/conf/cmi/field.storage.paragraph.field_load_more.yml b/conf/cmi/field.storage.paragraph.field_load_more.yml
deleted file mode 100644
index 693c90c2..00000000
--- a/conf/cmi/field.storage.paragraph.field_load_more.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 776fafd9-c109-451b-8237-419c378e7a5a
-langcode: en
-status: true
-dependencies:
- module:
- - paragraphs
-_core:
- default_config_hash: bb9G-LlJAQr-rj_bws_n2DyIAS2sG4eJdq34HNJ-pA8
-id: paragraph.field_load_more
-field_name: field_load_more
-entity_type: paragraph
-type: boolean
-settings: { }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/conf/cmi/field.storage.paragraph.field_remote_events.yml b/conf/cmi/field.storage.paragraph.field_remote_events.yml
index 3474a3a2..f15cca47 100644
--- a/conf/cmi/field.storage.paragraph.field_remote_events.yml
+++ b/conf/cmi/field.storage.paragraph.field_remote_events.yml
@@ -4,6 +4,8 @@ status: true
dependencies:
module:
- paragraphs
+_core:
+ default_config_hash: 6cFoYiYWY2E057QJBuHDjkuiifNRl-Bqkt9Zr9c1Zvc
id: paragraph.field_remote_events
field_name: field_remote_events
entity_type: paragraph
diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
index f9bb39c2..8e8b3b31 100644
--- a/conf/cmi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -1,8 +1,10 @@
+_core:
+ default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8
langcode: en
+path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
site_settings:
default_icon: star-fill
theme_color: gold
koro: vibration
footer_settings:
footer_color: dark
-path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
diff --git a/conf/cmi/language/fi/core.base_field_override.node.announcement.promote.yml b/conf/cmi/language/fi/core.base_field_override.node.announcement.promote.yml
index 6fb685e0..a29359aa 100644
--- a/conf/cmi/language/fi/core.base_field_override.node.announcement.promote.yml
+++ b/conf/cmi/language/fi/core.base_field_override.node.announcement.promote.yml
@@ -1,4 +1,4 @@
label: 'Näytetään etusivulla'
settings:
- on_label: Käytössä
- off_label: 'Pois päältä'
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/core.base_field_override.node.announcement.status.yml b/conf/cmi/language/fi/core.base_field_override.node.announcement.status.yml
new file mode 100644
index 00000000..b939375b
--- /dev/null
+++ b/conf/cmi/language/fi/core.base_field_override.node.announcement.status.yml
@@ -0,0 +1,4 @@
+label: Julkaistu
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/core.base_field_override.node.announcement.title.yml b/conf/cmi/language/fi/core.base_field_override.node.announcement.title.yml
new file mode 100644
index 00000000..011152e7
--- /dev/null
+++ b/conf/cmi/language/fi/core.base_field_override.node.announcement.title.yml
@@ -0,0 +1 @@
+label: 'Ylläpidollinen otsikko'
diff --git a/conf/cmi/language/fi/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/language/fi/core.base_field_override.node.landing_page.promote.yml
index 6fb685e0..a29359aa 100644
--- a/conf/cmi/language/fi/core.base_field_override.node.landing_page.promote.yml
+++ b/conf/cmi/language/fi/core.base_field_override.node.landing_page.promote.yml
@@ -1,4 +1,4 @@
label: 'Näytetään etusivulla'
settings:
- on_label: Käytössä
- off_label: 'Pois päältä'
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/core.base_field_override.node.landing_page.status.yml b/conf/cmi/language/fi/core.base_field_override.node.landing_page.status.yml
new file mode 100644
index 00000000..b939375b
--- /dev/null
+++ b/conf/cmi/language/fi/core.base_field_override.node.landing_page.status.yml
@@ -0,0 +1,4 @@
+label: Julkaistu
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/core.base_field_override.node.page.promote.yml b/conf/cmi/language/fi/core.base_field_override.node.page.promote.yml
index 6fb685e0..a29359aa 100644
--- a/conf/cmi/language/fi/core.base_field_override.node.page.promote.yml
+++ b/conf/cmi/language/fi/core.base_field_override.node.page.promote.yml
@@ -1,4 +1,4 @@
label: 'Näytetään etusivulla'
settings:
- on_label: Käytössä
- off_label: 'Pois päältä'
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/core.base_field_override.node.page.status.yml b/conf/cmi/language/fi/core.base_field_override.node.page.status.yml
new file mode 100644
index 00000000..b939375b
--- /dev/null
+++ b/conf/cmi/language/fi/core.base_field_override.node.page.status.yml
@@ -0,0 +1,4 @@
+label: Julkaistu
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
index e24fe262..35877bec 100644
--- a/conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
+++ b/conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
@@ -2,8 +2,6 @@ content:
errand_services:
settings:
sort_order:
- ESERVICE:
- label: E-service
CHAT:
label: Chat
EMAIL:
@@ -12,15 +10,3 @@ content:
label: Puhelin
PRINTABLE_FORM:
label: Lomake
- LOCAL:
- label: 'Local service'
- SMS:
- label: SMS
- WEBPAGE:
- label: Webpage
- MAIL:
- label: 'Postal mail'
- TELEFAX:
- label: Telefax
- OFFICE:
- label: Palvelupiste
diff --git a/conf/cmi/language/fi/field.field.node.announcement.field_announcement_all_pages.yml b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_all_pages.yml
index a9c158d1..b053189d 100644
--- a/conf/cmi/language/fi/field.field.node.announcement.field_announcement_all_pages.yml
+++ b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_all_pages.yml
@@ -1,4 +1,4 @@
label: 'Näytä kaikilla sivuilla'
settings:
- on_label: Käytössä
- off_label: 'Pois päältä'
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.node.page.field_lead_in.yml b/conf/cmi/language/fi/field.field.node.page.field_lead_in.yml
index c5298fa3..ee914613 100644
--- a/conf/cmi/language/fi/field.field.node.page.field_lead_in.yml
+++ b/conf/cmi/language/fi/field.field.node.page.field_lead_in.yml
@@ -1,2 +1,2 @@
-description: 'Ingressi näkyy sisältösivulla sekä nostoissa, hakutuloksissa ja sosiaalisen median jaoissa.'
label: Ingressi
+description: 'Ingressi näkyy sisältösivulla sekä nostoissa, hakutuloksissa ja sosiaalisen median jaoissa.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
index 9cc3d0cd..5808b45f 100644
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
@@ -1,2 +1,5 @@
label: Tapahtumapaikka
description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa.'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml
index cadd9471..3f52ae7e 100644
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_time.yml
@@ -1,2 +1,5 @@
label: Ajankohta
description: 'Näytä "ajankohta" -suodatin.'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml
index d0e4ed97..09c1dd4f 100644
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_free_events.yml
@@ -1,2 +1,5 @@
label: 'Maksuttomat tapahtumat'
description: 'Näytä "näytä vain maksuttomat tapahtumat" -suodatin.'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_load_more.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_load_more.yml
deleted file mode 100644
index 20a19ee6..00000000
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_load_more.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Lataa lisää'
-description: "Määrittää, näytetäänkö listauksen lopussa 'Lataa lisää' -nappi."
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml
index 99f041ab..e9e1fb81 100644
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml
@@ -1,2 +1,5 @@
label: Etätapahtumat
description: 'Näytä "näytä vain etätapahtumat" -suodatin. Älä käytä yhtä aikaa "Tapahtumapaikka" -suodattimen kanssa.'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.phasing.field_phasing_item_title_level.yml b/conf/cmi/language/fi/field.field.paragraph.phasing.field_phasing_item_title_level.yml
index 59129911..9501dac8 100644
--- a/conf/cmi/language/fi/field.field.paragraph.phasing.field_phasing_item_title_level.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.phasing.field_phasing_item_title_level.yml
@@ -1,2 +1,2 @@
-label: 'Vaiheen otsikkotaso'
description: 'Otsikkotason tulee olla yksi alempi kuin paragraafin. Jos paragraafille ei tule otsikkoa, valitse h2.'
+label: 'Vaiheen otsikkotaso'
diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_title.yml b/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_title.yml
new file mode 100644
index 00000000..f02d7516
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_title.yml
@@ -0,0 +1 @@
+label: Otsikko
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml
index 4ec927ba..12bfee39 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml
@@ -1 +1,4 @@
label: 'Näytä katuosoite'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml
index cea1720e..3707affe 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml
@@ -1 +1,4 @@
label: 'Näytä lisätiedot'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml
index d7e060bc..5fa40ed0 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml
@@ -1 +1,4 @@
label: 'Näytä linkki toimipistesivulle'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml
index 9c558e5b..0dd623cb 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml
@@ -1 +1,4 @@
label: 'Näytä aukioloajat'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml
index 7ced463e..4ed65206 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml
@@ -1 +1,4 @@
label: 'Suosi ylikirjoituskuvaa'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml
index e2d3e1b5..d9d10ca6 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml
@@ -1 +1,4 @@
label: 'Näytä puhelinnumero'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml
index eae45b58..8e6291e4 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml
@@ -1 +1,4 @@
label: 'Näytä kuva'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml
index ee9ef69e..5ead2f7e 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml
@@ -1 +1,4 @@
label: 'Näytä postiosoite'
+settings:
+ on_label: Kyllä
+ off_label: Ei
diff --git a/conf/cmi/language/fi/views.view.content.yml b/conf/cmi/language/fi/views.view.content.yml
index f9f7edeb..8af41c22 100644
--- a/conf/cmi/language/fi/views.view.content.yml
+++ b/conf/cmi/language/fi/views.view.content.yml
@@ -4,12 +4,10 @@ display:
fields:
langcode:
label: Kieli
- separator: ', '
title:
label: Otsikko
type:
label: Sisältötyyppi
- separator: ', '
name:
label: Kirjoittaja
status:
@@ -54,8 +52,6 @@ display:
group_items:
1:
title: Julkaistu
- 2:
- title: Julkaisematon
langcode:
expose:
label: Kieli
diff --git a/conf/cmi/language/fi/views.view.er_tpr_unit.yml b/conf/cmi/language/fi/views.view.er_tpr_unit.yml
index 95724063..2d291e0a 100644
--- a/conf/cmi/language/fi/views.view.er_tpr_unit.yml
+++ b/conf/cmi/language/fi/views.view.er_tpr_unit.yml
@@ -3,8 +3,7 @@ display:
display_title: Oletus
display_options:
fields:
- name:
- separator: ', '
+ name: { }
pager:
options:
tags:
@@ -13,7 +12,6 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
exposed_form:
options:
submit_button: Käytä
@@ -24,7 +22,8 @@ display:
empty:
area:
content:
- value: "Ei tuloksia
\r\n"
+ value: 'Ei tuloksia
'
+ format: full_html
arguments:
id:
exception:
@@ -33,9 +32,6 @@ display:
display_title: Entiteettiviittaus
display_options:
fields:
- name_override:
- separator: ', '
- id:
- separator: ', '
- name:
- separator: ', '
+ name_override: { }
+ id: { }
+ name: { }
diff --git a/conf/cmi/language/fi/views.view.locked_services.yml b/conf/cmi/language/fi/views.view.locked_services.yml
index fed2e9cc..2608524d 100644
--- a/conf/cmi/language/fi/views.view.locked_services.yml
+++ b/conf/cmi/language/fi/views.view.locked_services.yml
@@ -4,13 +4,31 @@ display:
display_title: Oletus
display_options:
title: 'Lukitut palvelut'
+ fields:
+ tpr_service_bulk_form:
+ label: Massapäivitys
+ action_title: Toiminto
+ name:
+ label: Otsikko
+ name_1:
+ label: 'Lukituksen tekijä'
+ timestamp:
+ label: 'Lukituksen ajankohta'
+ langcode:
+ label: 'Sisällön kieli'
+ operations:
+ label: Toimenpiteet
pager:
options:
- tags: { }
+ tags:
+ next: 'Seuraava ›'
+ previous: '‹ Edellinen'
+ first: '« Ensimmäinen'
+ last: 'Viimeinen »'
expose: { }
exposed_form:
options:
- submit_button: Käytä
+ submit_button: Suodata
exposed_sorts_label: Järjestä
sort_asc_label: Nouseva
sort_desc_label: Laskeva
@@ -21,19 +39,4 @@ display:
name:
expose:
label: Otsikko
- fields:
- tpr_service_bulk_form:
- label: Bulkkipäivitys
- action_title: Toiminto
- name:
- label: Otsikko
- name_1:
- label: 'Lukituksen tekijä'
- timestamp:
- label: 'Lukituksen ajankohta'
- langcode:
- label: 'Sisällön kieli'
- operations:
- label: Toiminnot
- locked_services_block:
- display_title: Lohko
+ locked_services_block: { }
diff --git a/conf/cmi/language/fi/views.view.locked_units.yml b/conf/cmi/language/fi/views.view.locked_units.yml
index f20bc8c1..8b6560f4 100644
--- a/conf/cmi/language/fi/views.view.locked_units.yml
+++ b/conf/cmi/language/fi/views.view.locked_units.yml
@@ -4,24 +4,9 @@ display:
display_title: Oletus
display_options:
title: 'Lukitut toimipisteet'
- pager:
- options:
- tags: { }
- expose: { }
- exposed_form:
- options:
- submit_button: Käytä
- reset_button_label: Palauta
- exposed_sorts_label: Järjestä
- sort_asc_label: Nouseva
- sort_desc_label: Laskeva
- filters:
- name:
- expose:
- label: Otsikko
fields:
tpr_unit_bulk_form:
- label: Bulkkipäivitys
+ label: Massapäivitys
action_title: Toiminto
name:
label: Otsikko
@@ -32,9 +17,30 @@ display:
langcode:
label: 'Sisällön kieli'
operations:
- label: Toiminnot
+ label: Toimenpiteet
+ pager:
+ options:
+ tags:
+ next: 'Seuraava ›'
+ previous: '‹ Edellinen'
+ first: '« Ensimmäinen'
+ last: 'Viimeinen »'
+ expose:
+ items_per_page_label: 'Merkintöjä sivua kohti'
+ items_per_page_options_all_label: '- Kaikki -'
+ exposed_form:
+ options:
+ submit_button: Käytä
+ reset_button_label: Palauta
+ exposed_sorts_label: Lajittele
+ sort_asc_label: Nousevasti
+ sort_desc_label: Laskevasti
empty:
area_text_custom:
content: 'Lukittuja toimipisteitä ei ole.'
+ filters:
+ name:
+ expose:
+ label: Otsikko
locked_units_block:
display_title: Lohko
diff --git a/conf/cmi/language/fi/views.view.media.yml b/conf/cmi/language/fi/views.view.media.yml
index 4e324388..99e6fb59 100644
--- a/conf/cmi/language/fi/views.view.media.yml
+++ b/conf/cmi/language/fi/views.view.media.yml
@@ -1,34 +1,26 @@
-label: Media
description: 'Etsi ja ylläpidä mediatiedostoja.'
display:
default:
display_title: Oletus
display_options:
- title: Media
fields:
media_bulk_form:
action_title: Toiminto
thumbnail__target_id:
label: Pienoiskuva
- separator: ', '
name:
label: 'Mediatiedoston nimi'
- separator: ', '
bundle:
label: Tyyppi
- separator: ', '
uid:
label: Kirjoittaja
- separator: ', '
status:
label: Tila
settings:
format_custom_false: Julkaisematon
format_custom_true: Julkaistu
- separator: ', '
changed:
label: Päivitetty
- separator: ', '
operations:
label: Toimenpiteet
pager:
@@ -41,7 +33,6 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
exposed_form:
options:
submit_button: Suodata
@@ -51,7 +42,7 @@ display:
sort_desc_label: Laskevasti
empty:
area_text_custom:
- content: 'Ei mediatiedostoja saatavilla.'
+ content: 'Mediatiedostoja ei ole saatavilla.'
filters:
name:
expose:
@@ -62,6 +53,7 @@ display:
status:
expose:
label: Tosi
+ description: ''
group_info:
label: Julkaisutila
group_items:
@@ -73,7 +65,5 @@ display:
expose:
label: Kieli
media_page_list:
- display_title: Media
display_options:
- menu:
- title: Media
+ menu: { }
diff --git a/conf/cmi/language/fi/views.view.media_library.yml b/conf/cmi/language/fi/views.view.media_library.yml
index bc50fbca..3393d007 100644
--- a/conf/cmi/language/fi/views.view.media_library.yml
+++ b/conf/cmi/language/fi/views.view.media_library.yml
@@ -4,7 +4,6 @@ display:
default:
display_title: Oletus
display_options:
- title: Media
fields:
media_bulk_form:
action_title: Toiminto
@@ -16,7 +15,6 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
exposed_form:
options:
submit_button: 'Suodata tuloksia'
@@ -63,8 +61,6 @@ display:
fields:
media_bulk_form:
action_title: Toiminto
- name:
- separator: ', '
edit_media:
alter:
text: 'Muokkaa {{ name }}'
diff --git a/conf/cmi/language/fi/views.view.service_list.yml b/conf/cmi/language/fi/views.view.service_list.yml
index 88839304..0f549355 100644
--- a/conf/cmi/language/fi/views.view.service_list.yml
+++ b/conf/cmi/language/fi/views.view.service_list.yml
@@ -1,14 +1,10 @@
+label: Palvelulistaus
display:
default:
- display_title: Isäntä
+ display_title: Oletus
display_options:
- exposed_form:
- options:
- submit_button: Käytä
- reset_button_label: Palauta
- exposed_sorts_label: Lajittele
- sort_asc_label: Nousevasti
- sort_desc_label: Laskevasti
+ fields:
+ name: { }
pager:
options:
tags:
@@ -19,23 +15,61 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
+ exposed_form:
+ options:
+ submit_button: Käytä
+ reset_button_label: Palauta
+ exposed_sorts_label: Lajittele
+ sort_asc_label: Nousevasti
+ sort_desc_label: Laskevasti
+ empty:
+ area:
+ content:
+ value: 'Ei tuloksia
'
+ format: full_html
arguments:
id:
exception:
title: Kaikki
+ block: { }
block_search:
display_options:
- exposed_form:
- options:
- submit_button: Etsi
+ fields:
+ name: { }
+ name_synonyms: { }
+ description__summary: { }
+ name_override: { }
pager:
options:
tags:
- previous: Edellinen
next: Seuraava
+ previous: Edellinen
+ first: Ensimmäinen
+ last: Viimeinen
+ expose:
+ items_per_page_label: 'Merkintöjä sivua kohti'
+ items_per_page_options_all_label: '- Kaikki -'
+ exposed_form:
+ options:
+ submit_button: Etsi
+ reset_button_label: Palauta
+ exposed_sorts_label: Lajittele
+ sort_asc_label: Nousevasti
+ sort_desc_label: Laskevasti
+ arguments:
+ id_or_service_id:
+ exception:
+ title: Kaikki
filters:
combine:
expose:
label: 'Neuvontapalvelun nimi tai hakusana'
placeholder: 'Esim. Sosiaalineuvonta, terveys tai digi'
+ title: Palveluluettelohaku
+ entity_reference_1:
+ display_title: Entiteettiviittaus
+ display_options:
+ fields:
+ name_override: { }
+ id: { }
+ name: { }
diff --git a/conf/cmi/language/fi/views.view.service_units.yml b/conf/cmi/language/fi/views.view.service_units.yml
index bab9bbd2..562863ea 100644
--- a/conf/cmi/language/fi/views.view.service_units.yml
+++ b/conf/cmi/language/fi/views.view.service_units.yml
@@ -2,13 +2,8 @@ display:
default:
display_title: Oletus
display_options:
- exposed_form:
- options:
- submit_button: Käytä
- reset_button_label: Palauta
- exposed_sorts_label: Järjestä
- sort_asc_label: Nouseva
- sort_desc_label: Laskeva
+ fields:
+ name: { }
pager:
options:
tags:
@@ -17,15 +12,17 @@ display:
first: Ensimmäinen
last: Viimeinen
expose:
- items_per_page_label: 'Kohteita sivulla'
+ items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
- fields:
- name:
- separator: ', '
+ exposed_form:
+ options:
+ submit_button: Käytä
+ reset_button_label: Palauta
+ exposed_sorts_label: Lajittele
+ sort_asc_label: Nousevasti
+ sort_desc_label: Laskevasti
arguments:
id:
exception:
title: Kaikki
- service_units:
- display_title: Lohko
+ service_units: { }
diff --git a/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml b/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml
index 061bc180..1cab5985 100644
--- a/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml
+++ b/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml
@@ -20,29 +20,21 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
fields:
tpr_errand_service_bulk_form:
label: Massapäivitys
action_title: Toiminto
- id:
- label: ID
- separator: ', '
name:
label: Nimi
- separator: ', '
langcode:
label: Kieli
- separator: ', '
content_translation_status:
label: Tila
settings:
format_custom_true: Julkaistu
format_custom_false: Julkaisematon
- separator: ', '
content_translation_changed:
label: Päivitetty
- separator: ', '
operations:
label: Toimenpiteet
filters:
@@ -60,5 +52,6 @@ display:
area:
content:
value: 'Ei tuloksia.'
+ format: plain_text
page_1:
display_title: Sivu
diff --git a/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml b/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml
index 11a52b67..239029d7 100644
--- a/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml
+++ b/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml
@@ -20,29 +20,21 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
fields:
tpr_service_channel_bulk_form:
label: Massapäivitys
action_title: Toiminto
- id:
- label: ID
- separator: ', '
name:
label: Nimi
- separator: ', '
langcode:
label: Kieli
- separator: ', '
content_translation_status:
label: Tila
settings:
format_custom_true: Julkaistu
format_custom_false: Julkaisematon
- separator: ', '
content_translation_changed:
label: Päivitetty
- separator: ', '
operations:
label: Toimenpiteet
filters:
@@ -60,5 +52,6 @@ display:
area:
content:
value: 'Ei tuloksia.'
+ format: plain_text
page_1:
display_title: Sivu
diff --git a/conf/cmi/language/fi/views.view.tpr_service_list.yml b/conf/cmi/language/fi/views.view.tpr_service_list.yml
index fa4337da..5f1c0586 100644
--- a/conf/cmi/language/fi/views.view.tpr_service_list.yml
+++ b/conf/cmi/language/fi/views.view.tpr_service_list.yml
@@ -20,29 +20,21 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
fields:
tpr_service_bulk_form:
label: Massapäivitys
action_title: Toiminto
- id:
- label: ID
- separator: ', '
name:
label: Nimi
- separator: ', '
langcode:
label: Kieli
- separator: ', '
content_translation_status:
label: Tila
settings:
format_custom_true: Julkaistu
format_custom_false: Julkaisematon
- separator: ', '
content_translation_changed:
label: Päivitetty
- separator: ', '
operations:
label: Toimenpiteet
filters:
@@ -60,5 +52,6 @@ display:
area:
content:
value: 'Ei tuloksia.'
+ format: plain_text
page_1:
display_title: Sivu
diff --git a/conf/cmi/language/fi/views.view.tpr_unit_list.yml b/conf/cmi/language/fi/views.view.tpr_unit_list.yml
index 3bc707ac..464d93e1 100644
--- a/conf/cmi/language/fi/views.view.tpr_unit_list.yml
+++ b/conf/cmi/language/fi/views.view.tpr_unit_list.yml
@@ -20,26 +20,18 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
fields:
- id:
- label: ID
- separator: ', '
name:
label: Nimi
- separator: ', '
langcode:
label: Kieli
- separator: ', '
content_translation_status:
label: Tila
settings:
format_custom_true: Julkaistu
format_custom_false: Julkaisematon
- separator: ', '
content_translation_changed:
label: Päivitetty
- separator: ', '
operations:
label: Toimenpiteet
filters:
@@ -57,5 +49,6 @@ display:
area:
content:
value: 'Ei tuloksia.'
+ format: plain_text
page_1:
display_title: Sivu
diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml
index 593ca3d3..3db501b9 100644
--- a/conf/cmi/language/fi/views.view.unit_search.yml
+++ b/conf/cmi/language/fi/views.view.unit_search.yml
@@ -4,21 +4,16 @@ display:
filters:
combine:
group_info:
- description: ''
label: 'Kentät yhdistävä suodatin'
+ description: ''
expose:
label: Etsi
- empty:
- area:
- content:
- value: "Ei tuloksia
\r\n"
- exposed_form:
- options:
- submit_button: Käytä
- reset_button_label: Palauta
- exposed_sorts_label: Järjestä
- sort_asc_label: Nouseva
- sort_desc_label: Laskeva
+ placeholder: 'Syötä toimipisteen nimi tai osoite'
+ fields:
+ name: { }
+ address__postal_code: { }
+ address__address_line1: { }
+ address__address_line2: { }
pager:
options:
tags:
@@ -29,7 +24,18 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
+ exposed_form:
+ options:
+ submit_button: Käytä
+ reset_button_label: Palauta
+ exposed_sorts_label: Järjestä
+ sort_asc_label: Nouseva
+ sort_desc_label: Laskeva
+ empty:
+ area:
+ content:
+ value: 'Ei tuloksia
'
+ format: full_html
arguments:
id:
exception:
@@ -39,4 +45,9 @@ display:
display_title: Lohko
entity_reference:
display_title: Entiteettiviittaus
+ display_options:
+ fields:
+ name_override: { }
+ id: { }
+ name: { }
label: Toimipistehaku
diff --git a/conf/cmi/language/fi/views.view.unit_services.yml b/conf/cmi/language/fi/views.view.unit_services.yml
index 49bf0164..1ab316ad 100644
--- a/conf/cmi/language/fi/views.view.unit_services.yml
+++ b/conf/cmi/language/fi/views.view.unit_services.yml
@@ -1,6 +1,5 @@
display:
default:
- display_title: Oletus
display_options:
exposed_form:
options:
@@ -9,14 +8,9 @@ display:
exposed_sorts_label: Lajittele
sort_asc_label: Nousevasti
sort_desc_label: Laskevasti
- pager:
- options:
- tags:
- next: Seuraava
- previous: Edellinen
- first: Ensimmäinen
- last: Viimeinen
- expose:
- items_per_page_label: 'Kohteita sivulla'
- items_per_page_options_all_label: '- Kaikki -'
- offset_label: Offset
+ arguments:
+ id:
+ exception:
+ title: Kaikki
+ display_title: Oletus
+ unit_services: { }
diff --git a/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml b/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml
index f7800f7f..3bc8a63c 100644
--- a/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.popular_services.field_popular_services_title.yml
@@ -1 +1,2 @@
+label: Titel
description: 'Om detta lämnas tomt, titel är "Populära tjänster"'
diff --git a/conf/cmi/language/sv/views.view.content.yml b/conf/cmi/language/sv/views.view.content.yml
index 6c6e6063..61393d4d 100644
--- a/conf/cmi/language/sv/views.view.content.yml
+++ b/conf/cmi/language/sv/views.view.content.yml
@@ -54,8 +54,6 @@ display:
group_items:
1:
title: Publicerad
- 2:
- title: 'Ej publicerad'
langcode:
expose:
label: Språk
diff --git a/conf/cmi/language/sv/views.view.er_tpr_unit.yml b/conf/cmi/language/sv/views.view.er_tpr_unit.yml
index 78ab74c6..7f3103c8 100644
--- a/conf/cmi/language/sv/views.view.er_tpr_unit.yml
+++ b/conf/cmi/language/sv/views.view.er_tpr_unit.yml
@@ -2,6 +2,15 @@ display:
default:
display_title: Förvald
display_options:
+ fields:
+ name: { }
+ pager:
+ options:
+ tags: { }
+ expose:
+ items_per_page_label: 'Inlägg per sida'
+ items_per_page_options_all_label: '- Alla -'
+ offset_label: Kompensera
exposed_form:
options:
submit_button: Verkställ
@@ -9,22 +18,11 @@ display:
exposed_sorts_label: 'Sortera efter'
sort_asc_label: Stigande
sort_desc_label: Fallande
- pager:
- options:
- expose:
- items_per_page_label: 'Inlägg per sida'
- items_per_page_options_all_label: '- Alla -'
- offset_label: Kompensera
- tags:
- previous: ‹‹
- next: ››
- fields:
- name:
- separator: ', '
empty:
area:
content:
- value: 'Inget resultat'
+ value: 'Inget resultat
'
+ format: full_html
arguments:
id:
exception:
@@ -33,9 +31,6 @@ display:
display_title: Objektsreferens
display_options:
fields:
- name_override:
- separator: ', '
- id:
- separator: ', '
- name:
- separator: ', '
+ name_override: { }
+ id: { }
+ name: { }
diff --git a/conf/cmi/language/sv/views.view.media.yml b/conf/cmi/language/sv/views.view.media.yml
index e6e1f8a4..16c3d929 100644
--- a/conf/cmi/language/sv/views.view.media.yml
+++ b/conf/cmi/language/sv/views.view.media.yml
@@ -1,34 +1,25 @@
-label: Media
description: 'Hitta och hantera media.'
display:
default:
display_title: Förvald
display_options:
- title: Media
fields:
media_bulk_form:
action_title: Åtgärd
thumbnail__target_id:
label: Miniatyr
- separator: ', '
name:
label: Medianamn
- separator: ', '
bundle:
label: Typ
- separator: ', '
uid:
label: Författare
- separator: ', '
status:
- label: Status
settings:
format_custom_false: 'Ej publicerad'
format_custom_true: Publicerad
- separator: ', '
changed:
label: Uppdaterad
- separator: ', '
operations:
label: Funktioner
pager:
@@ -62,6 +53,7 @@ display:
status:
expose:
label: Sant
+ description: ''
group_info:
label: 'Status för publicering'
group_items:
@@ -73,7 +65,5 @@ display:
expose:
label: Språk
media_page_list:
- display_title: Media
display_options:
- menu:
- title: Media
+ menu: { }
diff --git a/conf/cmi/language/sv/views.view.media_library.yml b/conf/cmi/language/sv/views.view.media_library.yml
index 8c5440f9..01f6b085 100644
--- a/conf/cmi/language/sv/views.view.media_library.yml
+++ b/conf/cmi/language/sv/views.view.media_library.yml
@@ -3,15 +3,11 @@ display:
default:
display_title: Förvald
display_options:
- title: Media
fields:
media_bulk_form:
action_title: Åtgärd
pager:
options:
- tags:
- next: ››
- previous: ‹‹
expose:
items_per_page_label: 'Inlägg per sida'
items_per_page_options_all_label: '- Alla -'
@@ -62,8 +58,6 @@ display:
fields:
media_bulk_form:
action_title: Åtgärd
- name:
- separator: ', '
edit_media:
alter:
text: 'Redigera {{ name }}'
@@ -75,7 +69,6 @@ display:
alt: 'Radera {{ name }}'
text: Radera
widget:
- display_title: Widget
display_options:
arguments:
bundle:
diff --git a/conf/cmi/language/sv/views.view.service_list.yml b/conf/cmi/language/sv/views.view.service_list.yml
index 5a74e8e1..71e198a1 100644
--- a/conf/cmi/language/sv/views.view.service_list.yml
+++ b/conf/cmi/language/sv/views.view.service_list.yml
@@ -1,6 +1,9 @@
display:
default:
+ display_title: Förvald
display_options:
+ fields:
+ name: { }
pager:
options:
tags:
@@ -8,18 +11,65 @@ display:
previous: Föregående
first: Första
last: Sista
- block_search:
- display_options:
+ expose:
+ items_per_page_label: 'Inlägg per sida'
+ items_per_page_options_all_label: '- Alla -'
+ offset_label: Kompensera
exposed_form:
options:
- submit_button: Sök
+ submit_button: Verkställ
+ reset_button_label: Återställ
+ exposed_sorts_label: 'Sortera efter'
+ sort_asc_label: Stigande
+ sort_desc_label: Fallande
+ empty:
+ area:
+ content:
+ value: 'Inget resultat
'
+ format: full_html
+ arguments:
+ id:
+ exception:
+ title: Alla
+ block: { }
+ block_search:
+ display_options:
+ fields:
+ name: { }
+ name_synonyms: { }
+ description__summary: { }
+ name_override: { }
pager:
options:
tags:
- previous: Tidigare
next: Nästa
+ previous: Föregående
+ first: Första
+ last: Sista
+ expose:
+ items_per_page_label: 'Inlägg per sida'
+ items_per_page_options_all_label: '- Alla -'
+ offset_label: Kompensera
+ exposed_form:
+ options:
+ submit_button: Sök
+ reset_button_label: Återställ
+ exposed_sorts_label: 'Sortera efter'
+ sort_asc_label: Stigande
+ sort_desc_label: Fallande
+ arguments:
+ id_or_service_id:
+ exception:
+ title: Alla
filters:
combine:
expose:
label: 'Rådgivningstjänstens namn eller sökterm'
placeholder: 't.ex. Socialrådgivning, hälsa eller digitalt Sök'
+ entity_reference_1:
+ display_title: Objektsreferens
+ display_options:
+ fields:
+ name_override: { }
+ id: { }
+ name: { }
diff --git a/conf/cmi/language/sv/views.view.service_units.yml b/conf/cmi/language/sv/views.view.service_units.yml
index ff02698a..7d61ff98 100644
--- a/conf/cmi/language/sv/views.view.service_units.yml
+++ b/conf/cmi/language/sv/views.view.service_units.yml
@@ -2,13 +2,8 @@ display:
default:
display_title: Förvald
display_options:
- exposed_form:
- options:
- submit_button: Verkställ
- reset_button_label: Återställ
- exposed_sorts_label: 'Sortera efter'
- sort_asc_label: Stigande
- sort_desc_label: Fallande
+ fields:
+ name: { }
pager:
options:
tags:
@@ -20,12 +15,15 @@ display:
items_per_page_label: 'Inlägg per sida'
items_per_page_options_all_label: '- Alla -'
offset_label: Kompensera
- fields:
- name:
- separator: ', '
+ exposed_form:
+ options:
+ submit_button: Verkställ
+ reset_button_label: Återställ
+ exposed_sorts_label: 'Sortera efter'
+ sort_asc_label: Stigande
+ sort_desc_label: Fallande
arguments:
id:
exception:
title: Alla
- service_units:
- display_title: Block
+ service_units: { }
diff --git a/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml b/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml
index 482ed76b..38b179b6 100644
--- a/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml
+++ b/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml
@@ -12,8 +12,6 @@ display:
pager:
options:
tags:
- previous: ‹‹
- next: ››
first: '« Första'
last: 'Sista »'
expose:
@@ -24,24 +22,16 @@ display:
tpr_errand_service_bulk_form:
label: Massuppdatera
action_title: Åtgärd
- id:
- label: ID
- separator: ', '
name:
label: Namn
- separator: ', '
langcode:
label: Språk
- separator: ', '
content_translation_status:
- label: Status
settings:
format_custom_true: Publicerad
format_custom_false: 'Ej publicerad'
- separator: ', '
content_translation_changed:
label: Uppdaterad
- separator: ', '
operations:
label: Funktioner
filters:
diff --git a/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml b/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml
index 05d6822e..2a8bc99a 100644
--- a/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml
+++ b/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml
@@ -12,8 +12,6 @@ display:
pager:
options:
tags:
- previous: ‹‹
- next: ››
first: '« Första'
last: 'Sista »'
expose:
@@ -24,24 +22,16 @@ display:
tpr_service_channel_bulk_form:
label: Massuppdatera
action_title: Åtgärd
- id:
- label: ID
- separator: ', '
name:
label: Namn
- separator: ', '
langcode:
label: Språk
- separator: ', '
content_translation_status:
- label: Status
settings:
format_custom_true: Publicerad
format_custom_false: 'Ej publicerad'
- separator: ', '
content_translation_changed:
label: Uppdaterad
- separator: ', '
operations:
label: Funktioner
filters:
diff --git a/conf/cmi/language/sv/views.view.tpr_service_list.yml b/conf/cmi/language/sv/views.view.tpr_service_list.yml
index 03c68092..bf5e95ec 100644
--- a/conf/cmi/language/sv/views.view.tpr_service_list.yml
+++ b/conf/cmi/language/sv/views.view.tpr_service_list.yml
@@ -12,8 +12,6 @@ display:
pager:
options:
tags:
- previous: ‹‹
- next: ››
first: '« Första'
last: 'Sista »'
expose:
@@ -24,24 +22,16 @@ display:
tpr_service_bulk_form:
label: Massuppdatera
action_title: Åtgärd
- id:
- label: ID
- separator: ', '
name:
label: Namn
- separator: ', '
langcode:
label: Språk
- separator: ', '
content_translation_status:
- label: Status
settings:
format_custom_true: Publicerad
format_custom_false: 'Ej publicerad'
- separator: ', '
content_translation_changed:
label: Uppdaterad
- separator: ', '
operations:
label: Funktioner
filters:
diff --git a/conf/cmi/language/sv/views.view.tpr_unit_list.yml b/conf/cmi/language/sv/views.view.tpr_unit_list.yml
index 5d74c47b..4608cbf4 100644
--- a/conf/cmi/language/sv/views.view.tpr_unit_list.yml
+++ b/conf/cmi/language/sv/views.view.tpr_unit_list.yml
@@ -13,8 +13,6 @@ display:
pager:
options:
tags:
- previous: ‹‹
- next: ››
first: '« Första'
last: 'Sista »'
expose:
@@ -22,24 +20,16 @@ display:
items_per_page_options_all_label: '- Alla -'
offset_label: Kompensera
fields:
- id:
- label: ID
- separator: ', '
name:
label: Namn
- separator: ', '
langcode:
label: Språk
- separator: ', '
content_translation_status:
- label: Status
settings:
format_custom_true: Publicerad
format_custom_false: 'Ej publicerad'
- separator: ', '
content_translation_changed:
label: Uppdaterad
- separator: ', '
operations:
label: Funktioner
filters:
diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml
index 8161ff66..b73bab98 100644
--- a/conf/cmi/language/sv/views.view.unit_search.yml
+++ b/conf/cmi/language/sv/views.view.unit_search.yml
@@ -2,13 +2,11 @@ display:
default:
display_title: Förvald
display_options:
- exposed_form:
- options:
- submit_button: Verkställ
- reset_button_label: Återställ
- exposed_sorts_label: 'Sortera efter'
- sort_asc_label: Stigande
- sort_desc_label: Fallande
+ fields:
+ name: { }
+ address__postal_code: { }
+ address__address_line1: { }
+ address__address_line2: { }
pager:
options:
tags:
@@ -20,21 +18,34 @@ display:
items_per_page_label: 'Inlägg per sida'
items_per_page_options_all_label: '- Alla -'
offset_label: Kompensera
- filters:
- combine:
- expose:
- label: Sök
- group_info:
- label: 'Kombinera filterfält'
+ exposed_form:
+ options:
+ submit_button: Verkställ
+ reset_button_label: Återställ
+ exposed_sorts_label: 'Sortera efter'
+ sort_asc_label: Stigande
+ sort_desc_label: Fallande
empty:
area:
content:
- value: 'Inget resultat'
+ value: 'Inget resultat
'
+ format: full_html
arguments:
id:
exception:
title: Alla
- block:
- display_title: Block
+ filters:
+ combine:
+ expose:
+ label: Sök
+ group_info:
+ label: 'Kombinera filterfält'
+ description: ''
+ block: { }
entity_reference:
display_title: Objektsreferens
+ display_options:
+ fields:
+ name_override: { }
+ id: { }
+ name: { }
diff --git a/conf/cmi/language/sv/views.view.unit_services.yml b/conf/cmi/language/sv/views.view.unit_services.yml
index c345918f..4028df7a 100644
--- a/conf/cmi/language/sv/views.view.unit_services.yml
+++ b/conf/cmi/language/sv/views.view.unit_services.yml
@@ -1,6 +1,5 @@
display:
default:
- display_title: Förvald
display_options:
exposed_form:
options:
@@ -9,20 +8,9 @@ display:
exposed_sorts_label: 'Sortera efter'
sort_asc_label: Stigande
sort_desc_label: Fallande
- pager:
- options:
- tags:
- next: Nästa
- previous: Föregående
- first: Första
- last: Sista
- expose:
- items_per_page_label: 'Inlägg per sida'
- items_per_page_options_all_label: '- Alla -'
- offset_label: Kompensera
arguments:
id:
exception:
title: Alla
- unit_services:
- display_title: Block
+ display_title: Förvald
+ unit_services: { }
diff --git a/conf/cmi/paragraphs.paragraphs_type.event_list.yml b/conf/cmi/paragraphs.paragraphs_type.event_list.yml
index 5e49716e..7c100d5c 100644
--- a/conf/cmi/paragraphs.paragraphs_type.event_list.yml
+++ b/conf/cmi/paragraphs.paragraphs_type.event_list.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies: { }
_core:
- default_config_hash: 6dhtTLqNLXC77tJ89dw-Y_1e1Xro9eP-IPa9PAyiMTA
+ default_config_hash: v_EuKKX-mxYeU5MvjV5zx7XVS7ZMQcQntpB0VOOfxH0
id: event_list
label: Events
icon_uuid: null
diff --git a/conf/cmi/views.view.content.yml b/conf/cmi/views.view.content.yml
index 191f5f3b..3ab07b2f 100644
--- a/conf/cmi/views.view.content.yml
+++ b/conf/cmi/views.view.content.yml
@@ -471,11 +471,11 @@ display:
default_group: All
default_group_multiple: { }
group_items:
- 1:
+ -
title: Published
operator: '='
value: '1'
- 2:
+ -
title: Unpublished
operator: '='
value: '0'
@@ -542,7 +542,7 @@ display:
filter_groups:
operator: AND
groups:
- 1: AND
+ - AND
style:
type: table
options:
diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
index 6d08a98d..a0edf41c 100644
--- a/conf/cmi/views.view.locked_services.yml
+++ b/conf/cmi/views.view.locked_services.yml
@@ -7,7 +7,7 @@ dependencies:
- helfi_tpr
- user
_core:
- default_config_hash: FDZcRw67DkxROxzgM6JstwpDXjlOOPt3eoaBSh-n5NA
+ default_config_hash: aH7J9QoFP01KCyEcUcw89rP57lnqQeFTwSTQezYdEDY
id: locked_services
label: 'Locked services'
module: views
@@ -601,6 +601,7 @@ display:
- 'languages:language_interface'
- url
- url.query_args
+ - user.permissions
tags: { }
locked_services_block:
id: locked_services_block
@@ -616,4 +617,5 @@ display:
- 'languages:language_interface'
- url
- url.query_args
+ - user.permissions
tags: { }
diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml
index 36f23fcb..132a31ae 100644
--- a/conf/cmi/views.view.locked_units.yml
+++ b/conf/cmi/views.view.locked_units.yml
@@ -7,7 +7,7 @@ dependencies:
- helfi_tpr
- user
_core:
- default_config_hash: ttPnpXga7YMo7jK1EJ5SySavpSnXjjMpqPAVZdX0mZI
+ default_config_hash: ZsyMOcwmJLa4Ewb7MJ0P9xrYSMa-s5YlRrpY5VG_Kvg
id: locked_units
label: 'Locked units'
module: views
@@ -603,6 +603,7 @@ display:
- 'languages:language_interface'
- url
- url.query_args
+ - user.permissions
tags: { }
locked_units_block:
id: locked_units_block
@@ -618,4 +619,5 @@ display:
- 'languages:language_interface'
- url
- url.query_args
+ - user.permissions
tags: { }
diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml
index d02c392e..23625589 100644
--- a/conf/cmi/views.view.media_library.yml
+++ b/conf/cmi/views.view.media_library.yml
@@ -480,6 +480,7 @@ display:
- 'url.query_args:sort_by'
- user
- user.permissions
+ - 'languages:language_content'
tags: { }
page:
id: page
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index ebedde76..09cb2d36 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -10,7 +10,7 @@ dependencies:
- text
- user
_core:
- default_config_hash: Onde7zmLJhxKFNX9U2CaS7memiRbiKGiDMf4Wf7UO2M
+ default_config_hash: 7yogbfzUwfJPIVkd8lMk8QJHI9ZUsmQd0TE9Jg0ox0E
id: service_list
label: 'Service list'
module: views
@@ -373,7 +373,6 @@ display:
- 'languages:language_content'
- 'languages:language_interface'
- url
- - url.query_args
- user
- user.permissions
tags: { }
diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml
index f8bf8cc0..04f8865d 100644
--- a/conf/cmi/views.view.unit_services.yml
+++ b/conf/cmi/views.view.unit_services.yml
@@ -8,7 +8,7 @@ dependencies:
- helfi_tpr
- user
_core:
- default_config_hash: 42qkvrqMtYpQiMgt2YU8fcfrF2DGfBmfrwlRksq3laE
+ default_config_hash: aywr8syEhbCACDdhTdxaNXmSgqofBkgBoUG8WYRqI0Y
id: unit_services
label: 'Unit services'
module: views
@@ -292,7 +292,6 @@ display:
contexts:
- 'languages:language_interface'
- url
- - url.query_args
- user
- user.permissions
tags:
@@ -312,7 +311,6 @@ display:
contexts:
- 'languages:language_interface'
- url
- - url.query_args
- user
- user.permissions
tags:
diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile
index 25b26fa5..6f82194d 100644
--- a/docker/openshift/Dockerfile
+++ b/docker/openshift/Dockerfile
@@ -9,6 +9,7 @@ RUN composer install --no-progress --profile --prefer-dist --no-interaction --no
COPY docker/openshift/entrypoints/ /entrypoints
RUN chmod +x /entrypoints/*
+COPY docker/openshift/init.sh /
# Copy cron scripts
RUN mkdir /crons
diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh
index 00cee29e..a656fa5a 100644
--- a/docker/openshift/crons/base.sh
+++ b/docker/openshift/crons/base.sh
@@ -1,23 +1,6 @@
#!/bin/bash
-# Checking if a new deployment is in progress, as we should not run cron while deploying.
-if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
- echo "OPENSHIFT_BUILD_NAME is not defined. Exiting early."
- exit 1
-fi
-
-while [ "$(drush state:get deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]
-do
- echo "Current deploy_id $OPENSHIFT_BUILD_NAME not found in state. Probably a deployment is in progress - waiting for completion..."
- sleep 60
-done
-
-while [ "$(drush state:get system.maintenance_mode)" = "1" ]
-do
- echo "Maintenance mode on. Probably a deployment is in progress - waiting for completion..."
- sleep 60
-done
-
+source /init.sh
echo "Starting cron: $(date)"
diff --git a/docker/openshift/crons/migrate-status.php b/docker/openshift/crons/migrate-status.php
deleted file mode 100644
index 8cb5aaa2..00000000
--- a/docker/openshift/crons/migrate-status.php
+++ /dev/null
@@ -1,82 +0,0 @@
-format('U');
- }
- catch (\Exception $e) {
- }
- return 0;
-}
-
-if (php_sapi_name() !== 'cli') {
- throw new RuntimeException();
-}
-
-if (!isset($argv[2], $argv[1])) {
- throw new RuntimeException('Missing argument.');
-}
-
-$migrations = explode(',', $argv[1]);
-$data = $argv[2];
-// Default to 6 hours.
-$time = $argv[3] ?? 21600;
-
-if (is_file($data)) {
- $data = file_get_contents($data);
-}
-
-if (!($json = json_decode($data)) || !is_array($json)) {
- throw new RuntimeException('Given argument is not a valid json');
-}
-
-$reset_status = [];
-$skip_migrate = [];
-
-foreach ($json as $migration) {
- if (!in_array($migration->id, $migrations)) {
- continue;
- }
- // Reset migration status.
- if ($migration->status !== 'Idle') {
- $reset_status[] = $migration->id;
- }
-
- $last_imported = unix_time($migration->last_imported) + $time;
-
- // Skip migration.
- if ($last_imported && $last_imported > time()) {
- $skip_migrate[] = $migration->id;
- }
-}
-
-output_variable('RESET_STATUS', implode(' ', $reset_status));
-output_variable('SKIP_MIGRATE', implode(' ', $skip_migrate));
diff --git a/docker/openshift/crons/migrate-tpr.sh b/docker/openshift/crons/migrate-tpr.sh
index 08006f13..780bcbbf 100644
--- a/docker/openshift/crons/migrate-tpr.sh
+++ b/docker/openshift/crons/migrate-tpr.sh
@@ -1,68 +1,12 @@
#!/bin/bash
-function populate_variables {
- # Generate variables used to control which migrates needs
- # to be reset and which ones needs to be skipped based on
- # migrate status
- MIGRATE_STATUS=$(drush migrate:status --format=json)
- php ./docker/openshift/crons/migrate-status.php \
- tpr_unit,tpr_service,tpr_errand_service,tpr_service_channel \
- "$MIGRATE_STATUS" > /tmp/migrate-tpr-source.sh \
- $1
-
- # Contains variables:
- # - $RESET_STATUS
- # - $SKIP_MIGRATE
- # Both contains a space separated list of migrates
- source /tmp/migrate-tpr-source.sh
-}
-
-function reset_status {
- # Reset status of stuck migrations.
- for ID in $RESET_STATUS; do
- drush migrate:reset-status $ID
- done
-}
-
-function run_migrate {
- for ID in $SKIP_MIGRATE; do
- if [ "$ID" == "$1" ]; then
- return 1
- fi
- done
- return 0
-}
-
-# Populate variables for the first run after deploy and
-# default migrate interval to 6 hours.
-populate_variables 21600
-
while true
do
- # Reset stuck migrates.
- reset_status
-
- if run_migrate "tpr_unit"; then
- echo "Running TPR Unit migrate: $(date)"
- PARTIAL_MIGRATE=1 drush migrate:import tpr_unit --no-progress
- fi
- if run_migrate "tpr_service"; then
- echo "Running TPR Service migrate: $(date)"
- PARTIAL_MIGRATE=1 drush migrate:import tpr_service --no-progress
- fi
- if run_migrate "tpr_errand_service"; then
- echo "Running TPR Errand Service migrate: $(date)"
- PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service --no-progress
- fi
- if run_migrate "tpr_service_channel"; then
- echo "Running TPR Service Channel migrate: $(date)"
- PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel --no-progress
- fi
- # Reset migrate status if migrate has been running for more
- # than 12 hours.
- populate_variables 43200
- # Never skip migrate after first time.
- SKIP_MIGRATE=
+ # Allow migrations to be run every 3 hours and reset stuck migrations every 12 hours.
+ drush migrate:import tpr_unit --no-progress --reset-threshold 43200 --interval 10800
+ drush migrate:import tpr_service --no-progress --reset-threshold 43200 --interval 10800
+ drush migrate:import tpr_errand_service --no-progress --reset-threshold 43200 --interval 10800
+ drush migrate:import tpr_service_channel --no-progress --reset-threshold 43200 --interval 10800
# Sleep for 6 hours.
sleep 21600
done
diff --git a/docker/openshift/entrypoints/10-preflight.sh b/docker/openshift/entrypoints/10-preflight.sh
new file mode 100644
index 00000000..5cd45c01
--- /dev/null
+++ b/docker/openshift/entrypoints/10-preflight.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+source /init.sh
+
+if [ -f "../docker/openshift/preflight/preflight.php" ]; then
+ echo "Running preflight checks ..."
+ php ../docker/openshift/preflight/preflight.php
+fi
+
diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh
index c4051265..6a098241 100644
--- a/docker/openshift/entrypoints/20-deploy.sh
+++ b/docker/openshift/entrypoints/20-deploy.sh
@@ -1,25 +1,11 @@
#!/bin/bash
-cd /var/www/html/public
+source /init.sh
-function output_error_message {
- echo ${1}
- php ../docker/openshift/notify.php "${1}" || true
-}
-
-# Make sure we have active Drupal configuration.
-if [ ! -f "../conf/cmi/system.site.yml" ]; then
- output_error_message "Container start error: Codebase is not deployed properly. Exiting early."
+function rollback_deployment {
+ output_error_message "Deployment failed: ${1}"
+ set_deploy_id ${2}
exit 1
-fi
-
-if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
- output_error_message "Container start error: OPENSHIFT_BUILD_NAME is not defined. Exiting early."
- exit 1
-fi
-
-function get_deploy_id {
- echo $(drush state:get deploy_id)
}
# Populate twig caches.
@@ -27,54 +13,42 @@ if [ ! -d "/tmp/twig" ]; then
drush twig:compile || true
fi
-# Attempt to set deploy ID in case this is the first deploy.
-if [[ -z "$(get_deploy_id)" ]]; then
- drush state:set deploy_id $OPENSHIFT_BUILD_NAME
-fi
-
-# Exit early if deploy ID is still not set. This usually means either Redis or
-# something else is down.
-if [[ -z "$(get_deploy_id)" ]]; then
- output_error_message "Container start error: Could not fetch deploy ID. Exiting early."
- exit 1
-fi
+# Capture the current deploy ID so we can roll back to previous version in case
+# deployment fails.
+CURRENT_DEPLOY_ID=$(get_deploy_id)
# This script is run every time a container is spawned and certain environments might
# start more than one Drupal container. This is used to make sure we run deploy
# tasks only once per deploy.
-if [ "$(get_deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then
- drush state:set deploy_id $OPENSHIFT_BUILD_NAME
+if [ "$CURRENT_DEPLOY_ID" != "$OPENSHIFT_BUILD_NAME" ]; then
+ set_deploy_id $OPENSHIFT_BUILD_NAME
if [ $? -ne 0 ]; then
- output_error_message "Deployment failed: Failed set deploy_id"
- exit 1
+ rollback_deployment "Failed to set deploy_id" $CURRENT_DEPLOY_ID
fi
# Put site in maintenance mode
drush state:set system.maintenance_mode 1 --input-format=integer
if [ $? -ne 0 ]; then
- output_error_message "Deployment failed: Failed to enable maintenance_mode"
- exit 1
+ rollback_deployment "Failed to enable maintenance_mode" $CURRENT_DEPLOY_ID
fi
- # Run helfi specific pre-deploy tasks. Allow this to fail in case
- # the environment is not using the 'helfi_api_base' module.
- # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base
+ # Run pre-deploy tasks.
+ # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
drush helfi:pre-deploy || true
# Run maintenance tasks (config import, database updates etc)
drush deploy
if [ $? -ne 0 ]; then
- output_error_message "Deployment failed: drush deploy failed with {$?} exit code. See logs for more information."
+ rollback_deployment "drush deploy failed with {$?} exit code. See logs for more information." $CURRENT_DEPLOY_ID
exit 1
fi
- # Run helfi specific post deploy tasks. Allow this to fail in case
- # the environment is not using the 'helfi_api_base' module.
- # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base
+ # Run post-deploy tasks.
+ # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
drush helfi:post-deploy || true
# Disable maintenance mode
drush state:set system.maintenance_mode 0 --input-format=integer
if [ $? -ne 0 ]; then
- output_error_message "Deployment failure: Failed to disable maintenance_mode"
+ rollback_deployment "Failed to disable maintenance_mode" $CURRENT_DEPLOY_ID
fi
fi
diff --git a/docker/openshift/init.sh b/docker/openshift/init.sh
new file mode 100644
index 00000000..8bef1380
--- /dev/null
+++ b/docker/openshift/init.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+cd /var/www/html/public
+
+function get_deploy_id {
+ if [ ! -f "sites/default/files/deploy.id" ]; then
+ touch sites/default/files/deploy.id
+ fi
+ echo $(cat sites/default/files/deploy.id)
+}
+
+function set_deploy_id {
+ echo ${1} > sites/default/files/deploy.id
+}
+
+function output_error_message {
+ echo ${1}
+ php ../docker/openshift/notify.php "${1}" || true
+}
+
+function deployment_in_progress {
+ if [ "$(get_deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then
+ return 0
+ fi
+
+ if [ "$(drush state:get system.maintenance_mode)" = "1" ]; then
+ return 0
+ fi
+
+ return 1
+}
+
+if [ ! -d "sites/default/files" ]; then
+ output_error_message "Container start error: Public file folder does not exist. Exiting early."
+ exit 1
+fi
+
+# Make sure we have active Drupal configuration.
+if [ ! -f "../conf/cmi/system.site.yml" ]; then
+ output_error_message "Container start error: Codebase is not deployed properly. Exiting early."
+ exit 1
+fi
+
+if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
+ output_error_message "Container start error: OPENSHIFT_BUILD_NAME is not defined. Exiting early."
+ exit 1
+fi
+
diff --git a/docker/openshift/preflight/preflight.php b/docker/openshift/preflight/preflight.php
new file mode 100644
index 00000000..35219bb8
--- /dev/null
+++ b/docker/openshift/preflight/preflight.php
@@ -0,0 +1,100 @@
+#!/usr/bin/env php
+ [
+ 'DRUPAL_ROUTES',
+ 'DRUPAL_DB_NAME',
+ 'DRUPAL_DB_PASS',
+ 'DRUPAL_DB_HOST',
+ ],
+ 'additionalFiles' => [],
+];
+
// Environment specific overrides.
if (file_exists(__DIR__ . '/all.settings.php')) {
// phpcs:ignore
@@ -349,3 +364,4 @@ function drupal_get_env(string|array $variables) : mixed {
if (empty($settings['deployment_identifier'])) {
$settings['deployment_identifier'] = filemtime(__DIR__ . '/../../../composer.lock');
}
+