From 34b83d66b33d0c1df2edb8491a7448e2f206b11c Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 15 Feb 2023 14:15:36 +0000 Subject: [PATCH] Update configuration --- composer.lock | 135 +++++++++++++++------------ conf/cmi/core.extension.yml | 1 - conf/cmi/filter.format.full_html.yml | 8 -- conf/cmi/filter.format.minimal.yml | 8 -- docker-compose.yml | 3 + 5 files changed, 79 insertions(+), 76 deletions(-) diff --git a/composer.lock b/composer.lock index 836e0bb3..087c6620 100644 --- a/composer.lock +++ b/composer.lock @@ -305,20 +305,20 @@ }, { "name": "commerceguys/addressing", - "version": "v1.4.1", + "version": "v1.4.2", "source": { "type": "git", "url": "https://github.com/commerceguys/addressing.git", - "reference": "8b1bcd45971733e8f4224e539cb92838f18c4d06" + "reference": "406c7b5f0fbe4f6a64155c0fe03b1adb34d01308" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/commerceguys/addressing/zipball/8b1bcd45971733e8f4224e539cb92838f18c4d06", - "reference": "8b1bcd45971733e8f4224e539cb92838f18c4d06", + "url": "https://api.github.com/repos/commerceguys/addressing/zipball/406c7b5f0fbe4f6a64155c0fe03b1adb34d01308", + "reference": "406c7b5f0fbe4f6a64155c0fe03b1adb34d01308", "shasum": "" }, "require": { - "doctrine/collections": "^1.2", + "doctrine/collections": "^1.2 || ^2.0", "php": ">=7.3" }, "require-dev": { @@ -363,9 +363,9 @@ ], "support": { "issues": "https://github.com/commerceguys/addressing/issues", - "source": "https://github.com/commerceguys/addressing/tree/v1.4.1" + "source": "https://github.com/commerceguys/addressing/tree/v1.4.2" }, - "time": "2022-08-09T11:42:51+00:00" + "time": "2023-02-15T10:11:14+00:00" }, { "name": "composer/installers", @@ -1372,32 +1372,34 @@ }, { "name": "doctrine/collections", - "version": "1.8.0", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e" + "reference": "db8cda536a034337f7dd63febecc713d4957f9ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/2b44dd4cbca8b5744327de78bafef5945c7e7b5e", - "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e", + "url": "https://api.github.com/repos/doctrine/collections/zipball/db8cda536a034337f7dd63febecc713d4957f9ee", + "reference": "db8cda536a034337f7dd63febecc713d4957f9ee", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1.3 || ^8.0" + "doctrine/deprecations": "^1", + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9.0 || ^10.0", - "phpstan/phpstan": "^1.4.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", + "doctrine/coding-standard": "^10.0", + "ext-json": "*", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.22" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" + "Doctrine\\Common\\Collections\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1436,9 +1438,23 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.8.0" + "source": "https://github.com/doctrine/collections/tree/2.1.2" }, - "time": "2022-09-01T20:12:10+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], + "time": "2022-12-27T23:41:38+00:00" }, { "name": "doctrine/deprecations", @@ -2042,27 +2058,27 @@ }, { "name": "drupal/config_ignore", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_ignore.git", - "reference": "8.x-2.3" + "reference": "8.x-2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-2.3.zip", - "reference": "8.x-2.3", - "shasum": "2e1f07a455275fb6637909921a8915646601fc00" + "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-2.4.zip", + "reference": "8.x-2.4", + "shasum": "e0e45dde2d6927c5d26de59f352792fb6cf26554" }, "require": { "drupal/config_filter": "^1 || ^2", - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.3", - "datestamp": "1608306489", + "version": "8.x-2.4", + "datestamp": "1676045435", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2094,7 +2110,7 @@ "homepage": "http://drupal.org/project/config_ignore", "support": { "source": "https://git.drupalcode.org/project/config_ignore", - "issues": "http://drupal.org/project/config_ignore", + "issues": "https://drupal.org/project/config_ignore", "irc": "irc://irc.freenode.org/drupal-contribute" } }, @@ -4282,16 +4298,16 @@ }, { "name": "drupal/hdbt", - "version": "4.4.6", + "version": "4.4.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "564a5a9e3a87e1a231681186f25c5b0222fe7e9d" + "reference": "9e7cc8a89e8792a1d3be6f6ce1e61983d097265b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/564a5a9e3a87e1a231681186f25c5b0222fe7e9d", - "reference": "564a5a9e3a87e1a231681186f25c5b0222fe7e9d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9e7cc8a89e8792a1d3be6f6ce1e61983d097265b", + "reference": "9e7cc8a89e8792a1d3be6f6ce1e61983d097265b", "shasum": "" }, "require": { @@ -4306,23 +4322,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-02-09T13:53:25+00:00" + "time": "2023-02-15T14:06:00+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "9e062a862d33d14dee10117a01b0c694cbc19d10" + "reference": "9136a0177d426b2dd045a3f63e87186d46539f4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9e062a862d33d14dee10117a01b0c694cbc19d10", - "reference": "9e062a862d33d14dee10117a01b0c694cbc19d10", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9136a0177d426b2dd045a3f63e87186d46539f4b", + "reference": "9136a0177d426b2dd045a3f63e87186d46539f4b", "shasum": "" }, "require": { @@ -4338,10 +4354,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.5", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-01-17T09:33:26+00:00" + "time": "2023-02-13T16:24:34+00:00" }, { "name": "drupal/health_check", @@ -4428,16 +4444,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.10", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "8b6c0ad0bce4a9d1c19203ae7e880b26f9845325" + "reference": "9fef0cb03d5d0e31dba160331bc5365d0b424be4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/8b6c0ad0bce4a9d1c19203ae7e880b26f9845325", - "reference": "8b6c0ad0bce4a9d1c19203ae7e880b26f9845325", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/9fef0cb03d5d0e31dba160331bc5365d0b424be4", + "reference": "9fef0cb03d5d0e31dba160331bc5365d0b424be4", "shasum": "" }, "require": { @@ -4461,10 +4477,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.10", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-01-18T12:10:48+00:00" + "time": "2023-02-15T04:42:26+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4661,16 +4677,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.17.3", + "version": "2.17.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "41b1bf65048f6940894031ffe1c2d3d13e9a1734" + "reference": "f3572529c1f2b2f9f0fb82d708ce55a29d04f93f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/41b1bf65048f6940894031ffe1c2d3d13e9a1734", - "reference": "41b1bf65048f6940894031ffe1c2d3d13e9a1734", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f3572529c1f2b2f9f0fb82d708ce55a29d04f93f", + "reference": "f3572529c1f2b2f9f0fb82d708ce55a29d04f93f", "shasum": "" }, "require": { @@ -4730,7 +4746,8 @@ "drupal/update_helper": "^2.0", "drupal/view_unpublished": "^1.0", "drupal/views_bulk_edit": "^2.7", - "drupal/views_bulk_operations": "^4.1" + "drupal/views_bulk_operations": "^4.1", + "ext-curl": "*" }, "conflict": { "drupal/core-recommended": "<9.5", @@ -4781,10 +4798,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.3", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-02-09T15:49:22+00:00" + "time": "2023-02-15T07:24:23+00:00" }, { "name": "drupal/helfi_proxy", @@ -8292,16 +8309,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "24144b7dc84168e14e4fc893d654c4fb40628346" + "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/24144b7dc84168e14e4fc893d654c4fb40628346", - "reference": "24144b7dc84168e14e4fc893d654c4fb40628346", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/58fbd11312a8f69e0824a640b86b33a9d096fe7f", + "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f", "shasum": "" }, "require": { @@ -8348,9 +8365,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.0" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.1" }, - "time": "2022-07-17T13:00:20+00:00" + "time": "2023-02-11T19:58:58+00:00" }, { "name": "galbar/jsonpath", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 24c572a6..7f37d52f 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -136,7 +136,6 @@ module: telephone: 0 text: 0 token: 0 - token_filter: 0 toolbar: 0 translatable_menu_link_uri: 0 twig_tweak: 0 diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index 58f24e9a..0aece5f9 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,6 @@ dependencies: - helfi_api_base - linkit - media - - token_filter _core: default_config_hash: sT1EGRgQu01VxKkqehd1pxPfnzNMU02el719MOliiho name: HTML @@ -49,13 +48,6 @@ filters: weight: -48 settings: title: true - token_filter: - id: token_filter - provider: token_filter - status: true - weight: -47 - settings: - replace_empty: '1' media_embed: id: media_embed provider: media diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml index ca9b990c..e78e83d0 100644 --- a/conf/cmi/filter.format.minimal.yml +++ b/conf/cmi/filter.format.minimal.yml @@ -7,7 +7,6 @@ dependencies: - helfi_api_base - linkit - media - - token_filter _core: default_config_hash: rPfSn6HhVRcP1eR3cJR8Dn5fcv2gnRaSGuABkDE6mE0 name: Minimal @@ -88,13 +87,6 @@ filters: default_view_mode: default allowed_view_modes: { } allowed_media_types: { } - token_filter: - id: token_filter - provider: token_filter - status: true - weight: -43 - settings: - replace_empty: '1' helfi_link_converter: id: helfi_link_converter provider: helfi_api_base diff --git a/docker-compose.yml b/docker-compose.yml index 015a5453..e259cad6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,6 +52,9 @@ services: db: container_name: "${COMPOSE_PROJECT_NAME}-db" image: druidfi/mariadb:10.9-drupal + environment: + MARIADB_AUTO_UPGRADE: "1" + MARIADB_INITDB_SKIP_TZINFO: "1" volumes: - db_data:/var/lib/mysql ports: