diff --git a/composer.lock b/composer.lock index e5a151eb..a10c05a3 100644 --- a/composer.lock +++ b/composer.lock @@ -3933,17 +3933,17 @@ }, { "name": "drupal/gin", - "version": "3.0.0-beta5", + "version": "3.0.0-rc1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-beta5" + "reference": "8.x-3.0-rc1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-beta5.zip", - "reference": "8.x-3.0-beta5", - "shasum": "651b2047990067e26158368e3aab7f27366a81e9" + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc1.zip", + "reference": "8.x-3.0-rc1", + "shasum": "d9a9ed97a5f8741e6edf48ef03721b3a278ef167" }, "require": { "drupal/core": "^8.9 || ^9 || ^10", @@ -3952,11 +3952,11 @@ "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-beta5", - "datestamp": "1656071885", + "version": "8.x-3.0-rc1", + "datestamp": "1669666925", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "RC releases are not covered by Drupal security advisories." } } }, @@ -3995,17 +3995,17 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-beta22", + "version": "1.0.0-rc1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-beta22" + "reference": "8.x-1.0-rc1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-beta22.zip", - "reference": "8.x-1.0-beta22", - "shasum": "630b4acb208411b78c61d83c9a27741c546202de" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc1.zip", + "reference": "8.x-1.0-rc1", + "shasum": "90516f6aa22f4f60f1853bdceb757940f411ec7e" }, "require": { "drupal/core": "^8 || ^9 || ^10" @@ -4013,11 +4013,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-beta22", - "datestamp": "1649709351", + "version": "8.x-1.0-rc1", + "datestamp": "1669666957", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "RC releases are not covered by Drupal security advisories." } } }, @@ -4054,16 +4054,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.3", + "version": "4.3.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "419f78ccd02f71c60b194779beed067f657688b0" + "reference": "2113fe6a7408b1b1870212e19b69206da3152567" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/419f78ccd02f71c60b194779beed067f657688b0", - "reference": "419f78ccd02f71c60b194779beed067f657688b0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2113fe6a7408b1b1870212e19b69206da3152567", + "reference": "2113fe6a7408b1b1870212e19b69206da3152567", "shasum": "" }, "require": { @@ -4078,10 +4078,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-11-24T09:53:50+00:00" + "time": "2022-11-29T07:29:00+00:00" }, { "name": "drupal/hdbt_admin", @@ -4150,16 +4150,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.5", + "version": "2.3.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f" + "reference": "f25f99abb17896c15531b4834f0908ba560437bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f3560b56532df468b8f5433875a7dc79bab10c1f", - "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f25f99abb17896c15531b4834f0908ba560437bd", + "reference": "f25f99abb17896c15531b4834f0908ba560437bd", "shasum": "" }, "require": { @@ -4182,10 +4182,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-11-02T08:44:03+00:00" + "time": "2022-11-28T07:46:25+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4382,16 +4382,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.15.3", + "version": "2.15.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "0d39f7aa3082b4f4211bc2681d573a5509a42adf" + "reference": "b34e3e5be782b521e732ef450a7cdd7da1d9b8ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/0d39f7aa3082b4f4211bc2681d573a5509a42adf", - "reference": "0d39f7aa3082b4f4211bc2681d573a5509a42adf", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b34e3e5be782b521e732ef450a7cdd7da1d9b8ce", + "reference": "b34e3e5be782b521e732ef450a7cdd7da1d9b8ce", "shasum": "" }, "require": { @@ -4497,10 +4497,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.3", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-11-25T07:03:32+00:00" + "time": "2022-11-25T12:54:12+00:00" }, { "name": "drupal/helfi_proxy", @@ -5554,17 +5554,17 @@ }, { "name": "drupal/publication_date", - "version": "2.0.0-beta6", + "version": "2.0.0-beta7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/publication_date.git", - "reference": "8.x-2.0-beta6" + "reference": "8.x-2.0-beta7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta6.zip", - "reference": "8.x-2.0-beta6", - "shasum": "16038d7f204f4ab999c68740a5db596aca142fa1" + "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta7.zip", + "reference": "8.x-2.0-beta7", + "shasum": "699232945890528f97b83f49a31ea7c7831c3ca8" }, "require": { "drupal/core": "^9.1 || ^10" @@ -5572,8 +5572,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta6", - "datestamp": "1669064172", + "version": "8.x-2.0-beta7", + "datestamp": "1669679282", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -10804,16 +10804,16 @@ }, { "name": "symfony/console", - "version": "v4.4.48", + "version": "v4.4.49", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" + "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", - "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", + "url": "https://api.github.com/repos/symfony/console/zipball/33fa45ffc81fdcc1ca368d4946da859c8cdb58d9", + "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9", "shasum": "" }, "require": { @@ -10874,7 +10874,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.48" + "source": "https://github.com/symfony/console/tree/v4.4.49" }, "funding": [ { @@ -10890,7 +10890,7 @@ "type": "tidelift" } ], - "time": "2022-10-26T16:02:45+00:00" + "time": "2022-11-05T17:10:16+00:00" }, { "name": "symfony/debug", @@ -10963,16 +10963,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.4.44", + "version": "v4.4.49", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471" + "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/25502a57182ba1e15da0afd64c975cae4d0a1471", - "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9065fe97dbd38a897e95ea254eb5ddfe1310f734", + "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734", "shasum": "" }, "require": { @@ -11029,7 +11029,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/v4.4.44" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.49" }, "funding": [ { @@ -11045,7 +11045,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2022-11-16T16:18:09+00:00" }, { "name": "symfony/deprecation-contracts", @@ -11472,16 +11472,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.15", + "version": "v5.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b" + "reference": "0f43af12a27733a060b92396b7bde84a4376da0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b", - "reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b", + "url": "https://api.github.com/repos/symfony/http-client/zipball/0f43af12a27733a060b92396b7bde84a4376da0a", + "reference": "0f43af12a27733a060b92396b7bde84a4376da0a", "shasum": "" }, "require": { @@ -11539,7 +11539,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.15" + "source": "https://github.com/symfony/http-client/tree/v5.4.16" }, "funding": [ { @@ -11555,7 +11555,7 @@ "type": "tidelift" } ], - "time": "2022-10-25T16:22:13+00:00" + "time": "2022-11-09T11:27:39+00:00" }, { "name": "symfony/http-client-contracts", @@ -11637,16 +11637,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.48", + "version": "v4.4.49", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" + "reference": "191413c7b832c015bb38eae963f2e57498c3c173" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", - "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/191413c7b832c015bb38eae963f2e57498c3c173", + "reference": "191413c7b832c015bb38eae963f2e57498c3c173", "shasum": "" }, "require": { @@ -11685,7 +11685,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.49" }, "funding": [ { @@ -11701,20 +11701,20 @@ "type": "tidelift" } ], - "time": "2022-10-12T09:40:54+00:00" + "time": "2022-11-04T16:17:57+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.48", + "version": "v4.4.49", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" + "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", - "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4e36db8103062c62b3882b1bd297b02de6b021c4", + "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4", "shasum": "" }, "require": { @@ -11789,7 +11789,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/v4.4.48" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.49" }, "funding": [ { @@ -11805,7 +11805,7 @@ "type": "tidelift" } ], - "time": "2022-10-28T16:49:22+00:00" + "time": "2022-11-28T17:58:43+00:00" }, { "name": "symfony/mime", @@ -12678,16 +12678,16 @@ }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.1.3", + "version": "v2.1.4", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840" + "reference": "a125b93ef378c492e274f217874906fb9babdebb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d444f85dddf65c7e57c58d8e5b3a4dbb593b1840", - "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a125b93ef378c492e274f217874906fb9babdebb", + "reference": "a125b93ef378c492e274f217874906fb9babdebb", "shasum": "" }, "require": { @@ -12746,7 +12746,7 @@ ], "support": { "issues": "https://github.com/symfony/psr-http-message-bridge/issues", - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.3" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.4" }, "funding": [ { @@ -12762,7 +12762,7 @@ "type": "tidelift" } ], - "time": "2022-09-05T10:34:54+00:00" + "time": "2022-11-28T22:46:34+00:00" }, { "name": "symfony/routing", diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index 806a9f3e..bb365171 100644 --- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -312,3 +312,4 @@ content: hidden: created: true hide_description: true + ontologyword_ids: true diff --git a/conf/cmi/field.storage.paragraph.field_list_of_links_design.yml b/conf/cmi/field.storage.paragraph.field_list_of_links_design.yml index 118fc2b3..a6f58abe 100644 --- a/conf/cmi/field.storage.paragraph.field_list_of_links_design.yml +++ b/conf/cmi/field.storage.paragraph.field_list_of_links_design.yml @@ -19,9 +19,6 @@ settings: - value: without-image label: 'Without image' - - - value: without-image-desc - label: 'Without image and description' allowed_values_function: '' module: options locked: false diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_list_of_links_design.yml b/conf/cmi/language/fi/field.storage.paragraph.field_list_of_links_design.yml index 04c1f147..0bdc09a0 100644 --- a/conf/cmi/language/fi/field.storage.paragraph.field_list_of_links_design.yml +++ b/conf/cmi/language/fi/field.storage.paragraph.field_list_of_links_design.yml @@ -4,5 +4,3 @@ settings: label: Kuvallinen - label: 'Ilman kuvaa' - - - label: 'Ilman kuvaa ja kuvausta' diff --git a/docker-compose.yml b/docker-compose.yml index 7a87b798..425f4b35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,6 +46,7 @@ services: redis: container_name: "${COMPOSE_PROJECT_NAME}-redis" image: redis:7-alpine + command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save ''"] networks: - internal db: diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1a56d5be..603e6d95 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -16,7 +16,7 @@ - +