From 3129299a208b0a18d638ab8a178e18c289ac46ae Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 12 Jan 2024 06:23:17 +0000 Subject: [PATCH 1/2] Update configuration --- composer.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 8827b90b..bac8b374 100644 --- a/composer.lock +++ b/composer.lock @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "6.3.2", + "version": "6.3.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "1469093f6b8d887db142b8d8d5dc575d6c5cf3dc" + "reference": "deb860b55ce9fcd97256b5875e62fedf46082487" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1469093f6b8d887db142b8d8d5dc575d6c5cf3dc", - "reference": "1469093f6b8d887db142b8d8d5dc575d6c5cf3dc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/deb860b55ce9fcd97256b5875e62fedf46082487", + "reference": "deb860b55ce9fcd97256b5875e62fedf46082487", "shasum": "" }, "require": { @@ -3774,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-12-28T12:38:31+00:00" + "time": "2024-01-09T15:40:24+00:00" }, { "name": "drupal/hdbt_admin", @@ -8733,16 +8733,16 @@ }, { "name": "mck89/peast", - "version": "v1.15.4", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/mck89/peast.git", - "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18" + "reference": "63dee902bd281c792f1dd760b6df268682032ed0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mck89/peast/zipball/1df4dc28a6b5bb7ab117ab073c1712256e954e18", - "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18", + "url": "https://api.github.com/repos/mck89/peast/zipball/63dee902bd281c792f1dd760b6df268682032ed0", + "reference": "63dee902bd281c792f1dd760b6df268682032ed0", "shasum": "" }, "require": { @@ -8755,7 +8755,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15.4-dev" + "dev-master": "1.16.0-dev" } }, "autoload": { @@ -8776,9 +8776,9 @@ "description": "Peast is PHP library that generates AST for JavaScript code", "support": { "issues": "https://github.com/mck89/peast/issues", - "source": "https://github.com/mck89/peast/tree/v1.15.4" + "source": "https://github.com/mck89/peast/tree/v1.16.0" }, - "time": "2023-08-12T08:29:29+00:00" + "time": "2024-01-11T14:36:12+00:00" }, { "name": "microsoft/azure-storage-blob", @@ -15922,16 +15922,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "shasum": "" }, "require": { @@ -15974,9 +15974,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-01-11T11:49:22+00:00" }, { "name": "phpspec/prophecy", From e6d5ea5f556159ec01c3a512eaf77587c063e5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 12 Jan 2024 08:59:40 +0200 Subject: [PATCH 2/2] Updated D10.2.1 --- composer.json | 3 - composer.lock | 207 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 142 insertions(+), 68 deletions(-) diff --git a/composer.json b/composer.json index 1a32c5b0..875aa1ed 100644 --- a/composer.json +++ b/composer.json @@ -39,9 +39,6 @@ "weitzman/drupal-test-traits": "^2.1" }, "conflict": { - "drupal/core": ">=10.2", - "drupal/core-composer-scaffold": ">=10.2", - "drupal/core-dev": ">=10.2", "drupal/drupal": "*" }, "config": { diff --git a/composer.lock b/composer.lock index bac8b374..6a43a2a3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a99a5fa3e527aa8ac31291a1baae0d85", + "content-hash": "eaf49b6a03ccf054a0ab10fe34a6c5df", "packages": [ { "name": "asm89/stack-cors", @@ -2017,16 +2017,16 @@ }, { "name": "drupal/core", - "version": "10.1.7", + "version": "10.2.1", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "54415049a721ede65318e3980b402af59bc35913" + "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/54415049a721ede65318e3980b402af59bc35913", - "reference": "54415049a721ede65318e3980b402af59bc35913", + "url": "https://api.github.com/repos/drupal/core/zipball/0050280087b8ed1fb145fcf22e01ad53c85931db", + "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db", "shasum": "" }, "require": { @@ -2056,23 +2056,26 @@ "php": ">=8.1.0", "psr/log": "^3.0", "sebastian/diff": "^4", - "symfony/console": "^6.3", - "symfony/dependency-injection": "^6.3", - "symfony/event-dispatcher": "^6.3", - "symfony/http-foundation": "^6.3", - "symfony/http-kernel": "^6.3", - "symfony/mime": "^6.3", + "symfony/console": "^6.4", + "symfony/dependency-injection": "^6.4", + "symfony/event-dispatcher": "^6.4", + "symfony/filesystem": "^6.4", + "symfony/finder": "^6.4", + "symfony/http-foundation": "^6.4", + "symfony/http-kernel": "^6.4", + "symfony/mailer": "^6.4", + "symfony/mime": "^6.4", "symfony/polyfill-iconv": "^1.26", - "symfony/process": "^6.3", - "symfony/psr-http-message-bridge": "^2.1", - "symfony/routing": "^6.3", - "symfony/serializer": "^6.3", - "symfony/validator": "^6.3", - "symfony/yaml": "^6.3", + "symfony/process": "^6.4", + "symfony/psr-http-message-bridge": "^2.1|^6.4", + "symfony/routing": "^6.4", + "symfony/serializer": "^6.4", + "symfony/validator": "^6.4", + "symfony/yaml": "^6.4", "twig/twig": "^3.5.0" }, "conflict": { - "drush/drush": "<8.1.10" + "drush/drush": "<12.4.3" }, "replace": { "drupal/core-annotation": "self.version", @@ -2171,9 +2174,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.1.7" + "source": "https://github.com/drupal/core/tree/10.2.1" }, - "time": "2023-12-06T09:22:56+00:00" + "time": "2024-01-05T09:27:16+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -3781,16 +3784,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "d880acda97cea962575475489134852ce5e1f6c9" + "reference": "eb62ff26a070ef7ba880a6194cce5d805ef9303f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/d880acda97cea962575475489134852ce5e1f6c9", - "reference": "d880acda97cea962575475489134852ce5e1f6c9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/eb62ff26a070ef7ba880a6194cce5d805ef9303f", + "reference": "eb62ff26a070ef7ba880a6194cce5d805ef9303f", "shasum": "" }, "require": { @@ -3798,7 +3801,7 @@ "drupal/gin": "^3.0@rc" }, "conflict": { - "drupal/helfi_platform_config": "<4.0" + "drupal/helfi_platform_config": "<4.3" }, "type": "drupal-theme", "license": [ @@ -3809,10 +3812,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.0.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-11-16T09:10:11+00:00" + "time": "2024-01-12T06:07:26+00:00" }, { "name": "drupal/health_check", @@ -4040,16 +4043,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.2.7", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "eb0336758589fe27c79d0f2da389b37a3827872d" + "reference": "8a5b45f5f235496a263723581060c2a6aff7b71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/eb0336758589fe27c79d0f2da389b37a3827872d", - "reference": "eb0336758589fe27c79d0f2da389b37a3827872d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/8a5b45f5f235496a263723581060c2a6aff7b71d", + "reference": "8a5b45f5f235496a263723581060c2a6aff7b71d", "shasum": "" }, "require": { @@ -4096,7 +4099,7 @@ "drupal/scheduler": "^1.3", "drupal/search_api": "^1.0", "drupal/select2": "^1.12", - "drupal/simple_sitemap": "^4.1", + "drupal/simple_sitemap": "4.1.7", "drupal/siteimprove": "^2.0", "drupal/social_media": "^2.0", "drupal/stomp": "^2.0", @@ -4110,7 +4113,7 @@ "php": "^8.1" }, "conflict": { - "drupal/core": "<10.1 || >=10.2", + "drupal/core": "<10.2", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/helfi_media_map": "*", "drupal/simple_sitemap": ">4.1.7", @@ -4124,12 +4127,12 @@ "https://www.drupal.org/project/content_lock/issues/3343964": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch" }, "drupal/core": { - "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-10-02/3091246--allow-menu-tree-manipulators-alter--23.patch", + "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-12-18/3091246--allow-menu-tree-manipulators-alter--24.patch", "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299)": "https://www.drupal.org/files/issues/2023-05-07/3163299-104-D10.patch", "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/b628bc051d82a1883768364050aa833824bd48c8/patches/drupal_core_strip_debug_mode_whitespaces_10.1.x.patch", "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", - "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/a42c905a162c8510348b17cdf60000a0a7f82037/patches/drupal-2313309-render-admin-toolbar-with-admin-language.patch", + "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch" }, "drupal/default_content": { @@ -4163,10 +4166,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-12-22T13:09:21+00:00" + "time": "2024-01-12T06:03:47+00:00" }, { "name": "drupal/helfi_proxy", @@ -11898,6 +11901,86 @@ ], "time": "2023-12-30T15:31:44+00:00" }, + { + "name": "symfony/mailer", + "version": "v6.4.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/mailer.git", + "reference": "6da89e5c9202f129717a770a03183fb140720168" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mailer/zipball/6da89e5c9202f129717a770a03183fb140720168", + "reference": "6da89e5c9202f129717a770a03183fb140720168", + "shasum": "" + }, + "require": { + "egulias/email-validator": "^2.1.10|^3|^4", + "php": ">=8.1", + "psr/event-dispatcher": "^1", + "psr/log": "^1|^2|^3", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/messenger": "<6.2", + "symfony/mime": "<6.2", + "symfony/twig-bridge": "<6.2.1" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.2|^7.0", + "symfony/twig-bridge": "^6.2|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps sending emails", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/mailer/tree/v6.4.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-19T09:12:31+00:00" + }, { "name": "symfony/mime", "version": "v6.4.0", @@ -13009,43 +13092,38 @@ }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.3.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e" + "reference": "d32f5898f163266230182432b877ab7623ff252d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/581ca6067eb62640de5ff08ee1ba6850a0ee472e", - "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d32f5898f163266230182432b877ab7623ff252d", + "reference": "d32f5898f163266230182432b877ab7623ff252d", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/http-message": "^1.0 || ^2.0", - "symfony/deprecation-contracts": "^2.5 || ^3.0", - "symfony/http-foundation": "^5.4 || ^6.0" + "php": ">=8.1", + "psr/http-message": "^1.0|^2.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0" + }, + "conflict": { + "php-http/discovery": "<1.15", + "symfony/http-kernel": "<6.2" }, "require-dev": { "nyholm/psr7": "^1.1", - "psr/log": "^1.1 || ^2 || ^3", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/config": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/http-kernel": "^5.4 || ^6.0", - "symfony/phpunit-bridge": "^6.2" - }, - "suggest": { - "nyholm/psr7": "For a super lightweight PSR-7/17 implementation" + "php-http/discovery": "^1.15", + "psr/log": "^1.1.4|^2|^3", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.2|^7.0", + "symfony/http-kernel": "^6.2|^7.0" }, "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-main": "2.3-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" @@ -13065,11 +13143,11 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "PSR HTTP message bridge", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "http", "http-message", @@ -13077,8 +13155,7 @@ "psr-7" ], "support": { - "issues": "https://github.com/symfony/psr-http-message-bridge/issues", - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.3.1" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.2" }, "funding": [ { @@ -13094,7 +13171,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T11:53:26+00:00" + "time": "2023-12-28T07:55:26+00:00" }, { "name": "symfony/routing",