From 83103b133306faba645fb7f68ecf1ddb1891a657 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 3 Dec 2024 16:29:12 +0200 Subject: [PATCH 1/9] UHF-10555: Remove references to deprecated image style 3_2_m that will be removed --- ...ore.entity_view_display.node.news_item.card_teaser.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml index 18570287..8d2a806e 100644 --- a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml +++ b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml @@ -12,10 +12,8 @@ dependencies: - field.field.node.news_item.field_news_item_links_title - field.field.node.news_item.field_news_item_tags - field.field.node.news_item.field_short_title - - image.style.3_2_m - node.type.news_item module: - - media - user id: node.news_item.card_teaser targetEntityType: node @@ -23,11 +21,11 @@ bundle: news_item mode: card_teaser content: field_main_image: - type: media_thumbnail + type: entity_reference_entity_view label: hidden settings: - image_link: '' - image_style: 3_2_m + view_mode: card_teaser + link: false third_party_settings: { } weight: 1 region: content From cf6bdff2d1fc37fcb5127bac39b51f3df68dfc2a Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:11:15 +0000 Subject: [PATCH 2/9] Update configuration --- composer.lock | 12 +-- ..._news_groups.helfi_news_groups.default.yml | 2 +- ...oods.helfi_news_neighbourhoods.default.yml | 2 +- ...elfi_news_tags.helfi_news_tags.default.yml | 2 +- ...rm_display.paragraph.news_list.default.yml | 2 +- ....helfi_hearings.helfi_hearings.default.yml | 2 +- ..._display.helfi_news.helfi_news.default.yml | 12 +-- ...ay.helfi_news.helfi_news.medium_teaser.yml | 15 +--- ..._news_groups.helfi_news_groups.default.yml | 2 +- ...oods.helfi_news_neighbourhoods.default.yml | 2 +- ...elfi_news_tags.helfi_news_tags.default.yml | 2 +- ....entity_view_display.media.image.image.yml | 6 +- ...display.media.image.image_content_area.yml | 44 ---------- ...iew_display.paragraph.hearings.default.yml | 2 +- ...ew_display.paragraph.news_list.default.yml | 3 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 6 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 7 +- ...ity_view_mode.helfi_news.medium_teaser.yml | 2 +- ...ity_view_mode.media.image_content_area.yml | 13 --- ....entity_view_mode.tpr_unit.wide_teaser.yml | 2 +- ...es.external_entity_type.helfi_hearings.yml | 2 +- ...tities.external_entity_type.helfi_news.yml | 2 +- ...external_entity_type.helfi_news_groups.yml | 2 +- ..._entity_type.helfi_news_neighbourhoods.yml | 2 +- ...s.external_entity_type.helfi_news_tags.yml | 2 +- conf/cmi/image.style.1_1_l.yml | 19 ----- conf/cmi/image.style.1_1_l_2x.yml | 26 ------ conf/cmi/image.style.1_1_m.yml | 19 ----- conf/cmi/image.style.1_1_m_2x.yml | 26 ------ conf/cmi/image.style.1_1_s.yml | 19 ----- conf/cmi/image.style.1_1_s_2x.yml | 26 ------ conf/cmi/image.style.1_1_thumbnail.yml | 19 ----- conf/cmi/image.style.1_1_thumbnail_2x.yml | 26 ------ conf/cmi/image.style.1_1_xl.yml | 19 ----- conf/cmi/image.style.1_1_xl_2x.yml | 26 ------ conf/cmi/image.style.1_1_xs.yml | 19 ----- conf/cmi/image.style.1_1_xs_2x.yml | 26 ------ conf/cmi/image.style.23_10_l.yml | 19 ----- conf/cmi/image.style.23_10_l_2x.yml | 26 ------ conf/cmi/image.style.23_10_m.yml | 19 ----- conf/cmi/image.style.23_10_m_2x.yml | 26 ------ conf/cmi/image.style.23_10_s.yml | 19 ----- conf/cmi/image.style.23_10_s_2x.yml | 26 ------ conf/cmi/image.style.23_10_xl.yml | 19 ----- conf/cmi/image.style.23_10_xl_2x.yml | 26 ------ conf/cmi/image.style.23_10_xs.yml | 19 ----- conf/cmi/image.style.23_10_xs_2x.yml | 26 ------ conf/cmi/image.style.23_10_xxs.yml | 19 ----- conf/cmi/image.style.23_10_xxs_2x.yml | 26 ------ conf/cmi/image.style.3_2_l.yml | 19 ----- conf/cmi/image.style.3_2_l_2x.yml | 26 ------ conf/cmi/image.style.3_2_m.yml | 19 ----- conf/cmi/image.style.3_2_m_2x.yml | 26 ------ conf/cmi/image.style.3_2_s.yml | 19 ----- conf/cmi/image.style.3_2_s_2x.yml | 26 ------ conf/cmi/image.style.3_2_xl.yml | 19 ----- conf/cmi/image.style.3_2_xl_2x.yml | 26 ------ conf/cmi/image.style.3_2_xs.yml | 19 ----- conf/cmi/image.style.3_2_xs_2x.yml | 26 ------ conf/cmi/image.style.3_2_xxs.yml | 19 ----- conf/cmi/image.style.3_2_xxs_2x.yml | 26 ------ conf/cmi/image.style.og_image.yml | 19 ----- conf/cmi/image.style.original_l.yml | 17 ---- conf/cmi/image.style.original_l_2x.yml | 25 ------ conf/cmi/image.style.original_m.yml | 17 ---- conf/cmi/image.style.original_m_2x.yml | 25 ------ conf/cmi/image.style.original_s.yml | 17 ---- conf/cmi/image.style.original_s_2x.yml | 25 ------ conf/cmi/image.style.original_xs.yml | 17 ---- conf/cmi/image.style.original_xs_2x.yml | 25 ------ conf/cmi/image.style.original_xxs.yml | 17 ---- conf/cmi/image.style.original_xxs_2x.yml | 25 ------ conf/cmi/image.style.tiny_square_image.yml | 19 ----- ...ponsive_image.styles.gallery_thumbnail.yml | 36 -------- ...sponsive_image.styles.hero__background.yml | 84 ------------------- .../responsive_image.styles.image__3_2.yml | 74 ---------------- ...e_image.styles.image__3_2_content_area.yml | 62 -------------- ..._image.styles.list_of_links__thumbnail.yml | 48 ----------- conf/cmi/responsive_image.styles.original.yml | 74 ---------------- conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- 85 files changed, 46 insertions(+), 1554 deletions(-) delete mode 100644 conf/cmi/core.entity_view_display.media.image.image_content_area.yml delete mode 100644 conf/cmi/core.entity_view_mode.media.image_content_area.yml delete mode 100644 conf/cmi/image.style.1_1_l.yml delete mode 100644 conf/cmi/image.style.1_1_l_2x.yml delete mode 100644 conf/cmi/image.style.1_1_m.yml delete mode 100644 conf/cmi/image.style.1_1_m_2x.yml delete mode 100644 conf/cmi/image.style.1_1_s.yml delete mode 100644 conf/cmi/image.style.1_1_s_2x.yml delete mode 100644 conf/cmi/image.style.1_1_thumbnail.yml delete mode 100644 conf/cmi/image.style.1_1_thumbnail_2x.yml delete mode 100644 conf/cmi/image.style.1_1_xl.yml delete mode 100644 conf/cmi/image.style.1_1_xl_2x.yml delete mode 100644 conf/cmi/image.style.1_1_xs.yml delete mode 100644 conf/cmi/image.style.1_1_xs_2x.yml delete mode 100644 conf/cmi/image.style.23_10_l.yml delete mode 100644 conf/cmi/image.style.23_10_l_2x.yml delete mode 100644 conf/cmi/image.style.23_10_m.yml delete mode 100644 conf/cmi/image.style.23_10_m_2x.yml delete mode 100644 conf/cmi/image.style.23_10_s.yml delete mode 100644 conf/cmi/image.style.23_10_s_2x.yml delete mode 100644 conf/cmi/image.style.23_10_xl.yml delete mode 100644 conf/cmi/image.style.23_10_xl_2x.yml delete mode 100644 conf/cmi/image.style.23_10_xs.yml delete mode 100644 conf/cmi/image.style.23_10_xs_2x.yml delete mode 100644 conf/cmi/image.style.23_10_xxs.yml delete mode 100644 conf/cmi/image.style.23_10_xxs_2x.yml delete mode 100644 conf/cmi/image.style.3_2_l.yml delete mode 100644 conf/cmi/image.style.3_2_l_2x.yml delete mode 100644 conf/cmi/image.style.3_2_m.yml delete mode 100644 conf/cmi/image.style.3_2_m_2x.yml delete mode 100644 conf/cmi/image.style.3_2_s.yml delete mode 100644 conf/cmi/image.style.3_2_s_2x.yml delete mode 100644 conf/cmi/image.style.3_2_xl.yml delete mode 100644 conf/cmi/image.style.3_2_xl_2x.yml delete mode 100644 conf/cmi/image.style.3_2_xs.yml delete mode 100644 conf/cmi/image.style.3_2_xs_2x.yml delete mode 100644 conf/cmi/image.style.3_2_xxs.yml delete mode 100644 conf/cmi/image.style.3_2_xxs_2x.yml delete mode 100644 conf/cmi/image.style.og_image.yml delete mode 100644 conf/cmi/image.style.original_l.yml delete mode 100644 conf/cmi/image.style.original_l_2x.yml delete mode 100644 conf/cmi/image.style.original_m.yml delete mode 100644 conf/cmi/image.style.original_m_2x.yml delete mode 100644 conf/cmi/image.style.original_s.yml delete mode 100644 conf/cmi/image.style.original_s_2x.yml delete mode 100644 conf/cmi/image.style.original_xs.yml delete mode 100644 conf/cmi/image.style.original_xs_2x.yml delete mode 100644 conf/cmi/image.style.original_xxs.yml delete mode 100644 conf/cmi/image.style.original_xxs_2x.yml delete mode 100644 conf/cmi/image.style.tiny_square_image.yml delete mode 100644 conf/cmi/responsive_image.styles.gallery_thumbnail.yml delete mode 100644 conf/cmi/responsive_image.styles.hero__background.yml delete mode 100644 conf/cmi/responsive_image.styles.image__3_2.yml delete mode 100644 conf/cmi/responsive_image.styles.image__3_2_content_area.yml delete mode 100644 conf/cmi/responsive_image.styles.list_of_links__thumbnail.yml delete mode 100644 conf/cmi/responsive_image.styles.original.yml diff --git a/composer.lock b/composer.lock index ffcc2fa9..cf320798 100644 --- a/composer.lock +++ b/composer.lock @@ -4420,16 +4420,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.10", + "version": "4.9.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "2e1c2a4d090084042954e56b0a61e3077d1daf4f" + "reference": "f4d743c2c190af8ebe3b461b9ed2a5ae47b0c1a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2e1c2a4d090084042954e56b0a61e3077d1daf4f", - "reference": "2e1c2a4d090084042954e56b0a61e3077d1daf4f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f4d743c2c190af8ebe3b461b9ed2a5ae47b0c1a1", + "reference": "f4d743c2c190af8ebe3b461b9ed2a5ae47b0c1a1", "shasum": "" }, "require": { @@ -4555,10 +4555,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.10", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.9.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-04T06:14:43+00:00" + "time": "2024-12-05T11:19:41+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml index 054e98a1..8dd181ef 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: F02T5d39fWkrxQUcIJNH58HsHS6OccQWDGWf5qZNY7c + default_config_hash: EOGUC9WPtf2vMJSMaP6aKfU2m9Hu9RwN077GyiffzEg id: helfi_news_groups.helfi_news_groups.default targetEntityType: helfi_news_groups bundle: helfi_news_groups diff --git a/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index 87f00b83..79cb075a 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: RU3muOe23dUCerLvTPHwhNIxcwvS9qSCEsQXdrK_8TU + default_config_hash: 5pvCgxNDIrHGAgTyFHNrnC2YZzNROx1NcwluHLX4q5M id: helfi_news_neighbourhoods.helfi_news_neighbourhoods.default targetEntityType: helfi_news_neighbourhoods bundle: helfi_news_neighbourhoods diff --git a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml index eed8c213..01f9b4bf 100644 --- a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: nG1sU9U2OdZFQu6ff1cBmVKYRDR1n3cI-odUwMY5FLU + default_config_hash: lgQeHC9pFKPzdhr9PnrluCii3b_fhaFqOIkQiGv1tvI id: helfi_news_tags.helfi_news_tags.default targetEntityType: helfi_news_tags bundle: helfi_news_tags diff --git a/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml index 93192bc6..d4c02bb4 100644 --- a/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml @@ -14,7 +14,7 @@ dependencies: - select2 - text _core: - default_config_hash: I_u6U4oQKvo0EjopuKoM3qEFFz3lzE8J-jWIN0OJqYg + default_config_hash: YF0KDv9TqKiRipS_1HUoa6Sh-kQezJL8omZdsSkkK2o id: paragraph.news_list.default targetEntityType: paragraph bundle: news_list diff --git a/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml index a2e83a4b..71dc2737 100644 --- a/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml @@ -8,7 +8,7 @@ dependencies: - external_entities - imagecache_external _core: - default_config_hash: 8hY7p23O5VMnnoWz_4GEuZiFgOaa8mzWA3gP9l5HTJY + default_config_hash: cBPYOxhszng7ivQmMSytxOx4mHccdI_TliX6g1SQ_C8 id: helfi_hearings.helfi_hearings.default targetEntityType: helfi_hearings bundle: helfi_hearings diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml index 76c0309a..6d318336 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -4,23 +4,13 @@ status: true dependencies: module: - external_entities - - imagecache_external _core: - default_config_hash: k-bIvgFdaVICd0s60Gng2zWabkpeZTQ53HF1Eff7zDk + default_config_hash: MK1WwyJih8WwRaem-6cDbbs9ea-7dGXkUwnOJkuEYNU id: helfi_news.helfi_news.default targetEntityType: helfi_news bundle: helfi_news mode: default content: - main_image: - type: imagecache_external_responsive_image - label: hidden - settings: - imagecache_external_link: '' - imagecache_external_responsive_style: gallery_thumbnail - third_party_settings: { } - weight: 1 - region: content title: type: string label: hidden diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml index 319ddad5..38a27a1d 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -6,23 +6,16 @@ dependencies: - core.entity_view_mode.helfi_news.medium_teaser module: - external_entities - - imagecache_external + enforced: + config: + - core.entity_view_mode.helfi_news.medium_teaser _core: - default_config_hash: XArB74ImuiEIsNGh_ic_b4csmzDUre1hUeswj9kCiOc + default_config_hash: mVSIRtxVMh_hPAb97hAa2xLZrKDESmHV1awN18-kwsg id: helfi_news.helfi_news.medium_teaser targetEntityType: helfi_news bundle: helfi_news mode: medium_teaser content: - main_image: - type: imagecache_external_responsive_image - label: hidden - settings: - imagecache_external_link: '' - imagecache_external_responsive_style: gallery_thumbnail - third_party_settings: { } - weight: 1 - region: content title: type: string label: hidden diff --git a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml index bf9771d0..aa728ac2 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: 1dViHV2udCjK9OtxK_k2SyJgGGMR6Lmn6hjIW0cDeuw + default_config_hash: P8btRRLsFGBAXJ6BOUG4RbFBxqHK-7bW9o1s2d4HWCA id: helfi_news_groups.helfi_news_groups.default targetEntityType: helfi_news_groups bundle: helfi_news_groups diff --git a/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index 911deca1..c5072732 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: rMjZgYdPC7TW3kaPdxknJg-VylxJiuxi2oocWRoxEmA + default_config_hash: D9evkjd3Cb3jmo3UG5LInegI7KwGYVPdw-CFm6Kw_EE id: helfi_news_neighbourhoods.helfi_news_neighbourhoods.default targetEntityType: helfi_news_neighbourhoods bundle: helfi_news_neighbourhoods diff --git a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml index af9d45f2..30881892 100644 --- a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: 7T3454JR0Yp3GjMD7t558nldsj9jjZgS8FECvZpLtog + default_config_hash: vFiSBB15m_OJ_YePPGtc2tm3CTHL4JwnmEki_O5O_XU id: helfi_news_tags.helfi_news_tags.default targetEntityType: helfi_news_tags bundle: helfi_news_tags 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 c2689b97..ebbbd5c7 100644 --- a/conf/cmi/core.entity_view_display.media.image.image.yml +++ b/conf/cmi/core.entity_view_display.media.image.image.yml @@ -7,11 +7,11 @@ dependencies: - field.field.media.image.field_media_image - field.field.media.image.field_photographer - media.type.image - - responsive_image.styles.image__3_2 + - responsive_image.styles.image_fixed module: - responsive_image _core: - default_config_hash: 66iWopqoZgN6srOHx13N5NNQwoS0eUWAiw0gHzgwLQM + default_config_hash: GWywnVFR6qXEI67rhg-mzn27BUF4oKJUWGI6hmwLMEg id: media.image.image targetEntityType: media bundle: image @@ -21,7 +21,7 @@ content: type: responsive_image label: hidden settings: - responsive_image_style: image__3_2 + responsive_image_style: image_fixed image_link: '' image_loading: attribute: eager diff --git a/conf/cmi/core.entity_view_display.media.image.image_content_area.yml b/conf/cmi/core.entity_view_display.media.image.image_content_area.yml deleted file mode 100644 index 20e0b49d..00000000 --- a/conf/cmi/core.entity_view_display.media.image.image_content_area.yml +++ /dev/null @@ -1,44 +0,0 @@ -uuid: 41842b04-5773-4f90-b612-d9e52fb63a2e -langcode: en -status: true -dependencies: - config: - - core.entity_view_mode.media.image_content_area - - field.field.media.image.field_media_image - - field.field.media.image.field_photographer - - media.type.image - - responsive_image.styles.image__3_2_content_area - module: - - responsive_image -_core: - default_config_hash: MZpbEb0do-aokpqsEv3TyeHe_lFfC5LLoWE0a53dN3Y -id: media.image.image_content_area -targetEntityType: media -bundle: image -mode: image_content_area -content: - field_media_image: - type: responsive_image - label: hidden - settings: - responsive_image_style: image__3_2_content_area - image_link: '' - image_loading: - attribute: eager - third_party_settings: { } - weight: 0 - region: content - field_photographer: - type: string - label: inline - settings: - link_to_entity: false - third_party_settings: { } - weight: 1 - region: content -hidden: - created: true - langcode: true - name: true - thumbnail: true - uid: true diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml index 79bb92b6..996451f7 100644 --- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -31,9 +31,9 @@ content: weight: 0 region: content list: + weight: 100 settings: { } third_party_settings: { } - weight: 100 region: content hidden: search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml index 8fece137..cfbb4b73 100644 --- a/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml @@ -13,7 +13,7 @@ dependencies: module: - text _core: - default_config_hash: eCdT_XU1aIhxOLfurTn16KTFSsxHyWZu3HHm3q_5Mi8 + default_config_hash: IaEztQ64zKXiAxNk4HFBTSTDjzF0hFmzqkZp7KB8T5M id: paragraph.news_list.default targetEntityType: paragraph bundle: news_list @@ -68,3 +68,4 @@ content: region: content hidden: field_limit: true + search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 138f681a..3cef4936 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -10,13 +10,13 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_phone_label - field.field.tpr_unit.tpr_unit.field_phone_with_contacts - field.field.tpr_unit.tpr_unit.field_unit_type - - responsive_image.styles.image__3_2 + - responsive_image.styles.card module: - address - helfi_tpr - imagecache_external _core: - default_config_hash: m1bmfjjZv3vQY6PgMNy1iVlUMSu481oOvcyJZSDTlvs + default_config_hash: ctt6rryxXp2PBk9I1z8LLlWNoGcu0732NmKK-bDSQv8 id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -50,7 +50,7 @@ content: label: hidden settings: imagecache_external_link: '' - imagecache_external_responsive_style: image__3_2 + imagecache_external_responsive_style: card third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index 97ef330f..643d598b 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -10,14 +10,14 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_phone_label - field.field.tpr_unit.tpr_unit.field_phone_with_contacts - field.field.tpr_unit.tpr_unit.field_unit_type - - responsive_image.styles.image__3_2 + - responsive_image.styles.card module: - address - helfi_tpr - imagecache_external - telephone _core: - default_config_hash: cckwj35wWsGAYunHIdT0rY9aYhkXdHeMC-kIFwe8cpY + default_config_hash: hu51est7v1-21W9reK5D3A_KRi2AI7Y5CcRdE-LSDpM id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -66,7 +66,7 @@ content: label: hidden settings: imagecache_external_link: '' - imagecache_external_responsive_style: image__3_2 + imagecache_external_responsive_style: card third_party_settings: { } weight: 0 region: content @@ -106,6 +106,7 @@ hidden: other_info: true price_info: true provided_languages: true + search_api_excerpt: true service_map_embed: true services: true show_www: true diff --git a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml index f1d59f12..02d68f2a 100644 --- a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml +++ b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml @@ -5,7 +5,7 @@ dependencies: module: - external_entities _core: - default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk + default_config_hash: Fl8HX68URx0CChkXzE5wAEZ9p94KnjuIbgmVIo6r5n4 id: helfi_news.medium_teaser label: 'Medium Teaser' description: '' diff --git a/conf/cmi/core.entity_view_mode.media.image_content_area.yml b/conf/cmi/core.entity_view_mode.media.image_content_area.yml deleted file mode 100644 index a4ea6d39..00000000 --- a/conf/cmi/core.entity_view_mode.media.image_content_area.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 12d34f00-9adb-403e-ae60-4b8039195eff -langcode: en -status: true -dependencies: - module: - - media -_core: - default_config_hash: u4xPVzzez1KP66PPTRiynkPmjXyIwJw6Nqjz01tLAjQ -id: media.image_content_area -label: 'Image (content area)' -description: '' -targetEntityType: media -cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml index 281f64da..c9dfb869 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml @@ -5,7 +5,7 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: LHSCUu61QmAp9xLqPCXxulNsrk79jkqds89okZ9vqWo + default_config_hash: LKz6DnZ1UOXMUzGrs2iLhTFxw7vsBXkAlO_VZznAe7U id: tpr_unit.wide_teaser label: 'Wide Teaser' description: '' diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index e32ea709..a9d27ade 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -read_only: true generate_aliases: false +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index b56a9bff..acaeb670 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -8,8 +8,8 @@ id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' -read_only: true generate_aliases: false +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index 2e213e2c..7ff66073 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -8,8 +8,8 @@ id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 61a08a75..f22d0083 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 37ff4a4f..0e645be5 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -8,8 +8,8 @@ id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/image.style.1_1_l.yml b/conf/cmi/image.style.1_1_l.yml deleted file mode 100644 index ec736167..00000000 --- a/conf/cmi/image.style.1_1_l.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 73253acc-cca6-4afd-a283-35591842b565 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: 6KuaGjC8cwLut5pYHsPhg6fzRJxZQtZdjeCU64jccSE -name: 1_1_l -label: 'DEPRECATED 1:1 L' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1440 - height: 1440 - crop_type: focal_point diff --git a/conf/cmi/image.style.1_1_l_2x.yml b/conf/cmi/image.style.1_1_l_2x.yml deleted file mode 100644 index b27b9b9e..00000000 --- a/conf/cmi/image.style.1_1_l_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 48aa5cad-eb64-4b64-b24f-f5fefa9a69f5 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: u08uAeZT1UXF3SARJPNz6Tws0UIHKQEj7ZjFxcX2ALM -name: 1_1_l_2x -label: 'DEPRECATED 1:1 L (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2880 - height: 2880 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.1_1_m.yml b/conf/cmi/image.style.1_1_m.yml deleted file mode 100644 index e1f32bbf..00000000 --- a/conf/cmi/image.style.1_1_m.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 75c0d5e3-7345-497f-9335-263ce2ea095f -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: LqLBoZOKcVZ2rZbMTe6sbkb_MvWBSLeeYQxyuAZL4xk -name: 1_1_m -label: 'DEPRECATED 1:1 M' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1024 - height: 1024 - crop_type: focal_point diff --git a/conf/cmi/image.style.1_1_m_2x.yml b/conf/cmi/image.style.1_1_m_2x.yml deleted file mode 100644 index 240f9a8a..00000000 --- a/conf/cmi/image.style.1_1_m_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: e005b7f8-9c80-4573-8c4e-1385be8c8fc9 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: Mwyb-66HcJ7u_sLH1ep9mb5RqgcIVBqgYuQiZdRuJwU -name: 1_1_m_2x -label: 'DEPRECATED 1:1 M (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2048 - height: 2048 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.1_1_s.yml b/conf/cmi/image.style.1_1_s.yml deleted file mode 100644 index 3758a860..00000000 --- a/conf/cmi/image.style.1_1_s.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: fc956ce4-c148-419a-badd-83ac1f3d3635 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: OGflPQXUa_UEp9IDNV80qWSDiJvBtUd9-U0nOm8IHCk -name: 1_1_s -label: 'DEPRECATED 1:1 S' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 800 - height: 800 - crop_type: focal_point diff --git a/conf/cmi/image.style.1_1_s_2x.yml b/conf/cmi/image.style.1_1_s_2x.yml deleted file mode 100644 index ef753854..00000000 --- a/conf/cmi/image.style.1_1_s_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 915ccdcf-df29-4166-a38c-d5595de8a889 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: 9PoXTCXPob9AL2xdfTIOmsy8sOkRb3KiPLr6t-_XtHI -name: 1_1_s_2x -label: 'DEPRECATED 1:1 S (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1600 - height: 1600 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.1_1_thumbnail.yml b/conf/cmi/image.style.1_1_thumbnail.yml deleted file mode 100644 index 51e2dafa..00000000 --- a/conf/cmi/image.style.1_1_thumbnail.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: b60883ee-86af-4110-a0ed-32c0bb193547 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: 6feCmjAD3-ymvNbvhvJXfyzI6etlEtsKsPBJR5ncSgE -name: 1_1_thumbnail -label: 'DEPRECATED 1:1 thumbnail' -effects: - 281cebc2-0471-44f8-a46c-4111298d4398: - uuid: 281cebc2-0471-44f8-a46c-4111298d4398 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 180 - height: 180 - crop_type: focal_point diff --git a/conf/cmi/image.style.1_1_thumbnail_2x.yml b/conf/cmi/image.style.1_1_thumbnail_2x.yml deleted file mode 100644 index a1e5bbf3..00000000 --- a/conf/cmi/image.style.1_1_thumbnail_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: fd5a77ee-11c7-445c-a972-915819cb07fe -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: OK6Omg4TMT2YuLeYsPibZMORaqlmapXdBh7Yntw_-Ec -name: 1_1_thumbnail_2x -label: 'DEPRECATED 1:1 thumbnail (2x)' -effects: - bbeb2baa-6c3e-4865-a1e4-c7e35f9fa4eb: - uuid: bbeb2baa-6c3e-4865-a1e4-c7e35f9fa4eb - id: focal_point_scale_and_crop - weight: 1 - data: - width: 360 - height: 360 - crop_type: focal_point - b101e3cd-1bc6-421f-9148-b989422d754e: - uuid: b101e3cd-1bc6-421f-9148-b989422d754e - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.1_1_xl.yml b/conf/cmi/image.style.1_1_xl.yml deleted file mode 100644 index d394680b..00000000 --- a/conf/cmi/image.style.1_1_xl.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: edc90217-f37f-4ab6-bcce-4870b8e1d07a -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: yBm4EzOiT8w_YSpljMorDAaW_JNJzPt99t3luLgEiEk -name: 1_1_xl -label: 'DEPRECATED 1:1 XL' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1920 - height: 1920 - crop_type: focal_point diff --git a/conf/cmi/image.style.1_1_xl_2x.yml b/conf/cmi/image.style.1_1_xl_2x.yml deleted file mode 100644 index 4a2bf452..00000000 --- a/conf/cmi/image.style.1_1_xl_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: bfaf953d-a8cc-4aeb-8457-a307218e4081 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: RNHRItyWjqsf5-8Dio9tA6IUh3xrWn1ygUUf7Of0mPY -name: 1_1_xl_2x -label: 'DEPRECATED 1:1 XL (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 3840 - height: 3840 - crop_type: focal_point - 4b95d242-03d3-43e7-b80b-80d660ed0a26: - uuid: 4b95d242-03d3-43e7-b80b-80d660ed0a26 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.1_1_xs.yml b/conf/cmi/image.style.1_1_xs.yml deleted file mode 100644 index 337e1446..00000000 --- a/conf/cmi/image.style.1_1_xs.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: f2f392c0-d644-4543-ac64-8c196ec3b350 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: nFT0n8Dr5zcKt2l7pCYKd3D97sk9lOQ6PXzxwzow_uY -name: 1_1_xs -label: 'DEPRECATED 1:1 XS' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 600 - height: 600 - crop_type: focal_point diff --git a/conf/cmi/image.style.1_1_xs_2x.yml b/conf/cmi/image.style.1_1_xs_2x.yml deleted file mode 100644 index 8418b680..00000000 --- a/conf/cmi/image.style.1_1_xs_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 82d69b47-482d-4207-8839-357fe0ae79f7 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: Pr8W4QzEMXRcyXmoQKisapC2VthnJQqJQHbG9FfcOLU -name: 1_1_xs_2x -label: 'DEPRECATED 1:1 XS (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 1200 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.23_10_l.yml b/conf/cmi/image.style.23_10_l.yml deleted file mode 100644 index d12ee37c..00000000 --- a/conf/cmi/image.style.23_10_l.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 28715aaf-a45d-49fe-864f-5d6b67883cfd -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: GtZ7ok5gSTR4vVmGttRPS7po0TZe9SjvdDb_m8flrJM -name: 23_10_l -label: 'DEPRECATED 2.3:1 L' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1440 - height: 626 - crop_type: focal_point diff --git a/conf/cmi/image.style.23_10_l_2x.yml b/conf/cmi/image.style.23_10_l_2x.yml deleted file mode 100644 index a23d5993..00000000 --- a/conf/cmi/image.style.23_10_l_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: a7993fdd-7c81-4636-8357-86b71970e0ef -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: uGMk4f_duO_i9JbM1nOthF_kv_c7EsgNG7uoW1ppgJo -name: 23_10_l_2x -label: 'DEPRECATED 2.3:1 L (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2880 - height: 1252 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.23_10_m.yml b/conf/cmi/image.style.23_10_m.yml deleted file mode 100644 index 136e82ec..00000000 --- a/conf/cmi/image.style.23_10_m.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 60606bca-5fe0-4f3c-be17-fec350331c8b -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: 0gKEkO8YDo5m_otNzFPfdFQTYZiUBti8s_84RyW23VQ -name: 23_10_m -label: 'DEPRECATED 2.3:1 M' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1024 - height: 445 - crop_type: focal_point diff --git a/conf/cmi/image.style.23_10_m_2x.yml b/conf/cmi/image.style.23_10_m_2x.yml deleted file mode 100644 index d92cca77..00000000 --- a/conf/cmi/image.style.23_10_m_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: cb940cfe-8e9c-415d-90f2-be5427628f47 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: slrB4hH_AbQc4IVcHpN50_VBeFmAMgMzXEypD7bhkuw -name: 23_10_m_2x -label: 'DEPRECATED 2.3:1 M (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2048 - height: 890 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.23_10_s.yml b/conf/cmi/image.style.23_10_s.yml deleted file mode 100644 index 56c6e40f..00000000 --- a/conf/cmi/image.style.23_10_s.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: fc8c3753-eebc-4faf-b5ce-0450645be9cc -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: rMgj9QkEhrrZqsGTV_uRdHD7GTGPn4d5fbwxSg3p_m0 -name: 23_10_s -label: 'DEPRECATED 2.3:1 S' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 800 - height: 348 - crop_type: focal_point diff --git a/conf/cmi/image.style.23_10_s_2x.yml b/conf/cmi/image.style.23_10_s_2x.yml deleted file mode 100644 index 1285f1d8..00000000 --- a/conf/cmi/image.style.23_10_s_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: cb8b6483-f8ca-4286-8c95-b6790e9976e6 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: 72mNN0vqh_S2LvL8Z1tv10cVGajzTbZTUiUy-a9TXok -name: 23_10_s_2x -label: 'DEPRECATED 2.3:1 S (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1600 - height: 696 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.23_10_xl.yml b/conf/cmi/image.style.23_10_xl.yml deleted file mode 100644 index 0cf7804f..00000000 --- a/conf/cmi/image.style.23_10_xl.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 6d6a1bfb-ecf4-43e2-8336-70af701b2bfd -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: xAdLMPn-9nvS2YycaCDt9hCKd_9aPqBPaUde2mTr4Vs -name: 23_10_xl -label: 'DEPRECATED 2.3:1 XL' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1920 - height: 835 - crop_type: focal_point diff --git a/conf/cmi/image.style.23_10_xl_2x.yml b/conf/cmi/image.style.23_10_xl_2x.yml deleted file mode 100644 index 444e8aaa..00000000 --- a/conf/cmi/image.style.23_10_xl_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 5b21d3d6-e07f-4887-871a-5d8d13fe1f1d -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: JdPQxpewkFGZBMg-RN0ZrKzptvf-GDvkC4mQub69CjY -name: 23_10_xl_2x -label: 'DEPRECATED 2.3:1 XL (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 3840 - height: 1670 - crop_type: focal_point - 4b95d242-03d3-43e7-b80b-80d660ed0a26: - uuid: 4b95d242-03d3-43e7-b80b-80d660ed0a26 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.23_10_xs.yml b/conf/cmi/image.style.23_10_xs.yml deleted file mode 100644 index 28f3e03f..00000000 --- a/conf/cmi/image.style.23_10_xs.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: e12f886d-61d7-4f1d-9028-f8279f2fe33e -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: x8oJnGM5EKjuZHrgMhTchPkQe96BjR20gOsODlghON0 -name: 23_10_xs -label: 'DEPRECATED 2.3:1 XS' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 600 - height: 261 - crop_type: focal_point diff --git a/conf/cmi/image.style.23_10_xs_2x.yml b/conf/cmi/image.style.23_10_xs_2x.yml deleted file mode 100644 index 076bd2c2..00000000 --- a/conf/cmi/image.style.23_10_xs_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: d7688cea-abfc-40aa-99f8-e8ca6a980069 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: AlwB0elwADW_CFogbAD03l-h4k0N-_cXnAX9Q3CKnUk -name: 23_10_xs_2x -label: 'DEPRECATED 2.3:1 XS (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 522 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.23_10_xxs.yml b/conf/cmi/image.style.23_10_xxs.yml deleted file mode 100644 index 31c1a1ab..00000000 --- a/conf/cmi/image.style.23_10_xxs.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: c6e1454b-31b2-4526-be89-e478b28adb23 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: SZNOV7oU1JqYAyzaUTIE-pFiBli1Lhe0esIDYMl4WH8 -name: 23_10_xxs -label: 'DEPRECATED 2.3:1 XXS' -effects: - 6e091026-4f44-46e3-a4ac-aef3e6e3571b: - uuid: 6e091026-4f44-46e3-a4ac-aef3e6e3571b - id: focal_point_scale_and_crop - weight: 1 - data: - width: 320 - height: 139 - crop_type: focal_point diff --git a/conf/cmi/image.style.23_10_xxs_2x.yml b/conf/cmi/image.style.23_10_xxs_2x.yml deleted file mode 100644 index 66c8a6f0..00000000 --- a/conf/cmi/image.style.23_10_xxs_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 18e87bc2-3456-4755-aa26-82eb2147a73f -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: u0nuaLiRyJSEFoe94tacyJbONK8cP6NI907ZqrUQyaM -name: 23_10_xxs_2x -label: 'DEPRECATED 2.3:1 XXS (2X)' -effects: - a9f4372f-0393-406a-b2e9-c388fd1374f1: - uuid: a9f4372f-0393-406a-b2e9-c388fd1374f1 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 640 - height: 278 - crop_type: focal_point - 6c4d1aca-1b29-495e-8d33-cf39504feb5a: - uuid: 6c4d1aca-1b29-495e-8d33-cf39504feb5a - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.3_2_l.yml b/conf/cmi/image.style.3_2_l.yml deleted file mode 100644 index 4c8175c2..00000000 --- a/conf/cmi/image.style.3_2_l.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 48d39a5c-cbae-4c38-847b-6e05d99270d8 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: mCB-_azbdKbZEl3q12J2Po4QXx_6tu1Ba_29FRNVc2E -name: 3_2_l -label: 'DEPRECATED 3:2 L' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1440 - height: 960 - crop_type: focal_point diff --git a/conf/cmi/image.style.3_2_l_2x.yml b/conf/cmi/image.style.3_2_l_2x.yml deleted file mode 100644 index d3cee0e5..00000000 --- a/conf/cmi/image.style.3_2_l_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: d8931f15-1e4d-49bf-a350-e3ca6e594a13 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: qCqH9ADpP75ngfGEbTMCR-YQ14qvlYhWN0zjfg6au2g -name: 3_2_l_2x -label: 'DEPRECATED 3:2 L (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2880 - height: 1920 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.3_2_m.yml b/conf/cmi/image.style.3_2_m.yml deleted file mode 100644 index 114a430a..00000000 --- a/conf/cmi/image.style.3_2_m.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: ca871f14-61a6-485a-9473-d06d5a3081df -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: MWSSvcBWyvp3LLDB9JU6qSePQNfAslsVSihgjVCNFtw -name: 3_2_m -label: 'DEPRECATED 3:2 M' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1024 - height: 683 - crop_type: focal_point diff --git a/conf/cmi/image.style.3_2_m_2x.yml b/conf/cmi/image.style.3_2_m_2x.yml deleted file mode 100644 index 1626a9ca..00000000 --- a/conf/cmi/image.style.3_2_m_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: d6b861b1-0d26-41a7-829b-db4ca4b94914 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: _LxtEmPdCIfKsiRMHfh1HKNHa9-Hd559xJIB3foAAjw -name: 3_2_m_2x -label: 'DEPRECATED 3:2 M (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2048 - height: 1366 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.3_2_s.yml b/conf/cmi/image.style.3_2_s.yml deleted file mode 100644 index 559c638e..00000000 --- a/conf/cmi/image.style.3_2_s.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 101d0eb7-9c09-4887-a1bf-81bb20a0a383 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: f95FWRTLQHHlFyXCrzbf5SOAcTB0tis3mGItiruimbo -name: 3_2_s -label: 'DEPRECATED 3:2 S' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 800 - height: 533 - crop_type: focal_point diff --git a/conf/cmi/image.style.3_2_s_2x.yml b/conf/cmi/image.style.3_2_s_2x.yml deleted file mode 100644 index c3a05057..00000000 --- a/conf/cmi/image.style.3_2_s_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: f86141de-f6ba-4598-a226-1da89fffb2f5 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: xOxIfe8q5DEbvGmk0lSYGGrpGR6WWfqEQmNqKaDY0h0 -name: 3_2_s_2x -label: 'DEPRECATED 3:2 S (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1600 - height: 1066 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.3_2_xl.yml b/conf/cmi/image.style.3_2_xl.yml deleted file mode 100644 index cecf8071..00000000 --- a/conf/cmi/image.style.3_2_xl.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 192e2362-c6ff-421a-9170-1ecf30400314 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: c9SAUvH9mq34hLv0rzhGazsBwBKwOgQ-JeQSi9dVyIM -name: 3_2_xl -label: 'DEPRECATED 3:2 XL' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1920 - height: 1280 - crop_type: focal_point diff --git a/conf/cmi/image.style.3_2_xl_2x.yml b/conf/cmi/image.style.3_2_xl_2x.yml deleted file mode 100644 index 108c02cc..00000000 --- a/conf/cmi/image.style.3_2_xl_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 67f6fd76-7f36-4471-96b3-afab37889e52 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: l8RzyKtYmcc2og42ZwwiwItanbICJ4DEUpHy9oZr4eg -name: 3_2_xl_2x -label: 'DEPRECATED 3:2 XL (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 3840 - height: 2560 - crop_type: focal_point - 4b95d242-03d3-43e7-b80b-80d660ed0a26: - uuid: 4b95d242-03d3-43e7-b80b-80d660ed0a26 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.3_2_xs.yml b/conf/cmi/image.style.3_2_xs.yml deleted file mode 100644 index 0775b203..00000000 --- a/conf/cmi/image.style.3_2_xs.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: f8e4b7a3-4004-4e47-82ee-49504469974f -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: G1bouWmwoQe4oBVudz5IJGm4m0u7e9ISnRBE9qSwCrw -name: 3_2_xs -label: 'DEPRECATED 3:2 XS' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 600 - height: 400 - crop_type: focal_point diff --git a/conf/cmi/image.style.3_2_xs_2x.yml b/conf/cmi/image.style.3_2_xs_2x.yml deleted file mode 100644 index 0f52216b..00000000 --- a/conf/cmi/image.style.3_2_xs_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 6a1ef034-0d7d-4e04-b8fd-089b44f86c30 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: eh5eGlRyMThZUB4jxxirXGYBOV6z3ffp11KnOTvus20 -name: 3_2_xs_2x -label: 'DEPRECATED 3:2 XS (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 800 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.3_2_xxs.yml b/conf/cmi/image.style.3_2_xxs.yml deleted file mode 100644 index 0d38ac7b..00000000 --- a/conf/cmi/image.style.3_2_xxs.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: dfebd43d-df3e-4ced-bb90-0d57b4720682 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: BkiNb7zRaNx8r1nmi7i9A7XO4-mYyM69D6f9-CCLfSE -name: 3_2_xxs -label: 'DEPRECATED 3:2 XXS' -effects: - 6bc1f53e-970d-4a85-a1a0-c41af5f5834b: - uuid: 6bc1f53e-970d-4a85-a1a0-c41af5f5834b - id: focal_point_scale_and_crop - weight: 1 - data: - width: 320 - height: 213 - crop_type: focal_point diff --git a/conf/cmi/image.style.3_2_xxs_2x.yml b/conf/cmi/image.style.3_2_xxs_2x.yml deleted file mode 100644 index 04bdab37..00000000 --- a/conf/cmi/image.style.3_2_xxs_2x.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 4bb9344e-3199-4399-affe-4e24047b15ee -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -_core: - default_config_hash: ZnqeK9nLlCVfJ5xi7b3p0cNpgl4y9qVIvaC4Jy4e46Q -name: 3_2_xxs_2x -label: 'DEPRECATED 3:2 XXS (2x)' -effects: - 04ed67a0-ed4c-4b01-b5be-cee1205f62d8: - uuid: 04ed67a0-ed4c-4b01-b5be-cee1205f62d8 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 640 - height: 427 - crop_type: focal_point - e7aa43d0-465e-4fd2-b3bd-c5cfa976bdd0: - uuid: e7aa43d0-465e-4fd2-b3bd-c5cfa976bdd0 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.og_image.yml b/conf/cmi/image.style.og_image.yml deleted file mode 100644 index be8a5911..00000000 --- a/conf/cmi/image.style.og_image.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: a3fbe7e8-d1b3-4828-8359-74c27b6d3930 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: tzqBusTR7kqzGRAxAUVc29eKHcm3CieZaMfFEKSHo3o -name: og_image -label: 'DEPRECATED OG Image' -effects: - 828a0b3f-55e7-4534-9248-c3e02c1fd93c: - uuid: 828a0b3f-55e7-4534-9248-c3e02c1fd93c - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 630 - crop_type: focal_point diff --git a/conf/cmi/image.style.original_l.yml b/conf/cmi/image.style.original_l.yml deleted file mode 100644 index 01c275d0..00000000 --- a/conf/cmi/image.style.original_l.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: ed2e62fb-6ad8-49f4-9e82-bcd79cfe81b0 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: o0gzx8TBc00cT43OAP4wfbuE8qkxiejrnkxP7GurMvE -name: original_l -label: 'DEPRECATED Original L' -effects: - 0c465a35-1ef2-4e25-b6a9-30b461a5f89d: - uuid: 0c465a35-1ef2-4e25-b6a9-30b461a5f89d - id: image_scale - weight: 1 - data: - width: 1200 - height: null - upscale: true diff --git a/conf/cmi/image.style.original_l_2x.yml b/conf/cmi/image.style.original_l_2x.yml deleted file mode 100644 index 6b9c1c04..00000000 --- a/conf/cmi/image.style.original_l_2x.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 9cd7a667-328d-45c8-96ff-42fee5e8b32d -langcode: en -status: true -dependencies: - module: - - image_style_quality -_core: - default_config_hash: z2bK6ewj3BFyYdJMWt8VwbL2VBdLfEGETXtm3R5LFdM -name: original_l_2x -label: 'DEPRECATED Original L (2x)' -effects: - 0249bded-7547-49ab-b241-4d6f8b6973f6: - uuid: 0249bded-7547-49ab-b241-4d6f8b6973f6 - id: image_scale - weight: 1 - data: - width: 2400 - height: null - upscale: true - b80b3bcc-ae09-4126-8c1d-af47b9390cf8: - uuid: b80b3bcc-ae09-4126-8c1d-af47b9390cf8 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.original_m.yml b/conf/cmi/image.style.original_m.yml deleted file mode 100644 index b9193a11..00000000 --- a/conf/cmi/image.style.original_m.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 057a06b8-e544-4d0a-9fe1-aa10d71af131 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: gLRqdI5DRlEyX5LTlZAHW9Yr8ZZ-Ghv6-3ttvpkm5L4 -name: original_m -label: 'DEPRECATED Original M' -effects: - d223a0ce-9eaa-472d-89ef-d1d82b407a66: - uuid: d223a0ce-9eaa-472d-89ef-d1d82b407a66 - id: image_scale - weight: 1 - data: - width: 943 - height: null - upscale: true diff --git a/conf/cmi/image.style.original_m_2x.yml b/conf/cmi/image.style.original_m_2x.yml deleted file mode 100644 index b87f55aa..00000000 --- a/conf/cmi/image.style.original_m_2x.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 359ddcdf-2ffe-4253-b8c5-18dbf507ba25 -langcode: en -status: true -dependencies: - module: - - image_style_quality -_core: - default_config_hash: Xm_4TTEYVFIIJ0DNY8sAqMrJKuN2Bjep97ZtJatKl_I -name: original_m_2x -label: 'DEPRECATED Original M (2x)' -effects: - 030a8bc9-6a90-44d4-b920-691c51ace740: - uuid: 030a8bc9-6a90-44d4-b920-691c51ace740 - id: image_scale - weight: 1 - data: - width: 1886 - height: null - upscale: true - 02e23d47-dd80-431b-a22e-a9799489208e: - uuid: 02e23d47-dd80-431b-a22e-a9799489208e - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.original_s.yml b/conf/cmi/image.style.original_s.yml deleted file mode 100644 index 5f746e11..00000000 --- a/conf/cmi/image.style.original_s.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: aaa7bedc-6743-4951-acef-d0e40fcc4d4a -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: nL-s2QZQZ3pCCc6wJTMosBKAr33QkR-q-SO9tz4N3EY -name: original_s -label: 'DEPRECATED Original S' -effects: - 409c7a0a-40f8-4f01-a20d-28fce5e24ed1: - uuid: 409c7a0a-40f8-4f01-a20d-28fce5e24ed1 - id: image_scale - weight: 1 - data: - width: 768 - height: null - upscale: true diff --git a/conf/cmi/image.style.original_s_2x.yml b/conf/cmi/image.style.original_s_2x.yml deleted file mode 100644 index cf29dc8a..00000000 --- a/conf/cmi/image.style.original_s_2x.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 6f553049-b0db-4ab7-a7b2-7c3a2d2b4235 -langcode: en -status: true -dependencies: - module: - - image_style_quality -_core: - default_config_hash: dfvLCqw-WiM77oh4k8aFLcafVRpcQo7n1W18U1o_A-0 -name: original_s_2x -label: 'DEPRECATED Original S (2x)' -effects: - 4a8a2af8-c602-444e-9d0d-9ae25bdc428a: - uuid: 4a8a2af8-c602-444e-9d0d-9ae25bdc428a - id: image_scale - weight: 1 - data: - width: 1535 - height: null - upscale: true - 9dc8ae09-bca0-4c20-81ce-3324078d1084: - uuid: 9dc8ae09-bca0-4c20-81ce-3324078d1084 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.original_xs.yml b/conf/cmi/image.style.original_xs.yml deleted file mode 100644 index 96789541..00000000 --- a/conf/cmi/image.style.original_xs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: a4a0cbf3-766c-402e-965e-87d29e78369d -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: pejkyjy-mAWXj-wnRX5-oiyggwjFNqqvllnUze4hANQ -name: original_xs -label: 'DEPRECATED Original XS' -effects: - 41feb5a7-5a5f-432f-a6f4-ef53ae096713: - uuid: 41feb5a7-5a5f-432f-a6f4-ef53ae096713 - id: image_scale - weight: 1 - data: - width: 576 - height: null - upscale: true diff --git a/conf/cmi/image.style.original_xs_2x.yml b/conf/cmi/image.style.original_xs_2x.yml deleted file mode 100644 index 623d8e10..00000000 --- a/conf/cmi/image.style.original_xs_2x.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: b0848f08-2d14-4cfd-8e57-e76e40bebde1 -langcode: en -status: true -dependencies: - module: - - image_style_quality -_core: - default_config_hash: cu83L0yj3sxDuTG67RCPj0HaRumkXeWWaHB96Z6KOhE -name: original_xs_2x -label: 'DEPRECATED Original XS (2x)' -effects: - a3a2adef-0ea9-4dc0-93bc-f9e1bb2a2545: - uuid: a3a2adef-0ea9-4dc0-93bc-f9e1bb2a2545 - id: image_scale - weight: 1 - data: - width: 1152 - height: null - upscale: true - 1d56f6dd-eff0-4213-95ea-6304b0dddb20: - uuid: 1d56f6dd-eff0-4213-95ea-6304b0dddb20 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.original_xxs.yml b/conf/cmi/image.style.original_xxs.yml deleted file mode 100644 index 7c058e5c..00000000 --- a/conf/cmi/image.style.original_xxs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 44034d66-0839-45a2-9c99-7ae6e99e858e -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: LGExzJfpNZgHRCUCrbNKqujefGFdSNI2C-UKoAwyOwo -name: original_xxs -label: 'DEPRECATED Original XXS' -effects: - 414ab756-ad1e-443d-9818-065d764efefc: - uuid: 414ab756-ad1e-443d-9818-065d764efefc - id: image_scale - weight: 1 - data: - width: 320 - height: null - upscale: true diff --git a/conf/cmi/image.style.original_xxs_2x.yml b/conf/cmi/image.style.original_xxs_2x.yml deleted file mode 100644 index 4c5ce645..00000000 --- a/conf/cmi/image.style.original_xxs_2x.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 0571c0d6-00ed-478a-b0e9-9d384a16637e -langcode: en -status: true -dependencies: - module: - - image_style_quality -_core: - default_config_hash: 0XCAQyIB-BdC_FJ1DOCbF-sGhyyicytlE1C352hDmOA -name: original_xxs_2x -label: 'DEPRECATED Original XXS (2x)' -effects: - c96a6172-5713-4b5c-ab12-fe821d715ddb: - uuid: c96a6172-5713-4b5c-ab12-fe821d715ddb - id: image_scale - weight: 1 - data: - width: 640 - height: null - upscale: true - ad88bb2e-9122-43b0-aa76-8b8a463e8a27: - uuid: ad88bb2e-9122-43b0-aa76-8b8a463e8a27 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/conf/cmi/image.style.tiny_square_image.yml b/conf/cmi/image.style.tiny_square_image.yml deleted file mode 100644 index 1251b8ec..00000000 --- a/conf/cmi/image.style.tiny_square_image.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 9898305d-b778-4faa-90b0-1e6c0bd0d2f3 -langcode: en -status: true -dependencies: - module: - - focal_point -_core: - default_config_hash: 3AlHxoqoyMbZsKPAC0EZwyn-mbA_92f7YZ0KXeUoRu0 -name: tiny_square_image -label: 'DEPRECATED Tiny Square Image (200x200)' -effects: - c3a0bc95-5d64-4f1e-a46e-dd25f6787fd7: - uuid: c3a0bc95-5d64-4f1e-a46e-dd25f6787fd7 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 200 - height: 200 - crop_type: focal_point diff --git a/conf/cmi/responsive_image.styles.gallery_thumbnail.yml b/conf/cmi/responsive_image.styles.gallery_thumbnail.yml deleted file mode 100644 index b41bca1c..00000000 --- a/conf/cmi/responsive_image.styles.gallery_thumbnail.yml +++ /dev/null @@ -1,36 +0,0 @@ -uuid: f027c6a7-1f01-45df-8ce6-8e80d9694ffd -langcode: en -status: true -dependencies: - config: - - image.style.1_1_thumbnail - - image.style.1_1_thumbnail_2x - module: - - helfi_image_styles -_core: - default_config_hash: FZ-_wC1OLQNLznIQJEUA1-VJTDXBViLp3w989x3o3Y8 -id: gallery_thumbnail -label: 'DEPRECATED Gallery thumbnail' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 1_1_thumbnail diff --git a/conf/cmi/responsive_image.styles.hero__background.yml b/conf/cmi/responsive_image.styles.hero__background.yml deleted file mode 100644 index 31edd0f0..00000000 --- a/conf/cmi/responsive_image.styles.hero__background.yml +++ /dev/null @@ -1,84 +0,0 @@ -uuid: 4ba02354-ec53-4379-8ed3-75a2f433d4aa -langcode: en -status: true -dependencies: - config: - - image.style.23_10_l - - image.style.23_10_l_2x - - image.style.23_10_m - - image.style.23_10_m_2x - - image.style.23_10_s - - image.style.23_10_s_2x - - image.style.23_10_xl - - image.style.23_10_xl_2x - - image.style.23_10_xs - - image.style.23_10_xs_2x - module: - - helfi_image_styles -_core: - default_config_hash: nwUJL1ss184iFX8lZsTUnUa9oLBCSGRCnKfsKN8xbOc -id: hero__background -label: 'DEPRECATED Hero Background' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 23_10_xl - breakpoint_id: helfi_image_styles.xl - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_xl_2x - breakpoint_id: helfi_image_styles.xl - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_l - breakpoint_id: helfi_image_styles.l - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_l_2x - breakpoint_id: helfi_image_styles.l - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_xs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_xs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 23_10_m diff --git a/conf/cmi/responsive_image.styles.image__3_2.yml b/conf/cmi/responsive_image.styles.image__3_2.yml deleted file mode 100644 index 27ac4937..00000000 --- a/conf/cmi/responsive_image.styles.image__3_2.yml +++ /dev/null @@ -1,74 +0,0 @@ -uuid: 951751b5-2b5c-4da6-b78f-bffb1bdfc8c8 -langcode: en -status: true -dependencies: - config: - - image.style.3_2_l - - image.style.3_2_l_2x - - image.style.3_2_m - - image.style.3_2_m_2x - - image.style.3_2_s - - image.style.3_2_s_2x - - image.style.3_2_xs - - image.style.3_2_xs_2x - - image.style.3_2_xxs - - image.style.3_2_xxs_2x - module: - - helfi_image_styles -_core: - default_config_hash: acsIYWfNVn-MHuYr6vIhbyN7srjNLwkP2YCz11ioS98 -id: image__3_2 -label: 'DEPRECATED Image 3:2' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 3_2_l - breakpoint_id: helfi_image_styles.l - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_l_2x - breakpoint_id: helfi_image_styles.l - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 3_2_m diff --git a/conf/cmi/responsive_image.styles.image__3_2_content_area.yml b/conf/cmi/responsive_image.styles.image__3_2_content_area.yml deleted file mode 100644 index ec55b328..00000000 --- a/conf/cmi/responsive_image.styles.image__3_2_content_area.yml +++ /dev/null @@ -1,62 +0,0 @@ -uuid: 58ed3cfc-ef53-4d12-b4ac-586b5763f0d3 -langcode: en -status: true -dependencies: - config: - - image.style.3_2_m - - image.style.3_2_m_2x - - image.style.3_2_s - - image.style.3_2_s_2x - - image.style.3_2_xs - - image.style.3_2_xs_2x - - image.style.3_2_xxs - - image.style.3_2_xxs_2x - module: - - helfi_image_styles -_core: - default_config_hash: pYO4LdGb6G7PBBJNZPQ88VDbKc_c_QmzNBkVwxYSwBg -id: image__3_2_content_area -label: 'DEPRECATED Image 3:2 (content area)' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 3_2_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 3_2_m diff --git a/conf/cmi/responsive_image.styles.list_of_links__thumbnail.yml b/conf/cmi/responsive_image.styles.list_of_links__thumbnail.yml deleted file mode 100644 index 409b5259..00000000 --- a/conf/cmi/responsive_image.styles.list_of_links__thumbnail.yml +++ /dev/null @@ -1,48 +0,0 @@ -uuid: be31e058-8b74-4cc8-9baf-2ac841af5889 -langcode: en -status: true -dependencies: - config: - - image.style.1_1_s - - image.style.1_1_s_2x - - image.style.1_1_xs - - image.style.1_1_xs_2x - module: - - helfi_image_styles -_core: - default_config_hash: sy7O7VeWv9Mim46mitLteOrjsrX-x7-RUMpC98qP8jA -id: list_of_links__thumbnail -label: 'DEPRECATED List of Links Thumbnail' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 1_1_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 1_1_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_xs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 1_1_xs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 1_1_s diff --git a/conf/cmi/responsive_image.styles.original.yml b/conf/cmi/responsive_image.styles.original.yml deleted file mode 100644 index d7ba6926..00000000 --- a/conf/cmi/responsive_image.styles.original.yml +++ /dev/null @@ -1,74 +0,0 @@ -uuid: 8d0c9098-8057-4323-a04c-2fe48f929815 -langcode: en -status: true -dependencies: - config: - - image.style.original_l - - image.style.original_l_2x - - image.style.original_m - - image.style.original_m_2x - - image.style.original_s - - image.style.original_s_2x - - image.style.original_xs - - image.style.original_xs_2x - - image.style.original_xxs - - image.style.original_xxs_2x - module: - - helfi_image_styles -_core: - default_config_hash: x0r2QzNDWHXqyg7HGSzEHFBxCBm4wqYqaKZIMFrwAD8 -id: original -label: 'DEPRECATED Original' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: original_l - breakpoint_id: helfi_image_styles.l - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_l_2x - breakpoint_id: helfi_image_styles.l - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_xxs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_xxs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: original_l diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index cbd32963..dd75506a 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,7 +91,6 @@ display: type: mini options: offset: 0 - pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -106,6 +105,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index d3b78196..40c45ab7 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 59e80957..f93c303c 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 7e190ab5..e2ccbdeb 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,7 +109,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -127,6 +126,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,7 +646,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -664,6 +663,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index c3564257..5e54873d 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,7 +93,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -111,6 +110,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 1f257d56..5b74a468 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,7 +286,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -304,6 +303,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: From b92f9f77380ae7809b76fc6a8e16836cd075a259 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 12 Dec 2024 07:36:51 +0000 Subject: [PATCH 3/9] Update configuration --- compose.yaml | 16 +- composer.lock | 182 ++-- ...rm_display.paragraph.accordion.default.yml | 2 +- ...splay.paragraph.accordion_item.default.yml | 2 +- ...ew_display.paragraph.accordion.default.yml | 2 +- ...splay.paragraph.accordion_item.default.yml | 2 +- ....accordion.field_accordion_description.yml | 2 +- ...graph.accordion.field_accordion_design.yml | 2 +- ...ccordion.field_accordion_heading_level.yml | 2 +- ...agraph.accordion.field_accordion_items.yml | 2 +- ...agraph.accordion.field_accordion_title.yml | 2 +- ....accordion.field_accordion_title_level.yml | 2 +- ...dion_item.field_accordion_item_content.yml | 12 +- ...dion_item.field_accordion_item_heading.yml | 2 +- ...ld.paragraph.accordion_item.field_icon.yml | 2 +- ....paragraph.field_accordion_description.yml | 2 +- ...orage.paragraph.field_accordion_design.yml | 2 +- ...aragraph.field_accordion_heading_level.yml | 2 +- ...paragraph.field_accordion_item_content.yml | 2 +- ...paragraph.field_accordion_item_heading.yml | 2 +- ...torage.paragraph.field_accordion_items.yml | 2 +- ...torage.paragraph.field_accordion_title.yml | 2 +- ....paragraph.field_accordion_title_level.yml | 2 +- ...helfi_platform_config.redirect_cleaner.yml | 1 + .../cmi/language/fi/social_media.settings.yml | 1 - .../language/fi/views.view.helfi_redirect.yml | 77 ++ conf/cmi/language/fi/views.view.redirect.yml | 4 +- .../cmi/language/sv/social_media.settings.yml | 1 - .../language/sv/views.view.helfi_redirect.yml | 65 ++ .../paragraphs.paragraphs_type.accordion.yml | 2 +- ...agraphs.paragraphs_type.accordion_item.yml | 2 +- conf/cmi/views.view.helfi_redirect.yml | 784 ++++++++++++++++++ conf/cmi/views.view.redirect.yml | 2 +- phpunit.xml.dist | 6 +- tools/make/override.mk | 1 - tools/make/project/db-sync.sh | 24 + tools/make/project/install.mk | 10 +- 37 files changed, 1090 insertions(+), 140 deletions(-) create mode 100644 conf/cmi/helfi_platform_config.redirect_cleaner.yml create mode 100644 conf/cmi/language/fi/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/sv/views.view.helfi_redirect.yml create mode 100644 conf/cmi/views.view.helfi_redirect.yml create mode 100644 tools/make/project/db-sync.sh diff --git a/compose.yaml b/compose.yaml index 703a8d29..0e64d1db 100644 --- a/compose.yaml +++ b/compose.yaml @@ -8,6 +8,7 @@ services: depends_on: - db environment: + WEBROOT: /app/public STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}" STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}" APP_ENV: "${APP_ENV:-local}" @@ -24,7 +25,6 @@ services: # DOCKERHOST: host.docker.internal # Use drush server to run functional tests, so we don't have to care about # permission or SSL issues. - SIMPLETEST_BASE_URL: "http://app:8888" BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}" BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest" DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish" @@ -160,13 +160,21 @@ services: profiles: - queue chromium: - # @todo Update this to newer version once minkphp supports Selenium 4. - # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372 - image: seleniarm/standalone-chromium:106.0 + image: selenium/standalone-chromium + environment: + SE_NODE_OVERRIDE_MAX_SESSIONS: "true" + SE_NODE_MAX_SESSIONS: "16" + SE_START_XVFB: "false" + SE_START_VNC: "false" + SE_SESSION_RETRY_INTERVAL: "1" + SE_SESSION_REQUEST_TIMEOUT: "10" + depends_on: + - app networks: - internal profiles: - testing + networks: internal: external: false diff --git a/composer.lock b/composer.lock index cf320798..c7cc7014 100644 --- a/composer.lock +++ b/composer.lock @@ -1548,29 +1548,27 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "1.4.10 || 2.0.3", + "phpstan/phpstan-phpunit": "^1.0 || ^2", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -1578,7 +1576,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1589,9 +1587,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + "source": "https://github.com/doctrine/deprecations/tree/1.1.4" }, - "time": "2024-01-30T19:34:25+00:00" + "time": "2024-12-07T21:18:45+00:00" }, { "name": "doctrine/lexer", @@ -1673,16 +1671,16 @@ }, { "name": "dompdf/php-font-lib", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/dompdf/php-font-lib.git", - "reference": "991d6a954f6bbd7e41022198f00586b230731441" + "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/991d6a954f6bbd7e41022198f00586b230731441", - "reference": "991d6a954f6bbd7e41022198f00586b230731441", + "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d", + "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d", "shasum": "" }, "require": { @@ -1712,9 +1710,9 @@ "homepage": "https://github.com/dompdf/php-font-lib", "support": { "issues": "https://github.com/dompdf/php-font-lib/issues", - "source": "https://github.com/dompdf/php-font-lib/tree/1.0.0" + "source": "https://github.com/dompdf/php-font-lib/tree/1.0.1" }, - "time": "2024-04-29T13:40:38+00:00" + "time": "2024-12-02T14:37:59+00:00" }, { "name": "drupal/address", @@ -4075,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.16", + "version": "6.8.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "7078104991314db54aa0301b508dba947f2e4a87" + "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7078104991314db54aa0301b508dba947f2e4a87", - "reference": "7078104991314db54aa0301b508dba947f2e4a87", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d35f85ec2d568c68df67d01029b2c2cf952d63e9", + "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9", "shasum": "" }, "require": { @@ -4103,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.16", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.20", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-04T05:47:34+00:00" + "time": "2024-12-12T07:31:27+00:00" }, { "name": "drupal/hdbt_admin", @@ -4302,12 +4300,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd" + "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/2abe26c3735150f630dd1203c3e60a77173d90fd", - "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", + "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", "shasum": "" }, "require": { @@ -4382,7 +4380,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-12-03T06:30:07+00:00" + "time": "2024-12-12T07:30:07+00:00" }, { "name": "drupal/helfi_navigation", @@ -4420,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.9.0", + "version": "4.10.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "f4d743c2c190af8ebe3b461b9ed2a5ae47b0c1a1" + "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f4d743c2c190af8ebe3b461b9ed2a5ae47b0c1a1", - "reference": "f4d743c2c190af8ebe3b461b9ed2a5ae47b0c1a1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", + "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", "shasum": "" }, "require": { @@ -4555,10 +4553,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.9.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-05T11:19:41+00:00" + "time": "2024-12-11T07:54:12+00:00" }, { "name": "drupal/helfi_proxy", @@ -7202,7 +7200,7 @@ ], "authors": [ { - "name": "Chi", + "name": "chi", "homepage": "https://www.drupal.org/user/556138" } ], @@ -7596,23 +7594,23 @@ "sut/libraries/{$name}": [ "type:drupal-library" ], + "sut/themes/unish/{$name}": [ + "drupal/empty_theme" + ], + "sut/drush/contrib/{$name}": [ + "type:drupal-drush" + ], "sut/modules/unish/{$name}": [ "drupal/devel" ], - "sut/themes/unish/{$name}": [ - "drupal/empty_theme" + "sut/themes/contrib/{$name}": [ + "type:drupal-theme" ], "sut/modules/contrib/{$name}": [ "type:drupal-module" ], "sut/profiles/contrib/{$name}": [ "type:drupal-profile" - ], - "sut/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "sut/drush/contrib/{$name}": [ - "type:drupal-drush" ] } }, @@ -8758,11 +8756,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev", - "dev-4.x": "4.x-dev", - "dev-3.x": "3.x-dev", + "dev-1.x": "1.x-dev", "dev-2.x": "2.x-dev", - "dev-1.x": "1.x-dev" + "dev-3.x": "3.x-dev", + "dev-4.x": "4.x-dev", + "dev-master": "4.x-dev" } }, "autoload": { @@ -9483,16 +9481,16 @@ }, { "name": "monolog/monolog", - "version": "3.8.0", + "version": "3.8.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" + "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", - "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4", + "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4", "shasum": "" }, "require": { @@ -9570,7 +9568,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.8.0" + "source": "https://github.com/Seldaek/monolog/tree/3.8.1" }, "funding": [ { @@ -9582,7 +9580,7 @@ "type": "tidelift" } ], - "time": "2024-11-12T13:57:08+00:00" + "time": "2024-12-05T17:15:07+00:00" }, { "name": "nikic/php-parser", @@ -10928,16 +10926,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.5", + "version": "v0.12.7", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "36a03ff27986682c22985e56aabaf840dd173cb5" + "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/36a03ff27986682c22985e56aabaf840dd173cb5", - "reference": "36a03ff27986682c22985e56aabaf840dd173cb5", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", + "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "shasum": "" }, "require": { @@ -11001,9 +10999,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.5" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.7" }, - "time": "2024-11-29T06:14:30+00:00" + "time": "2024-12-10T01:58:33+00:00" }, { "name": "ralouphie/getallheaders", @@ -12392,8 +12390,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -12548,8 +12546,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -12627,8 +12625,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -12709,8 +12707,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -12793,8 +12791,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -12935,8 +12933,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -13015,8 +13013,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -13091,8 +13089,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -13167,8 +13165,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -14226,16 +14224,16 @@ }, { "name": "twig/twig", - "version": "v3.16.0", + "version": "v3.17.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561" + "reference": "d3a64b742a5e74c57e3964d766e1032982145872" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561", - "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d3a64b742a5e74c57e3964d766e1032982145872", + "reference": "d3a64b742a5e74c57e3964d766e1032982145872", "shasum": "" }, "require": { @@ -14290,7 +14288,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.16.0" + "source": "https://github.com/twigphp/Twig/tree/v3.17.0" }, "funding": [ { @@ -14302,7 +14300,7 @@ "type": "tidelift" } ], - "time": "2024-11-29T08:27:05+00:00" + "time": "2024-12-10T15:19:11+00:00" }, { "name": "twistor/flysystem-stream-wrapper", @@ -16637,16 +16635,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.0", + "version": "5.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" + "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", - "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", + "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", "shasum": "" }, "require": { @@ -16695,9 +16693,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1" }, - "time": "2024-11-12T11:25:25+00:00" + "time": "2024-12-07T09:39:29+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -19276,8 +19274,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion.default.yml index ac9e002d..0588acea 100644 --- a/conf/cmi/core.entity_form_display.paragraph.accordion.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.accordion.default.yml @@ -15,7 +15,7 @@ dependencies: - paragraphs - text _core: - default_config_hash: K8HsAl3NXcMTSRfcQq_JTJfYA74VrVpE94gTYWIUUpI + default_config_hash: RF5jnF9_MPS0ILEZyGlsFs74Q68B1ii5mqyLnSZC67g id: paragraph.accordion.default targetEntityType: paragraph bundle: accordion diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml index 2e24933a..15857dcd 100644 --- a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml @@ -14,7 +14,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: f3ncPjM7WKsN-bLZVQXMbSKIUMZYRk51A9j1Yly5XsE + default_config_hash: 51mHm2O7Corvv_lfh2IeFdXy3zf8Uj5dgxtkmWy39yI id: paragraph.accordion_item.default targetEntityType: paragraph bundle: accordion_item diff --git a/conf/cmi/core.entity_view_display.paragraph.accordion.default.yml b/conf/cmi/core.entity_view_display.paragraph.accordion.default.yml index b1c01bb6..f7f3da8f 100644 --- a/conf/cmi/core.entity_view_display.paragraph.accordion.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.accordion.default.yml @@ -15,7 +15,7 @@ dependencies: - options - text _core: - default_config_hash: yJAD4ny-ijX5i6mYmUprDsh_4JqcMH8yIk6PNNRNUDQ + default_config_hash: e0ru9L96p-nQWFm3QJofXJmuuQ20FakJ6yrGmoRtA58 id: paragraph.accordion.default targetEntityType: paragraph bundle: accordion diff --git a/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml index 44dc1207..0fbab5b8 100644 --- a/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml @@ -11,7 +11,7 @@ dependencies: - entity_reference_revisions - hdbt_admin_tools _core: - default_config_hash: WvxeLovAeRn181zqTY9mqQlEUH2qKUDh3w1g2KROZoA + default_config_hash: nEdDaeghKYX4hYMccTAO5M0h4TLAiNAsYf2ouXYD2Sc id: paragraph.accordion_item.default targetEntityType: paragraph bundle: accordion_item diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml index 7d001021..45047636 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml @@ -13,7 +13,7 @@ third_party_settings: allowed_formats: - minimal _core: - default_config_hash: kOxXsJuDVcymIAy7jnni6GM5q5SPGSrxwmWJiJ4Sr7c + default_config_hash: j-K-qnxmYJISH2FD5kP90WEvaYPac3scFywf6jjx6AA id: paragraph.accordion.field_accordion_description field_name: field_accordion_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_design.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_design.yml index 710d642d..9349045c 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_design.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_design.yml @@ -8,7 +8,7 @@ dependencies: module: - options _core: - default_config_hash: C3J06vDzYUJdSIAwQhoBHO4eG5T2H--lbC1h74-KDJ4 + default_config_hash: iRAjLGNSuLvmNMEA6EiasJbbsseWnuhpbvg6xXIkL2s id: paragraph.accordion.field_accordion_design field_name: field_accordion_design entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml index 4d65196f..1b38d342 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml @@ -8,7 +8,7 @@ dependencies: module: - options _core: - default_config_hash: HZVr6AVX7ihLKrsewEHabJxkhrHFUugKszp7Z_B1slk + default_config_hash: huFW_rCFjaNvMUbdEaFO_KzbeRqHg9Kvk6w9bICJX5w id: paragraph.accordion.field_accordion_heading_level field_name: field_accordion_heading_level entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml index ef845f99..20875098 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml @@ -12,7 +12,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: Nx_3yq3vNPc667kG9nez6rTv_w54aS3h3rnbAmt7kZ4 + default_config_hash: pbsofl6KEKBnXhSD8VeTvETrQnbu2PEmmoxOnJ6tTyc id: paragraph.accordion.field_accordion_items field_name: field_accordion_items entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml index 20d2b268..15357426 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_accordion_title - paragraphs.paragraphs_type.accordion _core: - default_config_hash: TqiIVq0xav9ieDerAH8CFF0bSAAeZxPsNXWyqpBPm_U + default_config_hash: MCWdcisqdcCp5VyV12W_w5kamgU5dmQUwbyWA37KgW8 id: paragraph.accordion.field_accordion_title field_name: field_accordion_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml index 0803da37..f7f7268c 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml @@ -8,7 +8,7 @@ dependencies: module: - options _core: - default_config_hash: O1itPj2x6F-IUHyrssTSWUsnWXk5ljT5U3jjQrxd0cY + default_config_hash: PXJrE7yjrmg3rNd1MV7vyd8uwlc48g2jO39aNlYEi08 id: paragraph.accordion.field_accordion_title_level field_name: field_accordion_title_level entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_content.yml b/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_content.yml index 919c81db..c06289d9 100644 --- a/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_content.yml +++ b/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_content.yml @@ -12,7 +12,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: PZYH0XJHai5BanrU841HBb6psP_104W5Abd-D8q4dIU + default_config_hash: S0Go4odbO-zxS9ydKxxo5m6EuhdnpZiM4g5Y3tYk-98 id: paragraph.accordion_item.field_accordion_item_content field_name: field_accordion_item_content entity_type: paragraph @@ -27,20 +27,20 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - columns: columns - image: image text: text + image: image phasing: phasing + columns: columns negate: 0 target_bundles_drag_drop: columns: - weight: 0 + weight: 3 enabled: true image: - weight: 0 + weight: 1 enabled: true phasing: - weight: 0 + weight: 2 enabled: true text: weight: 0 diff --git a/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_heading.yml b/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_heading.yml index a04819ad..7a347728 100644 --- a/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_heading.yml +++ b/conf/cmi/field.field.paragraph.accordion_item.field_accordion_item_heading.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_accordion_item_heading - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: ub76tTWnromBzCxP7Fh285sgZFQVw6Yyr7e2mefo-E0 + default_config_hash: jlpogAZT3equVVawgcoNawBA8yy2TkAjRHrqcNx7yGY id: paragraph.accordion_item.field_accordion_item_heading field_name: field_accordion_item_heading entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion_item.field_icon.yml b/conf/cmi/field.field.paragraph.accordion_item.field_icon.yml index 9357671b..55844cf5 100644 --- a/conf/cmi/field.field.paragraph.accordion_item.field_icon.yml +++ b/conf/cmi/field.field.paragraph.accordion_item.field_icon.yml @@ -8,7 +8,7 @@ dependencies: module: - hdbt_admin_tools _core: - default_config_hash: lZgD3FKeuPDGSq4QSkg6k71xMrgJjXqe3eBE1AK8_Ig + default_config_hash: noZbr1ggOqV1n5sTP8lki4BDYHZ9kCTokdkux0Ak7jI id: paragraph.accordion_item.field_icon field_name: field_icon entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_description.yml b/conf/cmi/field.storage.paragraph.field_accordion_description.yml index 29a77d8e..e70766b5 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_description.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_description.yml @@ -6,7 +6,7 @@ dependencies: - paragraphs - text _core: - default_config_hash: EerHlo0DvRW9wodIpVNsoQvRgGklDN80Z4vaofMG-H0 + default_config_hash: f39f_iSoIe3v72Vw4gZbmZ1rK31zxu8nziCvipMdnfk id: paragraph.field_accordion_description field_name: field_accordion_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_design.yml b/conf/cmi/field.storage.paragraph.field_accordion_design.yml index 2ad83aeb..5c7581dd 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_design.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_design.yml @@ -6,7 +6,7 @@ dependencies: - options - paragraphs _core: - default_config_hash: rbDxhjXfPHMDYJqUlYnmt8r427vL0vzSOd5SQ3H6ZGU + default_config_hash: _atR29T6pbOshvx0mgvdebd7Gr1yN1cC22Ls1a7PJQA id: paragraph.field_accordion_design field_name: field_accordion_design entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_heading_level.yml b/conf/cmi/field.storage.paragraph.field_accordion_heading_level.yml index 46b8d5b1..9c33be1d 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_heading_level.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_heading_level.yml @@ -6,7 +6,7 @@ dependencies: - options - paragraphs _core: - default_config_hash: eC6tQJYsLqY--GBIgLLHOgt5S6XeFxOJiXRiNn4q_68 + default_config_hash: SgFhmrcytcSLA4KLSd6HWJJquPg7OM-_L2S9jLtZmrk id: paragraph.field_accordion_heading_level field_name: field_accordion_heading_level entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_item_content.yml b/conf/cmi/field.storage.paragraph.field_accordion_item_content.yml index 341197c0..98319ee9 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_item_content.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_item_content.yml @@ -9,7 +9,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: ii2H-2RA7_AV2hH0bRBfJDL9dmLSCTaWL5T4oIWPlVM + default_config_hash: O3jtnsTTTr_DF5PCVSyfomvx9U5KhscOD2pcVnv9jRo id: paragraph.field_accordion_item_content field_name: field_accordion_item_content entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_item_heading.yml b/conf/cmi/field.storage.paragraph.field_accordion_item_heading.yml index d7e163ad..747c0e98 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_item_heading.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_item_heading.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: SKYDBYvLxOQaZVxf-XlA-uRyROyDOI4pU2xRaK91PEo + default_config_hash: Evf-dxTIxBvpcwMhpYp6YzLGSbUvr9WUem9qgqkHbw0 id: paragraph.field_accordion_item_heading field_name: field_accordion_item_heading entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_items.yml b/conf/cmi/field.storage.paragraph.field_accordion_items.yml index 632ad3fa..2f17c361 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_items.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_items.yml @@ -9,7 +9,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion _core: - default_config_hash: V13nhH7ZNcAfI0hw5vvVq5eYh15DYnhp2juBr9k6N_s + default_config_hash: WG4eOVLjQAzLoc5AQ95YpSpbct3kym1s6EgYmvq2vWE id: paragraph.field_accordion_items field_name: field_accordion_items entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_title.yml b/conf/cmi/field.storage.paragraph.field_accordion_title.yml index 30ff541e..71ed25ea 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_title.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: '-UWwTPrmfNQVXS6PR3jXCrx99uv20Uv2rwqvytBskeY' + default_config_hash: h_S6nf_hDhlhQwO92UvEhO7Z2npXNNjO9J6j5obHITY id: paragraph.field_accordion_title field_name: field_accordion_title entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_accordion_title_level.yml b/conf/cmi/field.storage.paragraph.field_accordion_title_level.yml index 8cf84a6e..5a240e6c 100644 --- a/conf/cmi/field.storage.paragraph.field_accordion_title_level.yml +++ b/conf/cmi/field.storage.paragraph.field_accordion_title_level.yml @@ -6,7 +6,7 @@ dependencies: - options - paragraphs _core: - default_config_hash: JwHgKwfMuUFw0Ko1E_2DbzGbGbHHoG_unhlyGs6Ha1U + default_config_hash: ghbbLn8LXQXBdNN5Orxnui-CcjfosUl_0edQETrBWXI id: paragraph.field_accordion_title_level field_name: field_accordion_title_level entity_type: paragraph diff --git a/conf/cmi/helfi_platform_config.redirect_cleaner.yml b/conf/cmi/helfi_platform_config.redirect_cleaner.yml new file mode 100644 index 00000000..bc0ef065 --- /dev/null +++ b/conf/cmi/helfi_platform_config.redirect_cleaner.yml @@ -0,0 +1 @@ +enable: true diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml index 94e60de6..795f0149 100644 --- a/conf/cmi/language/fi/social_media.settings.yml +++ b/conf/cmi/language/fi/social_media.settings.yml @@ -1,7 +1,6 @@ social_media: facebook_share: text: 'Jaa Facebook-palvelussa' - api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' attributes: "target|_blank\r\nclass|facebook-share" linkedin: text: 'Jaa LinkedIn-palvelussa' diff --git a/conf/cmi/language/fi/views.view.helfi_redirect.yml b/conf/cmi/language/fi/views.view.helfi_redirect.yml new file mode 100644 index 00000000..78822a3c --- /dev/null +++ b/conf/cmi/language/fi/views.view.helfi_redirect.yml @@ -0,0 +1,77 @@ +display: + default: + display_options: + filters: + status_code: + group_info: + group_items: + 7: + title: '300 Multiple Choices' + 1: + title: '300 Multiple Choices' + 2: + title: '301 Moved Permanently' + 3: + title: '302 Found' + 4: + title: '303 See Other' + 5: + title: '304 Not Modified' + 6: + title: '305 Use Proxy' + label: Tilakoodi + expose: + label: Tilakoodi + redirect_source__path: + expose: + label: Lähettäjä + redirect_redirect__uri: + expose: + label: Osoitteeseen + language: + expose: + label: 'Alkuperäinen kieli' + is_custom: + expose: + label: 'Käyttäjän luoma' + exposed_form: + options: + submit_button: Suodata + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + tags: + next: 'next ›' + previous: '‹ previous' + first: '« first' + last: 'last »' + fields: + redirect_bulk_form: + action_title: Valinnalla + redirect_source__path: + label: Lähettäjä + separator: ', ' + created: + label: Luotu + is_custom: + label: 'Käyttäjän luoma' + separator: ', ' + empty: + area_text_custom: + content: 'Ei ole vielä uudelleenohjaksia.' + title: Uudelleenohjaukset + display_title: Oletus + page_1: + display_title: Sivu + display_options: + menu: + title: Uudelleenohjaukset +label: Uudelleenohjaukset +description: Uudelleenohjaukset diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml index 9711bed1..60743d70 100644 --- a/conf/cmi/language/fi/views.view.redirect.yml +++ b/conf/cmi/language/fi/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: Uudelleenohjaukset description: Uudelleenohjaukset display: default: @@ -48,7 +48,7 @@ display: language: expose: label: 'Alkuperäinen kieli' - title: Redirect + title: Uudelleenohjaukset empty: area_text_custom: content: 'Ei ole vielä uudelleenohjaksia.' diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml index 027c6e2c..b0261901 100644 --- a/conf/cmi/language/sv/social_media.settings.yml +++ b/conf/cmi/language/sv/social_media.settings.yml @@ -1,7 +1,6 @@ social_media: facebook_share: text: 'Dela på Facebook' - api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' attributes: "target|_blank\r\nclass|facebook-share" linkedin: text: 'Dela på Linkedin' diff --git a/conf/cmi/language/sv/views.view.helfi_redirect.yml b/conf/cmi/language/sv/views.view.helfi_redirect.yml new file mode 100644 index 00000000..aef24d5d --- /dev/null +++ b/conf/cmi/language/sv/views.view.helfi_redirect.yml @@ -0,0 +1,65 @@ +label: Omdirigera +description: 'Lista över omdirigeringar' +display: + default: + display_title: Förvald + display_options: + title: Omdirigera + fields: + redirect_bulk_form: + action_title: 'Med urval' + redirect_source__path: + label: Från + separator: ', ' + is_custom: + label: Anpassad + separator: ', ' + created: + label: Skapad + pager: + options: + tags: + next: 'next ›' + previous: '‹ previous' + first: '« first' + last: 'last »' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + exposed_form: + options: + submit_button: Filtrera + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + empty: + area_text_custom: + content: 'Det finns ingen omdirigering ännu.' + filters: + redirect_source__path: + expose: + label: Från + redirect_redirect__uri: + expose: + label: Till + status_code: + expose: + label: Statuskod + group_info: + label: Statuskod + group_items: + 7: + title: '300 Multiple Choices' + language: + expose: + label: Ursprungsspråk + is_custom: + expose: + label: Anpassad + page_1: + display_title: Sida + display_options: + menu: + title: Omdirigera diff --git a/conf/cmi/paragraphs.paragraphs_type.accordion.yml b/conf/cmi/paragraphs.paragraphs_type.accordion.yml index 3320906f..1fbc8084 100644 --- a/conf/cmi/paragraphs.paragraphs_type.accordion.yml +++ b/conf/cmi/paragraphs.paragraphs_type.accordion.yml @@ -8,7 +8,7 @@ third_party_settings: paragraphs_library: allow_library_conversion: true _core: - default_config_hash: d9QHZSNb78KFueRqSVFC7_maG4KBNgjsPmLJIb2TN10 + default_config_hash: vES-HnW4QjvAjQCy5Ax4wt2ggnDoE4gNRQrS6LOHQrY id: accordion label: Accordion icon_uuid: null diff --git a/conf/cmi/paragraphs.paragraphs_type.accordion_item.yml b/conf/cmi/paragraphs.paragraphs_type.accordion_item.yml index 76fe89d9..f7a77970 100644 --- a/conf/cmi/paragraphs.paragraphs_type.accordion_item.yml +++ b/conf/cmi/paragraphs.paragraphs_type.accordion_item.yml @@ -6,7 +6,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion _core: - default_config_hash: 3_2UxgHC3d_rUCxJsaSL4ynVsWjXtTwRlrvBotSkiWg + default_config_hash: 6q_i214TRzdynGv7ESHDBPmtLt4sz3K5dJGbXy7Suik id: accordion_item label: 'Accordion item' icon_uuid: null diff --git a/conf/cmi/views.view.helfi_redirect.yml b/conf/cmi/views.view.helfi_redirect.yml new file mode 100644 index 00000000..a3f968da --- /dev/null +++ b/conf/cmi/views.view.helfi_redirect.yml @@ -0,0 +1,784 @@ +uuid: bf25e83d-5e50-4476-a09f-b072a996e778 +langcode: en +status: true +dependencies: + config: + - system.menu.admin + module: + - link + - redirect + - user +_core: + default_config_hash: h9PYX1gxwmkwfgZUv0BJ_Js6-woWmUbyPSK0INlm538 +id: helfi_redirect +label: Redirect +module: views +description: 'List of redirects' +tag: '' +base_table: redirect +base_field: rid +display: + default: + id: default + display_title: Master + display_plugin: default + position: 0 + display_options: + title: Redirect + fields: + redirect_bulk_form: + id: redirect_bulk_form + table: redirect + field: redirect_bulk_form + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + plugin_id: redirect_bulk_form + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + action_title: 'With selection' + include_exclude: exclude + selected_actions: { } + redirect_source__path: + id: redirect_source__path + table: redirect + field: redirect_source__path + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: redirect_source + plugin_id: field + label: From + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: path + type: redirect_source + settings: { } + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + redirect_redirect__uri: + id: redirect_redirect__uri + table: redirect + field: redirect_redirect__uri + entity_type: redirect + entity_field: redirect_redirect + plugin_id: field + status_code: + id: status_code + table: redirect + field: status_code + entity_type: redirect + entity_field: status_code + plugin_id: field + is_custom: + id: is_custom + table: redirect + field: is_custom + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: is_custom + plugin_id: field + label: Custom + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: unicode-yes-no + format_custom_false: '' + format_custom_true: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + language: + id: language + table: redirect + field: language + entity_type: redirect + entity_field: language + plugin_id: field + created: + id: created + table: redirect + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: created + plugin_id: date + label: Created + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + date_format: fallback + custom_date_format: '' + timezone: '' + operations: + id: operations + table: redirect + field: operations + entity_type: redirect + plugin_id: entity_operations + pager: + type: full + options: + offset: 0 + pagination_heading_level: h4 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'next ›' + previous: '‹ previous' + first: '« first' + last: 'last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'administer redirects' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'There is no redirect yet.' + tokenize: false + sorts: { } + arguments: { } + filters: + redirect_source__path: + id: redirect_source__path + table: redirect + field: redirect_source__path + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: redirect_source + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: redirect_source__path_op + label: From + description: '' + use_operator: false + operator: redirect_source__path_op + operator_limit_selection: false + operator_list: { } + identifier: redirect_source__path + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + redirect_redirect__uri: + id: redirect_redirect__uri + table: redirect + field: redirect_redirect__uri + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: redirect_redirect + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: redirect_redirect__uri_op + label: To + description: '' + use_operator: false + operator: redirect_redirect__uri_op + operator_limit_selection: false + operator_list: { } + identifier: redirect_redirect__uri + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status_code: + id: status_code + table: redirect + field: status_code + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: status_code + plugin_id: numeric + operator: '=' + value: + min: '' + max: '' + value: '' + group: 1 + exposed: true + expose: + operator_id: status_code_op + label: 'Status code' + description: '' + use_operator: false + operator: status_code_op + operator_limit_selection: false + operator_list: { } + identifier: status_code + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: true + group_info: + label: 'Status code' + description: '' + identifier: status_code + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: + title: '300 Multiple Choices' + operator: '=' + value: + min: '' + max: '' + value: '300' + 2: + title: '301 Moved Permanently' + operator: '=' + value: + min: '' + max: '' + value: '301' + 3: + title: '302 Found' + operator: '=' + value: + min: '' + max: '' + value: '302' + 4: + title: '303 See Other' + operator: '=' + value: + min: '' + max: '' + value: '303' + 5: + title: '304 Not Modified' + operator: '=' + value: + min: '' + max: '' + value: '304' + 6: + title: '305 Use Proxy' + operator: '=' + value: + min: '' + max: '' + value: '305' + 7: + title: '307 Temporary Redirect' + operator: '=' + value: + min: '' + max: '' + value: '307' + language: + id: language + table: redirect + field: language + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: language + plugin_id: language + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: language_op + label: 'Original language' + description: '' + use_operator: false + operator: language_op + operator_limit_selection: false + operator_list: { } + identifier: language + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + is_custom: + id: is_custom + table: redirect + field: is_custom + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: is_custom + plugin_id: boolean + operator: '=' + value: All + group: 1 + exposed: true + expose: + operator_id: '' + label: Custom + description: '' + use_operator: false + operator: is_custom_op + operator_limit_selection: false + operator_list: { } + identifier: is_custom + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + menu_api: '0' + super_administrator: '0' + news_producer: '0' + survey_editor: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status: + id: status + table: redirect + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: status + plugin_id: boolean + operator: '=' + value: '1' + group: 1 + exposed: true + expose: + operator_id: '' + label: Julkaistu + description: '' + use_operator: false + operator: status_op + operator_limit_selection: false + operator_list: { } + identifier: status + required: true + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + menu_api: '0' + super_administrator: '0' + news_producer: '0' + survey_editor: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + redirect_source__path: redirect_source__path + redirect_redirect__uri: redirect_redirect__uri + status_code: status_code + language: language + created: created + operations: operations + default: created + info: + redirect_source__path: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + redirect_redirect__uri: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status_code: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + language: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + created: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + operations: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + header: { } + footer: { } + display_extenders: { } + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + cacheable: false + page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 + display_options: + display_extenders: { } + path: admin/config/search/redirect + menu: + type: normal + title: Redirect + description: '' + weight: 0 + expanded: false + menu_name: admin + parent: hdbt_admin_tools.overview + context: '0' + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + cacheable: false diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 10176ceb..389c8d74 100644 --- a/conf/cmi/views.view.redirect.yml +++ b/conf/cmi/views.view.redirect.yml @@ -1,6 +1,6 @@ uuid: 8f837e07-cb87-4c42-b8c9-cf3afb64cefc langcode: en -status: true +status: false dependencies: module: - link diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 22d88d29..7c1efa6e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -15,11 +15,11 @@ - - + + - + diff --git a/tools/make/override.mk b/tools/make/override.mk index 6f4a034b..df8baac5 100644 --- a/tools/make/override.mk +++ b/tools/make/override.mk @@ -1,4 +1,3 @@ # Docker CLI container CLI_SERVICE=app -CLI_USER=druid CLI_SHELL=bash diff --git a/tools/make/project/db-sync.sh b/tools/make/project/db-sync.sh new file mode 100644 index 00000000..9ed73f5d --- /dev/null +++ b/tools/make/project/db-sync.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +if [ ! -n "$OC_PROJECT_NAME" ]; then + echo "OC_PROJECT_NAME not set." + exit 1; +fi + +oc login --token=${1} --server=https://api.arodevtest.hel.fi:6443 +oc project ${OC_PROJECT_NAME} + +OC_POD_NAME=$(oc get pods -o name | grep drupal-cron | grep -v deploy) + +if [ ! -n "$OC_POD_NAME" ]; then + echo "Failed to parse pod name." + exit 1 +fi + +oc rsh $OC_POD_NAME drush sql:dump --structure-tables-key=common \ + --extra-dump="--no-tablespaces --hex-blob" \ + --result-file=/tmp/dump.sql + +oc rsync $OC_POD_NAME:/tmp/dump.sql /app diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 483d64f7..4328f653 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -10,18 +10,14 @@ OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by v SYNC_TARGETS := drush-sync-db ifneq ($(DUMP_SQL_EXISTS),yes) -SYNC_TARGETS := oc-login oc-sync +SYNC_TARGETS := oc-sync endif -PHONY += oc-login -oc-login: - $(call drush,helfi:oc:login $(OC_LOGIN_TOKEN)) - PHONY += oc-sync oc-sync: - $(call drush,helfi:oc:get-dump) + docker run --env-file .env -it --rm -v .:/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)" $(call drush,sql-query --file=${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME),SQL dump imported) - $(call drush,helfi:oc:sanitize-database) + $(call drush,sql-query \"UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');\",Sanitized Azure URIs) $(call drush,cr) $(call drush,cim -y) $(call drush,cr) From 6caed723b20c71aed3750fc1ad67eeae8807d190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 12 Dec 2024 11:10:54 +0200 Subject: [PATCH 4/9] Updated workflows. --- .github/workflows/artifact.yml | 2 +- .github/workflows/test.yml | 17 ++++++++++------- .github/workflows/update-config.yml | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index 535dc82b..2287bfbc 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine + image: ghcr.io/city-of-helsinki/drupal-web:8.3 services: db: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f7eb84b9..9ae35ace 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,13 +5,12 @@ on: name: CI env: SYMFONY_DEPRECATIONS_HELPER: disabled - SIMPLETEST_BASE_URL: http://app:8888 jobs: tests: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine - options: --hostname app + image: ghcr.io/city-of-helsinki/drupal-web:8.3 + options: --hostname app --user 1001 services: db: @@ -26,6 +25,13 @@ jobs: steps: - uses: actions/checkout@v4 + # Actions worker overrides the default entrypoint with "tail -f /dev/null", so + # we have to start services manually. + - name: Start services + env: + WEBROOT: ${{ github.workspace }}/public + run: entrypoint & + - name: Set browsertest output folder run: | echo "BROWSERTEST_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/public/sites/simpletest" >> $GITHUB_ENV @@ -69,10 +75,7 @@ jobs: - name: Start services run: | - drush runserver $SIMPLETEST_BASE_URL --dns > /dev/null 2>&1 & - - # Wait for drush server to start. - for i in {1..5}; do RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done + for i in {1..5}; do RESPONSE_CODE=$(curl -k -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done - name: Run PHPUnit tests run: | diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index d36258dd..64af8562 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -9,7 +9,8 @@ jobs: update-config: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine + image: ghcr.io/city-of-helsinki/drupal-web:8.3 + options: --hostname app --user 1001 services: db: image: mysql:8 From 4b44bf85740b6281da1aefa4fcbb7cc81ce01cbf Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:43:40 +0000 Subject: [PATCH 5/9] Update configuration --- .dockerignore | 4 + composer.lock | 66 +++++++------ .../language/fi/views.view.helfi_redirect.yml | 30 +++--- conf/cmi/language/fi/views.view.redirect.yml | 10 +- ...views.view.scheduler_scheduled_content.yml | 8 +- .../language/sv/views.view.helfi_redirect.yml | 6 ++ conf/cmi/views.view.helfi_redirect.yml | 97 ++++++++++++++++++- tools/make/project/db-sync.sh | 3 +- tools/make/project/git.mk | 2 +- 9 files changed, 167 insertions(+), 59 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..e3708ede --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +.git/ +.github/ +.idea/ +*.sql diff --git a/composer.lock b/composer.lock index c7cc7014..7258b169 100644 --- a/composer.lock +++ b/composer.lock @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.20", + "version": "6.8.21", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9" + "reference": "cd8b74a7afc7ec488979a426809e5386383a3bef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d35f85ec2d568c68df67d01029b2c2cf952d63e9", - "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cd8b74a7afc7ec488979a426809e5386383a3bef", + "reference": "cd8b74a7afc7ec488979a426809e5386383a3bef", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.20", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.21", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-12T07:31:27+00:00" + "time": "2024-12-13T08:38:26+00:00" }, { "name": "drupal/hdbt_admin", @@ -4300,12 +4300,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6" + "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", - "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/845a8c470a6f593b08e100f3c3d688fb07600f76", + "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76", "shasum": "" }, "require": { @@ -4380,7 +4380,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-12-12T07:30:07+00:00" + "time": "2024-12-12T12:14:31+00:00" }, { "name": "drupal/helfi_navigation", @@ -4418,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.1", + "version": "4.10.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618" + "reference": "f2d8dc24500044936ea6dba39134d1d2eaf710db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", - "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f2d8dc24500044936ea6dba39134d1d2eaf710db", + "reference": "f2d8dc24500044936ea6dba39134d1d2eaf710db", "shasum": "" }, "require": { @@ -4553,10 +4553,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-11T07:54:12+00:00" + "time": "2024-12-13T08:38:18+00:00" }, { "name": "drupal/helfi_proxy", @@ -5507,29 +5507,29 @@ }, { "name": "drupal/openid_connect", - "version": "3.0.0-alpha3", + "version": "3.0.0-alpha4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "3.0.0-alpha3" + "reference": "3.0.0-alpha4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha3.zip", - "reference": "3.0.0-alpha3", - "shasum": "002616dc2bfeb6b23204297e77d1f7a5369e69b3" + "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha4.zip", + "reference": "3.0.0-alpha4", + "shasum": "3239f8a2e5fc98de1be7561309cb12153ef5b7c9" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^9.5 || ^10.2 || ^11", "drupal/externalauth": "^2.0", "ext-json": "*", - "php": ">=7.1.0" + "php": ">=8.1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0-alpha3", - "datestamp": "1710708951", + "version": "3.0.0-alpha4", + "datestamp": "1734043889", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -5549,6 +5549,10 @@ "name": "jcnventura", "homepage": "https://www.drupal.org/user/122464" }, + { + "name": "mstrelan", + "homepage": "https://www.drupal.org/user/314289" + }, { "name": "pfrilling", "homepage": "https://www.drupal.org/user/169695" @@ -14224,16 +14228,16 @@ }, { "name": "twig/twig", - "version": "v3.17.0", + "version": "v3.17.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "d3a64b742a5e74c57e3964d766e1032982145872" + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d3a64b742a5e74c57e3964d766e1032982145872", - "reference": "d3a64b742a5e74c57e3964d766e1032982145872", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", "shasum": "" }, "require": { @@ -14288,7 +14292,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.17.0" + "source": "https://github.com/twigphp/Twig/tree/v3.17.1" }, "funding": [ { @@ -14300,7 +14304,7 @@ "type": "tidelift" } ], - "time": "2024-12-10T15:19:11+00:00" + "time": "2024-12-12T09:58:10+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/language/fi/views.view.helfi_redirect.yml b/conf/cmi/language/fi/views.view.helfi_redirect.yml index 78822a3c..039970d4 100644 --- a/conf/cmi/language/fi/views.view.helfi_redirect.yml +++ b/conf/cmi/language/fi/views.view.helfi_redirect.yml @@ -5,20 +5,20 @@ display: status_code: group_info: group_items: - 7: - title: '300 Multiple Choices' 1: - title: '300 Multiple Choices' + title: '300 Useita valintoja' 2: - title: '301 Moved Permanently' + title: '301 Pysyvästi siirretty' 3: - title: '302 Found' + title: '302 Löydetty' 4: - title: '303 See Other' + title: '303 Kts. toinen' 5: - title: '304 Not Modified' + title: '304 Muuttamaton' 6: - title: '305 Use Proxy' + title: '305 Käytä proxyä' + 7: + title: '307 Tilapäinen uudelleenohjaus' label: Tilakoodi expose: label: Tilakoodi @@ -34,6 +34,9 @@ display: is_custom: expose: label: 'Käyttäjän luoma' + status: + expose: + label: Julkaistu exposed_form: options: submit_button: Suodata @@ -48,10 +51,10 @@ display: items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: - next: 'next ›' - previous: '‹ previous' - first: '« first' - last: 'last »' + previous: '‹ edellinen' + next: 'seuraava ›' + first: '« ensimmäinen' + last: 'viimeinen »' fields: redirect_bulk_form: action_title: Valinnalla @@ -63,6 +66,9 @@ display: is_custom: label: 'Käyttäjän luoma' separator: ', ' + status: + label: Julkaistu + separator: ', ' empty: area_text_custom: content: 'Ei ole vielä uudelleenohjaksia.' diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml index 60743d70..ef9ae2b3 100644 --- a/conf/cmi/language/fi/views.view.redirect.yml +++ b/conf/cmi/language/fi/views.view.redirect.yml @@ -14,10 +14,10 @@ display: pager: options: tags: - previous: '‹ previous' - next: 'next ›' - first: '« first' - last: 'last »' + previous: '‹ edellinen' + next: 'seuraava ›' + first: '« ensimmäinen' + last: 'viimeinen »' expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' @@ -44,7 +44,7 @@ display: label: Tilakoodi group_items: 7: - title: '300 Multiple Choices' + title: '307 Tilapäinen uudelleenohjaus' language: expose: label: 'Alkuperäinen kieli' diff --git a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml index db5a883f..2f57f70a 100644 --- a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml @@ -63,10 +63,10 @@ display: pager: options: tags: - previous: '‹ previous' - next: 'next ›' - first: '« first' - last: 'last »' + previous: '‹ edellinen' + next: 'seuraava ›' + first: '« ensimmäinen' + last: 'viimeinen »' display_title: Oletus overview: display_options: diff --git a/conf/cmi/language/sv/views.view.helfi_redirect.yml b/conf/cmi/language/sv/views.view.helfi_redirect.yml index aef24d5d..08b9bf6d 100644 --- a/conf/cmi/language/sv/views.view.helfi_redirect.yml +++ b/conf/cmi/language/sv/views.view.helfi_redirect.yml @@ -16,6 +16,9 @@ display: separator: ', ' created: label: Skapad + status: + label: Publicerad + separator: ', ' pager: options: tags: @@ -58,6 +61,9 @@ display: is_custom: expose: label: Anpassad + status: + expose: + label: Publicerad page_1: display_title: Sida display_options: diff --git a/conf/cmi/views.view.helfi_redirect.yml b/conf/cmi/views.view.helfi_redirect.yml index a3f968da..cb34781c 100644 --- a/conf/cmi/views.view.helfi_redirect.yml +++ b/conf/cmi/views.view.helfi_redirect.yml @@ -9,7 +9,7 @@ dependencies: - redirect - user _core: - default_config_hash: h9PYX1gxwmkwfgZUv0BJ_Js6-woWmUbyPSK0INlm538 + default_config_hash: T8ZZY-2rwfH9QPXho30lLjOnPsWsLzhy6YGOTix228k id: helfi_redirect label: Redirect module: views @@ -224,6 +224,73 @@ display: multi_type: separator separator: ', ' field_api_classes: false + status: + id: status + table: redirect + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: status + plugin_id: field + label: Published + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: default + format_custom_false: '' + format_custom_true: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false language: id: language table: redirect @@ -631,14 +698,14 @@ display: exposed: true expose: operator_id: '' - label: Julkaistu + label: Published description: '' use_operator: false operator: status_op operator_limit_selection: false operator_list: { } identifier: status - required: true + required: false remember: false multiple: false remember_roles: @@ -675,14 +742,22 @@ display: row_class: '' default_row_class: true columns: + redirect_bulk_form: redirect_bulk_form redirect_source__path: redirect_source__path redirect_redirect__uri: redirect_redirect__uri status_code: status_code + is_custom: is_custom + status: status language: language created: created operations: operations default: created info: + redirect_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' redirect_source__path: sortable: true default_sort_order: asc @@ -704,6 +779,20 @@ display: separator: '' empty_column: false responsive: '' + is_custom: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' language: sortable: true default_sort_order: asc @@ -719,8 +808,6 @@ display: empty_column: false responsive: '' operations: - sortable: false - default_sort_order: asc align: '' separator: '' empty_column: false diff --git a/tools/make/project/db-sync.sh b/tools/make/project/db-sync.sh index 9ed73f5d..2d69f38e 100644 --- a/tools/make/project/db-sync.sh +++ b/tools/make/project/db-sync.sh @@ -17,8 +17,9 @@ if [ ! -n "$OC_POD_NAME" ]; then exit 1 fi +oc rsh $OC_POD_NAME rm -f /tmp/dump.sql oc rsh $OC_POD_NAME drush sql:dump --structure-tables-key=common \ - --extra-dump="--no-tablespaces --hex-blob" \ + --extra-dump='--no-tablespaces --hex-blob' \ --result-file=/tmp/dump.sql oc rsync $OC_POD_NAME:/tmp/dump.sql /app diff --git a/tools/make/project/git.mk b/tools/make/project/git.mk index 9ef1f3d9..50b03e87 100644 --- a/tools/make/project/git.mk +++ b/tools/make/project/git.mk @@ -1,3 +1,3 @@ PHONY += copy-commit-message-script copy-commit-message-script: - @$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks;) + @$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks || true;) From 32dfc05e454904444033a030dd921820dc25ea8a Mon Sep 17 00:00:00 2001 From: tuutti Date: Fri, 13 Dec 2024 13:54:16 +0200 Subject: [PATCH 6/9] UHF-11137: Run CI pipelines using Docker compose setup --- .github/workflows/artifact.yml | 38 ++++++++--------- .github/workflows/test.yml | 75 +++++++++++++++------------------- compose.ci.yaml | 6 +++ compose.yaml | 2 + composer.lock | 12 +++--- 5 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 compose.ci.yaml diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index 2287bfbc..969bfa81 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -8,32 +8,32 @@ name: Build artifacts jobs: build: runs-on: ubuntu-latest - container: - image: ghcr.io/city-of-helsinki/drupal-web:8.3 - - services: - db: - image: mysql:8 - env: - MYSQL_USER: drupal - MYSQL_PASSWORD: drupal - MYSQL_DATABASE: drupal - MYSQL_ROOT_PASSWORD: drupal - ports: - - 3306:3306 - steps: - uses: actions/checkout@v4 + - name: Install and start Stonehenge + run: | + git clone -b 5.x https://github.com/druidfi/stonehenge.git ~/stonehenge + cd ~/stonehenge && make up + + # This must be done after we start Stonehenge. + - name: Setup Docker compose environment variables + run: | + echo "COMPOSE_FILE=compose.yaml:compose.ci.yaml" >> $GITHUB_ENV + + - name: Start project + run: make up + - name: Build project - run: composer install --no-interaction + run: docker compose exec app bash -c "composer install --no-interaction" - name: Setup drupal and save database dump run: | - drush si -y && drush cr - drush si --existing-config -y - drush cim -y - drush sql-dump --result-file=${GITHUB_WORKSPACE}/latest.sql + docker compose exec app bash -c "drush si -y && drush cr" + docker compose exec app bash -c "drush si --existing-config -y" + docker compose exec app bash -c "drush cr" + docker compose exec app bash -c "drush cim -y" + docker compose exec app bash -c "drush sql-dump --result-file=/app/latest.sql" - name: Upload latest database dump uses: actions/upload-artifact@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ae35ace..232aff57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,39 +3,12 @@ on: push: branches: ['main', 'dev'] name: CI -env: - SYMFONY_DEPRECATIONS_HELPER: disabled jobs: tests: runs-on: ubuntu-latest - container: - image: ghcr.io/city-of-helsinki/drupal-web:8.3 - options: --hostname app --user 1001 - - services: - db: - image: mysql:8 - env: - MYSQL_USER: drupal - MYSQL_PASSWORD: drupal - MYSQL_DATABASE: drupal - MYSQL_ROOT_PASSWORD: drupal - ports: - - 3306:3306 steps: - uses: actions/checkout@v4 - # Actions worker overrides the default entrypoint with "tail -f /dev/null", so - # we have to start services manually. - - name: Start services - env: - WEBROOT: ${{ github.workspace }}/public - run: entrypoint & - - - name: Set browsertest output folder - run: | - echo "BROWSERTEST_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/public/sites/simpletest" >> $GITHUB_ENV - - name: Make sure configuration was exported in correct language (en or und) run: | OUTPUT=$(grep -oP '^langcode: \b(?!(?:en|und)\b)\w+' conf -R || true) @@ -46,22 +19,36 @@ jobs: exit 1 fi + - name: Install and start Stonehenge + run: | + git clone -b 5.x https://github.com/druidfi/stonehenge.git ~/stonehenge + cd ~/stonehenge && make up + + # This must be done after we start Stonehenge. + - name: Setup Docker compose environment variables + run: | + echo "COMPOSE_FILE=compose.yaml:compose.ci.yaml" >> $GITHUB_ENV + echo "COMPOSE_PROFILES=" >> $GITHUB_ENV + + - name: Start project + run: make up + - name: Build project - run: composer install --no-interaction + run: docker compose exec app bash -c "composer install --no-interaction" - name: Scan security updates - run: composer audit + run: docker compose exec app bash -c "composer audit" - name: Check that subtheme is not built with dev mode - run: if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi + run: docker compose exec app bash -c "if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi" - name: Run PHPCS run: | - vendor/bin/phpcs public/modules/custom/ - vendor/bin/phpcs public/themes/custom/ + docker compose exec app bash -c "vendor/bin/phpcs public/modules/custom/" + docker compose exec app bash -c "vendor/bin/phpcs public/themes/custom/" - name: Run phpstan - run: vendor/bin/phpstan analyze + run: docker compose exec app bash -c "vendor/bin/phpstan analyze" - name: Download latest dump env: @@ -70,22 +57,26 @@ jobs: - name: Install Drupal run: | - mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql - drush deploy - - - name: Start services - run: | - for i in {1..5}; do RESPONSE_CODE=$(curl -k -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done + docker compose exec app bash -c "mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql" + docker compose exec app bash -c "drush deploy" - name: Run PHPUnit tests run: | - composer test-php public/modules/custom - if [ -d "tests/" ]; then composer test-php tests/; else echo "No DTT tests found. Ignoring..."; fi + docker compose exec app bash -c "mkdir -p /app/results" + + if [ -d "tests/" ]; then + docker compose exec app bash -c "composer test-php tests/" + fi + docker compose exec app bash -c "composer test-php public/modules/custom" + + - name: Export logs + if: always() + run: docker compose logs app > results/service.log - name: Create an artifact from test report uses: actions/upload-artifact@v4 if: always() with: name: results - path: ${{ env.BROWSERTEST_OUTPUT_DIRECTORY }} + path: results/ retention-days: 1 diff --git a/compose.ci.yaml b/compose.ci.yaml new file mode 100644 index 00000000..20999387 --- /dev/null +++ b/compose.ci.yaml @@ -0,0 +1,6 @@ +services: + app: + user: "1001:1001" + environment: + SYMFONY_DEPRECATIONS_HELPER: disabled + BROWSERTEST_OUTPUT_DIRECTORY: /app/results diff --git a/compose.yaml b/compose.yaml index 0e64d1db..cdf6ca7d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -87,6 +87,8 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true" - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081" - "traefik.docker.network=stonehenge-network" + profiles: + - varnish elastic-proxy: container_name: "${COMPOSE_PROJECT_NAME}-elastic-proxy" image: nginxinc/nginx-unprivileged:alpine-perl diff --git a/composer.lock b/composer.lock index 7258b169..1ae5c506 100644 --- a/composer.lock +++ b/composer.lock @@ -4300,12 +4300,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76" + "reference": "c8f0aa0b247712eca0292073f6710746a511dd81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/845a8c470a6f593b08e100f3c3d688fb07600f76", - "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/c8f0aa0b247712eca0292073f6710746a511dd81", + "reference": "c8f0aa0b247712eca0292073f6710746a511dd81", "shasum": "" }, "require": { @@ -4380,7 +4380,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-12-12T12:14:31+00:00" + "time": "2024-12-13T11:44:35+00:00" }, { "name": "drupal/helfi_navigation", @@ -19445,7 +19445,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": {}, - "platform-dev": {}, + "platform": [], + "platform-dev": [], "plugin-api-version": "2.6.0" } From c17a2c06fc6ddaa5cb34b58c8286a6258ce52874 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:25:22 +0000 Subject: [PATCH 7/9] Update configuration --- composer.lock | 104 +++++++++--------- ...iew_display.paragraph.hearings.default.yml | 2 +- ...es.external_entity_type.helfi_hearings.yml | 2 +- ...tities.external_entity_type.helfi_news.yml | 2 +- ...external_entity_type.helfi_news_groups.yml | 2 +- ..._entity_type.helfi_news_neighbourhoods.yml | 2 +- ...s.external_entity_type.helfi_news_tags.yml | 2 +- conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- tools/make/project/git.mk | 2 +- 14 files changed, 68 insertions(+), 64 deletions(-) diff --git a/composer.lock b/composer.lock index 1ae5c506..961f1f6d 100644 --- a/composer.lock +++ b/composer.lock @@ -680,16 +680,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.10.0", + "version": "4.10.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c" + "reference": "362310b13ececa9f6f0a4a880811fa08fecc348b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e830ba908c9ffb1ba7ca056203531b27188812c", - "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/362310b13ececa9f6f0a4a880811fa08fecc348b", + "reference": "362310b13ececa9f6f0a4a880811fa08fecc348b", "shasum": "" }, "require": { @@ -730,9 +730,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.10.0" + "source": "https://github.com/consolidation/annotated-command/tree/4.10.1" }, - "time": "2024-04-05T21:05:39+00:00" + "time": "2024-12-13T19:55:40+00:00" }, { "name": "consolidation/config", @@ -1080,16 +1080,16 @@ }, { "name": "consolidation/site-alias", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/site-alias.git", - "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf" + "reference": "aff6189aae17da813d23249cb2fc0fff33f26d40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-alias/zipball/1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", - "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", + "url": "https://api.github.com/repos/consolidation/site-alias/zipball/aff6189aae17da813d23249cb2fc0fff33f26d40", + "reference": "aff6189aae17da813d23249cb2fc0fff33f26d40", "shasum": "" }, "require": { @@ -1133,22 +1133,22 @@ "description": "Manage alias records for local and remote sites.", "support": { "issues": "https://github.com/consolidation/site-alias/issues", - "source": "https://github.com/consolidation/site-alias/tree/4.1.0" + "source": "https://github.com/consolidation/site-alias/tree/4.1.1" }, - "time": "2024-04-05T15:58:04+00:00" + "time": "2024-12-13T19:05:11+00:00" }, { "name": "consolidation/site-process", - "version": "5.4.0", + "version": "5.4.2", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a" + "reference": "e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", - "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da", + "reference": "e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da", "shasum": "" }, "require": { @@ -1190,9 +1190,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.4.0" + "source": "https://github.com/consolidation/site-process/tree/5.4.2" }, - "time": "2024-04-06T00:00:28+00:00" + "time": "2024-12-13T19:25:56+00:00" }, { "name": "cweagans/composer-patches", @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.21", + "version": "6.8.23", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "cd8b74a7afc7ec488979a426809e5386383a3bef" + "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cd8b74a7afc7ec488979a426809e5386383a3bef", - "reference": "cd8b74a7afc7ec488979a426809e5386383a3bef", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b14bd481f81a0be27eaf3ab2a1db0c2a86c66511", + "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.21", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.23", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-13T08:38:26+00:00" + "time": "2024-12-17T07:20:53+00:00" }, { "name": "drupal/hdbt_admin", @@ -5845,7 +5845,11 @@ "homepage": "https://www.drupal.org/user/99012" }, { - "name": "Sheldon Rampton", + "name": "mably", + "homepage": "https://www.drupal.org/user/3375160" + }, + { + "name": "sheldon rampton", "homepage": "https://www.drupal.org/user/13085" }, { @@ -5925,17 +5929,17 @@ }, { "name": "drupal/raven", - "version": "6.0.12", + "version": "6.0.13", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "6.0.12" + "reference": "6.0.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-6.0.12.zip", - "reference": "6.0.12", - "shasum": "5ba241ff4109be407cb9660a8743aad5a24b9fba" + "url": "https://ftp.drupal.org/files/projects/raven-6.0.13.zip", + "reference": "6.0.13", + "shasum": "7b92e693dae63859457ba734c57382511b91af86" }, "require": { "drupal/core": "^10.2 || ^11", @@ -5949,8 +5953,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.12", - "datestamp": "1733335477", + "version": "6.0.13", + "datestamp": "1734389510", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6630,10 +6634,6 @@ "GPL-2.0+" ], "authors": [ - { - "name": "bartvig", - "homepage": "https://www.drupal.org/user/3107079" - }, { "name": "beltofte", "homepage": "https://www.drupal.org/user/151799" @@ -6650,6 +6650,10 @@ "name": "kreynen", "homepage": "https://www.drupal.org/user/48877" }, + { + "name": "mortenthorpe", + "homepage": "https://www.drupal.org/user/870762" + }, { "name": "rofejo", "homepage": "https://www.drupal.org/user/3284851" @@ -7999,16 +8003,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "c8c686cc6f77316b23128a83334877debf645dfb" + "reference": "f37ea54dab6f286dd37d937c069b80b601003df0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/c8c686cc6f77316b23128a83334877debf645dfb", - "reference": "c8c686cc6f77316b23128a83334877debf645dfb", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/f37ea54dab6f286dd37d937c069b80b601003df0", + "reference": "f37ea54dab6f286dd37d937c069b80b601003df0", "shasum": "" }, "require": { @@ -8051,9 +8055,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.2.0" + "source": "https://github.com/FileEye/MimeMap/tree/2.2.1" }, - "time": "2024-10-20T18:59:36+00:00" + "time": "2024-12-16T19:03:35+00:00" }, { "name": "fileeye/pel", @@ -11271,16 +11275,16 @@ }, { "name": "stomp-php/stomp-php", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/stomp-php/stomp-php.git", - "reference": "cf1fbd79cf48b9701909e42205f1d968cec6ff7a" + "reference": "942d93563eefc9dee40e836e594ee16dd08653f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/cf1fbd79cf48b9701909e42205f1d968cec6ff7a", - "reference": "cf1fbd79cf48b9701909e42205f1d968cec6ff7a", + "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/942d93563eefc9dee40e836e594ee16dd08653f0", + "reference": "942d93563eefc9dee40e836e594ee16dd08653f0", "shasum": "" }, "require": { @@ -11328,7 +11332,7 @@ ], "support": { "issues": "https://github.com/stomp-php/stomp-php/issues", - "source": "https://github.com/stomp-php/stomp-php/tree/5.1.0" + "source": "https://github.com/stomp-php/stomp-php/tree/5.1.1" }, "funding": [ { @@ -11340,7 +11344,7 @@ "type": "github" } ], - "time": "2023-06-19T17:34:28+00:00" + "time": "2024-12-13T08:48:49+00:00" }, { "name": "symfony/console", @@ -19445,7 +19449,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml index 996451f7..79bb92b6 100644 --- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -31,9 +31,9 @@ content: weight: 0 region: content list: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: search_api_excerpt: true diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index a9d27ade..e32ea709 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index acaeb670..b56a9bff 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -8,8 +8,8 @@ id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index 7ff66073..2e213e2c 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -8,8 +8,8 @@ id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index f22d0083..61a08a75 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 0e645be5..37ff4a4f 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -8,8 +8,8 @@ id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index dd75506a..cbd32963 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,6 +91,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -105,7 +106,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 40c45ab7..d3b78196 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index f93c303c..59e80957 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index e2ccbdeb..7e190ab5 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,6 +109,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -126,7 +127,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,6 +646,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -663,7 +664,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index 5e54873d..c3564257 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,6 +93,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -110,7 +111,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 5b74a468..1f257d56 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,6 +286,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -303,7 +304,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/tools/make/project/git.mk b/tools/make/project/git.mk index 50b03e87..c598f4d7 100644 --- a/tools/make/project/git.mk +++ b/tools/make/project/git.mk @@ -1,3 +1,3 @@ PHONY += copy-commit-message-script copy-commit-message-script: - @$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks || true;) + @$(foreach name,$(shell find . -type d -name ".git" -exec dirname {} \; 2> /dev/null ),cp tools/commit-msg $(name)/.git/hooks;) From 8774703f0aeff5657bacf9f86eb626650ac9adcb Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 18 Dec 2024 06:35:10 +0000 Subject: [PATCH 8/9] Update configuration --- .github/dependabot.yml.dist | 18 + .platform/schema | 2 +- compose.yaml | 2 +- composer.json | 8 +- composer.lock | 1589 ++++++++++------- ...t.resource.helfi_debug_package_version.yml | 21 - tools/make/project/install.mk | 2 +- 7 files changed, 1002 insertions(+), 640 deletions(-) create mode 100644 .github/dependabot.yml.dist delete mode 100644 conf/cmi/rest.resource.helfi_debug_package_version.yml diff --git a/.github/dependabot.yml.dist b/.github/dependabot.yml.dist new file mode 100644 index 00000000..5bfbfcdb --- /dev/null +++ b/.github/dependabot.yml.dist @@ -0,0 +1,18 @@ +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file +version: 2 +updates: + - package-ecosystem: "composer" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + allow: + # Update only direct dependencies. This reduces spam since most + # indirect dependencies are handles by update-config workflow. + - dependency-type: "direct" + ignore: + # Updated by update-config workflow + - dependency-name: "drupal/helfi_*" + - dependency-name: "drupal/hdbt*" + # Updated separately + - dependency-name: "drupal/core*" diff --git a/.platform/schema b/.platform/schema index 3cacc0b9..da2d3988 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -12 \ No newline at end of file +14 \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index cdf6ca7d..87ecd364 100644 --- a/compose.yaml +++ b/compose.yaml @@ -118,7 +118,7 @@ services: profiles: - search elastic: - image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 container_name: "${COMPOSE_PROJECT_NAME}-elastic" environment: - node.name="${COMPOSE_PROJECT_NAME}-elastic" diff --git a/composer.json b/composer.json index 0607dc87..7e1b4c78 100644 --- a/composer.json +++ b/composer.json @@ -26,15 +26,9 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "dg/bypass-finals": "^1.5", - "drupal/coder": "^8.3", - "drupal/core-dev": "^10.0", + "drupal/core-dev": "^10", "jangregor/phpstan-prophecy": "^1.0", - "mglaman/phpstan-drupal": "^1.2", - "phpspec/prophecy-phpunit": "^2", - "phpstan/extension-installer": "^1.3", - "phpstan/phpstan": "^1.10", "phpstan/phpstan-deprecation-rules": "^1.1", - "phpunit/phpunit": "^9.6", "weitzman/drupal-test-traits": "^2.1" }, "conflict": { diff --git a/composer.lock b/composer.lock index 961f1f6d..032e7c27 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": "f683eee3a4d505ea9156a46362e1deeb", + "content-hash": "1e10f5963c0b2d8d2d626e3a865ad73f", "packages": [ { "name": "asm89/stack-cors", @@ -2257,16 +2257,16 @@ }, { "name": "drupal/core", - "version": "10.3.10", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" + "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", - "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", + "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", "shasum": "" }, "require": { @@ -2312,7 +2312,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.14.2" + "twig/twig": "^3.15.0" }, "conflict": { "drush/drush": "<12.4.3" @@ -2415,22 +2415,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.10" + "source": "https://github.com/drupal/core/tree/10.4.0" }, - "time": "2024-11-22T12:51:33+00:00" + "time": "2024-12-17T22:18:01+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.10", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc" + "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/f58ab5c0d02d275c5aa226c4505b457e41b161cc", - "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/db17b59620ce1c142a34dc017d9e696ce4771e55", + "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55", "shasum": "" }, "require": { @@ -2465,9 +2465,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" }, - "time": "2024-08-22T14:31:34+00:00" + "time": "2024-08-22T14:31:30+00:00" }, { "name": "drupal/crop", @@ -4108,16 +4108,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "3.2.10", + "version": "3.2.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "36437872af9f46e205ec7aff2ff27115e9c6edf1" + "reference": "a0d89ce0318306edac0cde747367217ed53b2196" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/36437872af9f46e205ec7aff2ff27115e9c6edf1", - "reference": "36437872af9f46e205ec7aff2ff27115e9c6edf1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/a0d89ce0318306edac0cde747367217ed53b2196", + "reference": "a0d89ce0318306edac0cde747367217ed53b2196", "shasum": "" }, "require": { @@ -4145,10 +4145,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-11-19T13:01:05+00:00" + "time": "2024-12-17T08:36:44+00:00" }, { "name": "drupal/health_check", @@ -4202,16 +4202,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.19", + "version": "2.7.21", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "096a75dd49d1ae4db5959980337de4b77d10cce5" + "reference": "4f747fe4aed94ed98f6fa18c87578aebd2b84560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/096a75dd49d1ae4db5959980337de4b77d10cce5", - "reference": "096a75dd49d1ae4db5959980337de4b77d10cce5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4f747fe4aed94ed98f6fa18c87578aebd2b84560", + "reference": "4f747fe4aed94ed98f6fa18c87578aebd2b84560", "shasum": "" }, "require": { @@ -4243,10 +4243,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.19", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.21", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-11-29T09:44:21+00:00" + "time": "2024-12-17T09:15:47+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4300,12 +4300,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "c8f0aa0b247712eca0292073f6710746a511dd81" + "reference": "2eb037b210a0c311ad8e742d3c1fd97e89d7b677" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/c8f0aa0b247712eca0292073f6710746a511dd81", - "reference": "c8f0aa0b247712eca0292073f6710746a511dd81", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/2eb037b210a0c311ad8e742d3c1fd97e89d7b677", + "reference": "2eb037b210a0c311ad8e742d3c1fd97e89d7b677", "shasum": "" }, "require": { @@ -4380,7 +4380,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-12-13T11:44:35+00:00" + "time": "2024-12-17T10:07:01+00:00" }, { "name": "drupal/helfi_navigation", @@ -4418,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.3", + "version": "4.10.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "f2d8dc24500044936ea6dba39134d1d2eaf710db" + "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f2d8dc24500044936ea6dba39134d1d2eaf710db", - "reference": "f2d8dc24500044936ea6dba39134d1d2eaf710db", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/24833b53e247ee6e56a852eb497139ee8883e6ac", + "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac", "shasum": "" }, "require": { @@ -4523,8 +4523,7 @@ "[#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 configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", - "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4553,10 +4552,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.3", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-13T08:38:18+00:00" + "time": "2024-12-18T06:30:07+00:00" }, { "name": "drupal/helfi_proxy", @@ -6735,27 +6734,27 @@ }, { "name": "drupal/sophron", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.1.0" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.1.0.zip", - "reference": "2.1.0", - "shasum": "0742562897ae9b202e472a1edef75844b6452e39" + "url": "https://ftp.drupal.org/files/projects/sophron-2.2.0.zip", + "reference": "2.2.0", + "shasum": "fa4670e775443db3f465cc25b02c7c82e5c382bf" }, "require": { "drupal/core": "^10.2 || ^11", - "fileeye/mimemap": "^2.1.1" + "fileeye/mimemap": "^2.2.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0", - "datestamp": "1718011690", + "version": "2.2.0", + "datestamp": "1734432598", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9650,33 +9649,36 @@ }, { "name": "open-telemetry/api", - "version": "1.0.3", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "87de95d926f46262885d0d390060c095af13e2e5" + "reference": "04c85a1e41a3d59fa9bdc801a5de1df6624b95ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", - "reference": "87de95d926f46262885d0d390060c095af13e2e5", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/04c85a1e41a3d59fa9bdc801a5de1df6624b95ed", + "reference": "04c85a1e41a3d59fa9bdc801a5de1df6624b95ed", "shasum": "" }, "require": { "open-telemetry/context": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^8.1", "psr/log": "^1.1|^2.0|^3.0", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", "symfony/polyfill-php82": "^1.26" }, "conflict": { - "open-telemetry/sdk": "<=1.0.4" + "open-telemetry/sdk": "<=1.0.8" }, "type": "library", "extra": { + "spi": { + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [ + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager" + ] + }, "branch-alias": { - "dev-main": "1.0.x-dev" + "dev-main": "1.1.x-dev" } }, "autoload": { @@ -9713,7 +9715,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-02-06T01:32:25+00:00" + "time": "2024-11-16T04:32:30+00:00" }, { "name": "open-telemetry/context", @@ -12921,86 +12923,6 @@ ], "time": "2020-10-23T14:02:19+00:00" }, - { - "name": "symfony/polyfill-php80", - "version": "v1.31.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" - }, - "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": "2024-09-09T11:45:10+00:00" - }, { "name": "symfony/polyfill-php81", "version": "v1.31.0", @@ -14505,16 +14427,16 @@ "packages-dev": [ { "name": "behat/mink", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "d8527fdf8785aad38455fb426af457ab9937aece" + "reference": "7e4edec6c335937029cb3569ce7ef81182804d0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/d8527fdf8785aad38455fb426af457ab9937aece", - "reference": "d8527fdf8785aad38455fb426af457ab9937aece", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/7e4edec6c335937029cb3569ce7ef81182804d0a", + "reference": "7e4edec6c335937029cb3569ce7ef81182804d0a", "shasum": "" }, "require": { @@ -14565,9 +14487,9 @@ ], "support": { "issues": "https://github.com/minkphp/Mink/issues", - "source": "https://github.com/minkphp/Mink/tree/v1.11.0" + "source": "https://github.com/minkphp/Mink/tree/v1.12.0" }, - "time": "2023-12-09T11:23:23+00:00" + "time": "2024-10-30T18:48:14+00:00" }, { "name": "behat/mink-browserkit-driver", @@ -14638,74 +14560,64 @@ "time": "2023-12-09T11:30:50+00:00" }, { - "name": "behat/mink-selenium2-driver", - "version": "v1.7.0", + "name": "brick/math", + "version": "0.12.1", "source": { "type": "git", - "url": "https://github.com/minkphp/MinkSelenium2Driver.git", - "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a" + "url": "https://github.com/brick/math.git", + "reference": "f510c0a40911935b77b86859eb5223d58d660df1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/4ca4083f305de7dff4434ac402dc4e3f39c0866a", - "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a", + "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1", + "reference": "f510c0a40911935b77b86859eb5223d58d660df1", "shasum": "" }, "require": { - "behat/mink": "^1.11@dev", - "ext-json": "*", - "instaclick/php-webdriver": "^1.4.14", - "php": ">=7.2" + "php": "^8.1" }, "require-dev": { - "mink/driver-testsuite": "dev-master", - "phpstan/phpstan": "^1.10", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^8.5.22 || ^9.5.11", - "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0" - }, - "type": "mink-driver", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^10.1", + "vimeo/psalm": "5.16.0" }, + "type": "library", "autoload": { "psr-4": { - "Behat\\Mink\\Driver\\": "src/" + "Brick\\Math\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Pete Otaqui", - "email": "pete@otaqui.com", - "homepage": "https://github.com/pete-otaqui" - }, + "description": "Arbitrary-precision arithmetic library", + "keywords": [ + "Arbitrary-precision", + "BigInteger", + "BigRational", + "arithmetic", + "bigdecimal", + "bignum", + "bignumber", + "brick", + "decimal", + "integer", + "math", + "mathematics", + "rational" + ], + "support": { + "issues": "https://github.com/brick/math/issues", + "source": "https://github.com/brick/math/tree/0.12.1" + }, + "funding": [ { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "url": "https://github.com/BenMorel", + "type": "github" } ], - "description": "Selenium2 (WebDriver) driver for Mink framework", - "homepage": "https://mink.behat.org/", - "keywords": [ - "ajax", - "browser", - "javascript", - "selenium", - "testing", - "webdriver" - ], - "support": { - "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues", - "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.7.0" - }, - "time": "2023-12-09T11:58:45+00:00" + "time": "2023-11-29T23:19:16+00:00" }, { "name": "colinodell/psr-testlogger", @@ -14788,16 +14700,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.0", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" + "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/bc0593537a463e55cadf45fd938d23b75095b7e1", + "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1", "shasum": "" }, "require": { @@ -14807,8 +14719,8 @@ }, "require-dev": { "phpstan/phpstan": "^1.10", - "psr/log": "^1.0", - "symfony/phpunit-bridge": "^4.2 || ^5", + "phpunit/phpunit": "^8 || ^9", + "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", @@ -14844,7 +14756,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.0" + "source": "https://github.com/composer/ca-bundle/tree/1.5.4" }, "funding": [ { @@ -14860,20 +14772,20 @@ "type": "tidelift" } ], - "time": "2024-03-15T14:00:32+00:00" + "time": "2024-11-27T15:35:25+00:00" }, { "name": "composer/class-map-generator", - "version": "1.3.4", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3" + "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", - "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915", + "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915", "shasum": "" }, "require": { @@ -14882,12 +14794,12 @@ "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" }, "require-dev": { - "phpstan/phpstan": "^1.6", - "phpstan/phpstan-deprecation-rules": "^1", - "phpstan/phpstan-phpunit": "^1", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/filesystem": "^5.4 || ^6", - "symfony/phpunit-bridge": "^5" + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-deprecation-rules": "^1 || ^2", + "phpstan/phpstan-phpunit": "^1 || ^2", + "phpstan/phpstan-strict-rules": "^1.1 || ^2", + "phpunit/phpunit": "^8", + "symfony/filesystem": "^5.4 || ^6" }, "type": "library", "extra": { @@ -14917,7 +14829,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.3.4" + "source": "https://github.com/composer/class-map-generator/tree/1.5.0" }, "funding": [ { @@ -14933,52 +14845,52 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:13:04+00:00" + "time": "2024-11-25T16:11:06+00:00" }, { "name": "composer/composer", - "version": "2.7.7", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "291942978f39435cf904d33739f98d7d4eca7b23" + "reference": "112e37d1dca22b3fdb81cf3524ab4994f47fdb8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23", - "reference": "291942978f39435cf904d33739f98d7d4eca7b23", + "url": "https://api.github.com/repos/composer/composer/zipball/112e37d1dca22b3fdb81cf3524ab4994f47fdb8c", + "reference": "112e37d1dca22b3fdb81cf3524ab4994f47fdb8c", "shasum": "" }, "require": { - "composer/ca-bundle": "^1.0", - "composer/class-map-generator": "^1.3.3", + "composer/ca-bundle": "^1.5", + "composer/class-map-generator": "^1.4.0", "composer/metadata-minifier": "^1.0", - "composer/pcre": "^2.1 || ^3.1", + "composer/pcre": "^2.2 || ^3.2", "composer/semver": "^3.3", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", - "justinrainbow/json-schema": "^5.2.11", + "justinrainbow/json-schema": "^5.3", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^2.8 || ^3", + "react/promise": "^2.11 || ^3.2", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11 || ^7", - "symfony/filesystem": "^5.4 || ^6.0 || ^7", - "symfony/finder": "^5.4 || ^6.0 || ^7", + "symfony/console": "^5.4.35 || ^6.3.12 || ^7.0.3", + "symfony/filesystem": "^5.4.35 || ^6.3.12 || ^7.0.3", + "symfony/finder": "^5.4.35 || ^6.3.12 || ^7.0.3", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", "symfony/polyfill-php81": "^1.24", - "symfony/process": "^5.4 || ^6.0 || ^7" + "symfony/process": "^5.4.35 || ^6.3.12 || ^7.0.3" }, "require-dev": { - "phpstan/phpstan": "^1.11.0", + "phpstan/phpstan": "^1.11.8", "phpstan/phpstan-deprecation-rules": "^1.2.0", "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.0", "phpstan/phpstan-symfony": "^1.4.0", - "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" + "symfony/phpunit-bridge": "^6.4.3 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -14990,13 +14902,13 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.7-dev" - }, "phpstan": { "includes": [ "phpstan/rules.neon" ] + }, + "branch-alias": { + "dev-main": "2.8-dev" } }, "autoload": { @@ -15031,7 +14943,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.7" + "source": "https://github.com/composer/composer/tree/2.8.4" }, "funding": [ { @@ -15047,7 +14959,7 @@ "type": "tidelift" } ], - "time": "2024-06-10T20:11:12+00:00" + "time": "2024-12-11T10:57:47+00:00" }, { "name": "composer/metadata-minifier", @@ -15120,30 +15032,38 @@ }, { "name": "composer/pcre", - "version": "3.1.4", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "04229f163664973f68f38f6f73d917799168ef24" + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", - "reference": "04229f163664973f68f38f6f73d917799168ef24", + "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, "require-dev": { - "phpstan/phpstan": "^1.3", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-strict-rules": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -15171,7 +15091,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.4" + "source": "https://github.com/composer/pcre/tree/3.3.2" }, "funding": [ { @@ -15187,7 +15107,7 @@ "type": "tidelift" } ], - "time": "2024-05-27T13:40:54+00:00" + "time": "2024-11-12T16:29:46+00:00" }, { "name": "composer/spdx-licenses", @@ -15535,16 +15455,16 @@ }, { "name": "drupal/coder", - "version": "8.3.24", + "version": "8.3.26", "source": { "type": "git", "url": "https://github.com/pfrenssen/coder.git", - "reference": "1a59890f972db5da091354f0191dec1037f7c582" + "reference": "fd98546ce3373aa7767240901eda47963ce64c82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/coder/zipball/1a59890f972db5da091354f0191dec1037f7c582", - "reference": "1a59890f972db5da091354f0191dec1037f7c582", + "url": "https://api.github.com/repos/pfrenssen/coder/zipball/fd98546ce3373aa7767240901eda47963ce64c82", + "reference": "fd98546ce3373aa7767240901eda47963ce64c82", "shasum": "" }, "require": { @@ -15582,32 +15502,32 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2024-04-21T06:13:24+00:00" + "time": "2024-11-28T23:14:29+00:00" }, { "name": "drupal/core-dev", - "version": "10.2.3", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "8c1bf854f2cf47d4f06918099ea866ce2471b2c6" + "reference": "9c6c089f73671083d9588affa287a59a80e6edc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/8c1bf854f2cf47d4f06918099ea866ce2471b2c6", - "reference": "8c1bf854f2cf47d4f06918099ea866ce2471b2c6", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/9c6c089f73671083d9588affa287a59a80e6edc8", + "reference": "9c6c089f73671083d9588affa287a59a80e6edc8", "shasum": "" }, "require": { - "behat/mink": "^1.10", - "behat/mink-browserkit-driver": "^2.1", - "behat/mink-selenium2-driver": "^1.4", + "behat/mink": "^1.11", + "behat/mink-browserkit-driver": "^2.2", "colinodell/psr-testlogger": "^1.2", - "composer/composer": "^2.6.4", + "composer/composer": "^2.8.1", "drupal/coder": "^8.3.10", - "instaclick/php-webdriver": "^1.4.1", "justinrainbow/json-schema": "^5.2", - "mglaman/phpstan-drupal": "^1.2.1", + "lullabot/mink-selenium2-driver": "^1.7", + "lullabot/php-webdriver": "^2.0.4", + "mglaman/phpstan-drupal": "^1.2.12", "micheh/phpcs-gitlab": "^1.1", "mikey179/vfsstream": "^1.6.11", "open-telemetry/exporter-otlp": "^1", @@ -15615,8 +15535,8 @@ "php-http/guzzle7-adapter": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.10.47", - "phpstan/phpstan-phpunit": "^1.3.11", + "phpstan/phpstan": "^1.12.4", + "phpstan/phpstan-phpunit": "^1.3.16", "phpunit/phpunit": "^9.6.13", "symfony/browser-kit": "^6.4", "symfony/css-selector": "^6.4", @@ -15636,22 +15556,22 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/10.2.3" + "source": "https://github.com/drupal/core-dev/tree/10.4.0" }, - "time": "2023-12-12T22:01:45+00:00" + "time": "2024-11-21T12:39:32+00:00" }, { "name": "google/protobuf", - "version": "v3.25.2", + "version": "v4.29.1", "source": { "type": "git", "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb" + "reference": "6042b5483f8029e42473faeb8ef75ba266278381" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/83ea4c147718666ce6a9b9332ac2aa588c9211eb", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/6042b5483f8029e42473faeb8ef75ba266278381", + "reference": "6042b5483f8029e42473faeb8ef75ba266278381", "shasum": "" }, "require": { @@ -15680,72 +15600,9 @@ "proto" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.2" - }, - "time": "2024-01-09T22:12:32+00:00" - }, - { - "name": "instaclick/php-webdriver", - "version": "1.4.18", - "source": { - "type": "git", - "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a61a8459f86c79dd1f19934ea3929804f2e41f8c", - "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.5", - "satooshi/php-coveralls": "^1.0 || ^2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "psr-0": { - "WebDriver": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Justin Bishop", - "email": "jubishop@gmail.com", - "role": "Developer" - }, - { - "name": "Anthon Pang", - "email": "apang@softwaredevelopment.ca", - "role": "Fork Maintainer" - } - ], - "description": "PHP WebDriver for Selenium 2", - "homepage": "http://instaclick.com/", - "keywords": [ - "browser", - "selenium", - "webdriver", - "webtest" - ], - "support": { - "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.18" + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.29.1" }, - "time": "2023-12-08T07:11:19+00:00" + "time": "2024-12-03T22:07:45+00:00" }, { "name": "jangregor/phpstan-prophecy", @@ -15814,20 +15671,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "v5.2.13", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", @@ -15838,11 +15695,6 @@ "bin/validate-json" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" @@ -15878,76 +15730,196 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" }, - "time": "2023-09-26T02:20:38+00:00" + "time": "2024-07-06T21:00:26+00:00" }, { - "name": "mglaman/phpstan-drupal", - "version": "1.2.7", + "name": "lullabot/mink-selenium2-driver", + "version": "v1.7.4", "source": { "type": "git", - "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "32f79fcf48c74532014248687ae3850581a22416" + "url": "https://github.com/Lullabot/MinkSelenium2Driver.git", + "reference": "145fe8ed1fb611be7409b70d609f71b0285f4724" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/32f79fcf48c74532014248687ae3850581a22416", - "reference": "32f79fcf48c74532014248687ae3850581a22416", + "url": "https://api.github.com/repos/Lullabot/MinkSelenium2Driver/zipball/145fe8ed1fb611be7409b70d609f71b0285f4724", + "reference": "145fe8ed1fb611be7409b70d609f71b0285f4724", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0", - "phpstan/phpstan": "^1.10.56", - "phpstan/phpstan-deprecation-rules": "^1.1.4", - "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0", - "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0", - "webflo/drupal-finder": "^1.2" + "behat/mink": "^1.11@dev", + "ext-json": "*", + "lullabot/php-webdriver": "^2.0.6", + "php": ">=8.1" }, - "require-dev": { - "behat/mink": "^1.8", - "composer/installers": "^1.9", - "drupal/core-recommended": "^9.0", - "drush/drush": "^10.0 || ^11 || ^12", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^8.5 || ^9", - "slevomat/coding-standard": "^7.1", - "squizlabs/php_codesniffer": "^3.3", - "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0" + "replace": { + "behat/mink-selenium2-driver": "1.7.0" }, - "suggest": { - "jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.", - "phpstan/phpstan-deprecation-rules": "For catching deprecations, especially in Drupal core.", - "phpstan/phpstan-phpunit": "PHPUnit extensions and rules for PHPStan." + "require-dev": { + "mink/driver-testsuite": "dev-master", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^8.5.22 || ^9.5.11", + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, - "type": "phpstan-extension", + "type": "mink-driver", "extra": { "branch-alias": { - "dev-main": "1.0-dev" - }, - "installer-paths": { - "tests/fixtures/drupal/core": [ - "type:drupal-core" - ], - "tests/fixtures/drupal/libraries/{$name}": [ - "type:drupal-library" - ], - "tests/fixtures/drupal/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "tests/fixtures/drupal/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "tests/fixtures/drupal/themes/contrib/{$name}": [ - "type:drupal-theme" - ] + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Behat\\Mink\\Driver\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Pete Otaqui", + "email": "pete@otaqui.com", + "homepage": "https://github.com/pete-otaqui" }, + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Selenium2 (WebDriver) driver for Mink framework", + "homepage": "https://mink.behat.org/", + "keywords": [ + "ajax", + "browser", + "javascript", + "selenium", + "testing", + "webdriver" + ], + "support": { + "source": "https://github.com/Lullabot/MinkSelenium2Driver/tree/v1.7.4" + }, + "time": "2024-08-08T07:40:04+00:00" + }, + { + "name": "lullabot/php-webdriver", + "version": "v2.0.6", + "source": { + "type": "git", + "url": "https://github.com/Lullabot/php-webdriver.git", + "reference": "8c28db7151b8a73bd98861fe19972ac3f40184d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Lullabot/php-webdriver/zipball/8c28db7151b8a73bd98861fe19972ac3f40184d2", + "reference": "8c28db7151b8a73bd98861fe19972ac3f40184d2", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=8.0.0" + }, + "replace": { + "instaclick/php-webdriver": "1.4.16" + }, + "require-dev": { + "phpunit/phpunit": "^8.5 || ^9.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "WebDriver": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "PHP WebDriver for Selenium 2", + "homepage": "https://www.lullabot.com/", + "keywords": [ + "browser", + "selenium", + "webdriver", + "webtest" + ], + "support": { + "issues": "https://github.com/Lullabot/php-webdriver/issues", + "source": "https://github.com/Lullabot/php-webdriver/tree/v2.0.6" + }, + "time": "2024-08-05T13:00:46+00:00" + }, + { + "name": "mglaman/phpstan-drupal", + "version": "1.3.2", + "source": { + "type": "git", + "url": "https://github.com/mglaman/phpstan-drupal.git", + "reference": "bbb92dee546da3988da851122cb2925f72c149f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/bbb92dee546da3988da851122cb2925f72c149f3", + "reference": "bbb92dee546da3988da851122cb2925f72c149f3", + "shasum": "" + }, + "require": { + "php": "^8.1", + "phpstan/phpstan": "^1.10.56", + "phpstan/phpstan-deprecation-rules": "^1.1.4", + "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0", + "webflo/drupal-finder": "^1.3.1" + }, + "require-dev": { + "behat/mink": "^1.8", + "composer/installers": "^1.9", + "drupal/core-recommended": "^10", + "drush/drush": "^10.0 || ^11 || ^12 || ^13@beta", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^8.5 || ^9 || ^10 || ^11", + "slevomat/coding-standard": "^7.1", + "squizlabs/php_codesniffer": "^3.3", + "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.", + "phpstan/phpstan-deprecation-rules": "For catching deprecations, especially in Drupal core.", + "phpstan/phpstan-phpunit": "PHPUnit extensions and rules for PHPStan." + }, + "type": "phpstan-extension", + "extra": { "phpstan": { "includes": [ "extension.neon", "rules.neon" ] + }, + "branch-alias": { + "dev-main": "1.0-dev" + }, + "installer-paths": { + "tests/fixtures/drupal/core": [ + "type:drupal-core" + ], + "tests/fixtures/drupal/libraries/{$name}": [ + "type:drupal-library" + ], + "tests/fixtures/drupal/themes/contrib/{$name}": [ + "type:drupal-theme" + ], + "tests/fixtures/drupal/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "tests/fixtures/drupal/profiles/contrib/{$name}": [ + "type:drupal-profile" + ] } }, "autoload": { @@ -15968,7 +15940,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.7" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.3.2" }, "funding": [ { @@ -15984,7 +15956,7 @@ "type": "tidelift" } ], - "time": "2024-02-14T04:38:08+00:00" + "time": "2024-11-19T15:26:05+00:00" }, { "name": "micheh/phpcs-gitlab", @@ -16040,23 +16012,24 @@ }, { "name": "mikey179/vfsstream", - "version": "v1.6.11", + "version": "v1.6.12", "source": { "type": "git", "url": "https://github.com/bovigo/vfsStream.git", - "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f" + "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", - "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/fe695ec993e0a55c3abdda10a9364eb31c6f1bf0", + "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "^4.5|^5.0" + "phpunit/phpunit": "^7.5||^8.5||^9.6", + "yoast/phpunit-polyfills": "^2.0" }, "type": "library", "extra": { @@ -16087,20 +16060,20 @@ "source": "https://github.com/bovigo/vfsStream/tree/master", "wiki": "https://github.com/bovigo/vfsStream/wiki" }, - "time": "2022-02-23T02:02:42+00:00" + "time": "2024-08-29T18:43:31+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -16108,11 +16081,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -16138,7 +16112,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -16146,27 +16120,93 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-11-08T17:47:46+00:00" + }, + { + "name": "nyholm/psr7-server", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/Nyholm/psr7-server.git", + "reference": "4335801d851f554ca43fa6e7d2602141538854dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/4335801d851f554ca43fa6e7d2602141538854dc", + "reference": "4335801d851f554ca43fa6e7d2602141538854dc", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "require-dev": { + "nyholm/nsa": "^1.1", + "nyholm/psr7": "^1.3", + "phpunit/phpunit": "^7.0 || ^8.5 || ^9.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Nyholm\\Psr7Server\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + }, + { + "name": "Martijn van der Ven", + "email": "martijn@vanderven.se" + } + ], + "description": "Helper classes to handle PSR-7 server requests", + "homepage": "http://tnyholm.se", + "keywords": [ + "psr-17", + "psr-7" + ], + "support": { + "issues": "https://github.com/Nyholm/psr7-server/issues", + "source": "https://github.com/Nyholm/psr7-server/tree/1.1.0" + }, + "funding": [ + { + "url": "https://github.com/Zegnat", + "type": "github" + }, + { + "url": "https://github.com/nyholm", + "type": "github" + } + ], + "time": "2023-11-08T09:30:43+00:00" }, { "name": "open-telemetry/exporter-otlp", - "version": "1.0.3", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/exporter-otlp.git", - "reference": "db7b96bd04284d2fea92dccaebb68f8af40f79d8" + "reference": "9b6de12204f25f8ab9540b46d6e7b5151897ce18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/db7b96bd04284d2fea92dccaebb68f8af40f79d8", - "reference": "db7b96bd04284d2fea92dccaebb68f8af40f79d8", + "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/9b6de12204f25f8ab9540b46d6e7b5151897ce18", + "reference": "9b6de12204f25f8ab9540b46d6e7b5151897ce18", "shasum": "" }, "require": { "open-telemetry/api": "^1.0", "open-telemetry/gen-otlp-protobuf": "^1.1", "open-telemetry/sdk": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^8.1", "php-http/discovery": "^1.14" }, "type": "library", @@ -16210,25 +16250,25 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-01-17T12:46:01+00:00" + "time": "2024-04-30T18:28:30+00:00" }, { "name": "open-telemetry/gen-otlp-protobuf", - "version": "1.1.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/gen-otlp-protobuf.git", - "reference": "76e2a44357f8c3fdcabcb070ec8a59e52ae3e3c3" + "reference": "66c3b98e998a726691c92e6405a82e6e7b8b169d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/76e2a44357f8c3fdcabcb070ec8a59e52ae3e3c3", - "reference": "76e2a44357f8c3fdcabcb070ec8a59e52ae3e3c3", + "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/66c3b98e998a726691c92e6405a82e6e7b8b169d", + "reference": "66c3b98e998a726691c92e6405a82e6e7b8b169d", "shasum": "" }, "require": { - "google/protobuf": "^3.3.0", - "php": "^7.4 || ^8.0" + "google/protobuf": "^3.22 || ^4.0", + "php": "^8.0" }, "suggest": { "ext-protobuf": "For better performance, when dealing with the protobuf format" @@ -16273,45 +16313,52 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-01-16T21:54:57+00:00" + "time": "2024-10-30T11:49:49+00:00" }, { "name": "open-telemetry/sdk", - "version": "1.0.8", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77" + "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/1da4c0ca4f1a3c0fe84b81729dadec16f464fa77", - "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/fb0ff8d8279a3776bd604791e2531dd0cc147e8b", + "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b", "shasum": "" }, "require": { "ext-json": "*", - "open-telemetry/api": "^1.0", + "nyholm/psr7-server": "^1.1", + "open-telemetry/api": "~1.0 || ~1.1", "open-telemetry/context": "^1.0", "open-telemetry/sem-conv": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^8.1", "php-http/discovery": "^1.14", "psr/http-client": "^1.0", "psr/http-client-implementation": "^1.0", "psr/http-factory-implementation": "^1.0", "psr/http-message": "^1.0.1|^2.0", "psr/log": "^1.1|^2.0|^3.0", + "ramsey/uuid": "^3.0 || ^4.0", "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", - "symfony/polyfill-php82": "^1.26" + "symfony/polyfill-php82": "^1.26", + "tbachert/spi": "^1.0.1" }, "suggest": { "ext-gmp": "To support unlimited number of synchronous metric readers", - "ext-mbstring": "To increase performance of string operations" + "ext-mbstring": "To increase performance of string operations", + "open-telemetry/sdk-configuration": "File-based OpenTelemetry SDK configuration" }, "type": "library", "extra": { + "spi": { + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [ + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager" + ] + }, "branch-alias": { "dev-main": "1.0.x-dev" } @@ -16356,7 +16403,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-02-02T03:42:40+00:00" + "time": "2024-10-18T21:01:35+00:00" }, { "name": "open-telemetry/sem-conv", @@ -16417,20 +16464,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -16471,9 +16519,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -16528,21 +16582,21 @@ }, { "name": "php-http/guzzle7-adapter", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/guzzle7-adapter.git", - "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" + "reference": "03a415fde709c2f25539790fecf4d9a31bc3d0eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", - "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", + "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/03a415fde709c2f25539790fecf4d9a31bc3d0eb", + "reference": "03a415fde709c2f25539790fecf4d9a31bc3d0eb", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^7.0", - "php": "^7.2 | ^8.0", + "php": "^7.3 | ^8.0", "php-http/httplug": "^2.0", "psr/http-client": "^1.0" }, @@ -16553,14 +16607,11 @@ }, "require-dev": { "php-http/client-integration-tests": "^3.0", + "php-http/message-factory": "^1.1", + "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^8.0|^9.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Adapter\\Guzzle7\\": "src/" @@ -16584,9 +16635,9 @@ ], "support": { "issues": "https://github.com/php-http/guzzle7-adapter/issues", - "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" + "source": "https://github.com/php-http/guzzle7-adapter/tree/1.1.0" }, - "time": "2021-03-09T07:35:15+00:00" + "time": "2024-11-26T11:14:36+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -16765,26 +16816,27 @@ }, { "name": "phpspec/prophecy", - "version": "v1.18.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93", + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -16828,33 +16880,36 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.20.0" }, - "time": "2023-12-07T16:22:33+00:00" + "time": "2024-11-19T13:12:41+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.1.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "29f8114c2c319a4308e6b070902211e062efa392" + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/29f8114c2c319a4308e6b070902211e062efa392", - "reference": "29f8114c2c319a4308e6b070902211e062efa392", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/8819516c1b489ecee4c60db5f5432fac1ea8ac6f", + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f", "shasum": "" }, "require": { "php": "^7.3 || ^8", "phpspec/prophecy": "^1.18", - "phpunit/phpunit": "^9.1 || ^10.1" + "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -16880,28 +16935,28 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.1.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.3.0" }, - "time": "2023-12-08T12:48:02+00:00" + "time": "2024-11-19T13:24:17+00:00" }, { "name": "phpstan/extension-installer", - "version": "1.3.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/phpstan/extension-installer.git", - "reference": "f45734bfb9984c6c56c4486b71230355f066a58a" + "reference": "85e90b3942d06b2326fba0403ec24fe912372936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a", - "reference": "f45734bfb9984c6c56c4486b71230355f066a58a", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/85e90b3942d06b2326fba0403ec24fe912372936", + "reference": "85e90b3942d06b2326fba0403ec24fe912372936", "shasum": "" }, "require": { "composer-plugin-api": "^2.0", "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.9.0" + "phpstan/phpstan": "^1.9.0 || ^2.0" }, "require-dev": { "composer/composer": "^2.0", @@ -16922,11 +16977,15 @@ "MIT" ], "description": "Composer plugin for automatic installation of PHPStan extensions", + "keywords": [ + "dev", + "static analysis" + ], "support": { "issues": "https://github.com/phpstan/extension-installer/issues", - "source": "https://github.com/phpstan/extension-installer/tree/1.3.1" + "source": "https://github.com/phpstan/extension-installer/tree/1.4.3" }, - "time": "2023-05-24T08:59:17+00:00" + "time": "2024-09-04T20:21:43+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -16977,16 +17036,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.12", + "version": "1.12.13", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0" + "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0", - "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f", + "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f", "shasum": "" }, "require": { @@ -17031,29 +17090,28 @@ "type": "github" } ], - "time": "2024-11-28T22:13:23+00:00" + "time": "2024-12-17T17:00:20+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", - "version": "1.1.4", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", - "reference": "089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa" + "reference": "f94d246cc143ec5a23da868f8f7e1393b50eaa82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa", - "reference": "089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa", + "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/f94d246cc143ec5a23da868f8f7e1393b50eaa82", + "reference": "f94d246cc143ec5a23da868f8f7e1393b50eaa82", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.10.3" + "phpstan/phpstan": "^1.12" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-php-parser": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^9.5" }, @@ -17077,27 +17135,27 @@ "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", "support": { "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues", - "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.1.4" + "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.2.1" }, - "time": "2023-08-05T09:02:04+00:00" + "time": "2024-09-11T15:52:35+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "1.3.15", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a" + "reference": "72a6721c9b64b3e4c9db55abbc38f790b318267e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a", - "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/72a6721c9b64b3e4c9db55abbc38f790b318267e", + "reference": "72a6721c9b64b3e4c9db55abbc38f790b318267e", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.10" + "phpstan/phpstan": "^1.12" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -17129,41 +17187,41 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.2" }, - "time": "2023-10-09T18:58:39+00:00" + "time": "2024-12-17T17:20:49+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.30", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -17172,7 +17230,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -17201,7 +17259,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -17209,7 +17267,7 @@ "type": "github" } ], - "time": "2023-12-22T06:47:57+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -17454,45 +17512,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.16", + "version": "9.6.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.1", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -17537,7 +17595,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" }, "funding": [ { @@ -17553,7 +17611,188 @@ "type": "tidelift" } ], - "time": "2024-01-19T07:03:14+00:00" + "time": "2024-12-05T13:48:26+00:00" + }, + { + "name": "ramsey/collection", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/ramsey/collection.git", + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "captainhook/plugin-composer": "^5.3", + "ergebnis/composer-normalize": "^2.28.3", + "fakerphp/faker": "^1.21", + "hamcrest/hamcrest-php": "^2.0", + "jangregor/phpstan-prophecy": "^1.0", + "mockery/mockery": "^1.5", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpcsstandards/phpcsutils": "^1.0.0-rc1", + "phpspec/prophecy-phpunit": "^2.0", + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5", + "psalm/plugin-mockery": "^1.1", + "psalm/plugin-phpunit": "^0.18.4", + "ramsey/coding-standard": "^2.0.3", + "ramsey/conventional-commits": "^1.3", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "extra": { + "captainhook": { + "force-install": true + }, + "ramsey/conventional-commits": { + "configFile": "conventional-commits.json" + } + }, + "autoload": { + "psr-4": { + "Ramsey\\Collection\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "A PHP library for representing and manipulating collections.", + "keywords": [ + "array", + "collection", + "hash", + "map", + "queue", + "set" + ], + "support": { + "issues": "https://github.com/ramsey/collection/issues", + "source": "https://github.com/ramsey/collection/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ramsey/collection", + "type": "tidelift" + } + ], + "time": "2022-12-31T21:50:55+00:00" + }, + { + "name": "ramsey/uuid", + "version": "4.7.6", + "source": { + "type": "git", + "url": "https://github.com/ramsey/uuid.git", + "reference": "91039bc1faa45ba123c4328958e620d382ec7088" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088", + "reference": "91039bc1faa45ba123c4328958e620d382ec7088", + "shasum": "" + }, + "require": { + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12", + "ext-json": "*", + "php": "^8.0", + "ramsey/collection": "^1.2 || ^2.0" + }, + "replace": { + "rhumsaa/uuid": "self.version" + }, + "require-dev": { + "captainhook/captainhook": "^5.10", + "captainhook/plugin-composer": "^5.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "doctrine/annotations": "^1.8", + "ergebnis/composer-normalize": "^2.15", + "mockery/mockery": "^1.3", + "paragonie/random-lib": "^2", + "php-mock/php-mock": "^2.2", + "php-mock/php-mock-mockery": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.1", + "phpbench/phpbench": "^1.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^8.5 || ^9", + "ramsey/composer-repl": "^1.4", + "slevomat/coding-standard": "^8.4", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.9" + }, + "suggest": { + "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", + "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", + "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", + "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." + }, + "type": "library", + "extra": { + "captainhook": { + "force-install": true + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Ramsey\\Uuid\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).", + "keywords": [ + "guid", + "identifier", + "uuid" + ], + "support": { + "issues": "https://github.com/ramsey/uuid/issues", + "source": "https://github.com/ramsey/uuid/tree/4.7.6" + }, + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid", + "type": "tidelift" + } + ], + "time": "2024-04-27T21:32:50+00:00" }, { "name": "react/promise", @@ -17630,16 +17869,16 @@ }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -17674,7 +17913,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -17682,7 +17921,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -17991,16 +18230,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -18056,7 +18295,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -18064,20 +18303,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -18120,7 +18359,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -18128,7 +18367,7 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", @@ -18364,16 +18603,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -18385,7 +18624,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -18406,8 +18645,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -18415,7 +18653,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -18528,23 +18766,23 @@ }, { "name": "seld/jsonlint", - "version": "1.10.2", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", "shasum": "" }, "require": { "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.5", + "phpstan/phpstan": "^1.11", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" }, "bin": [ @@ -18576,7 +18814,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" }, "funding": [ { @@ -18588,7 +18826,7 @@ "type": "tidelift" } ], - "time": "2024-02-07T12:57:50+00:00" + "time": "2024-07-11T14:55:45+00:00" }, { "name": "seld/phar-utils", @@ -18701,16 +18939,16 @@ }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.18", + "version": "v2.11.21", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "ca242a0b7309e0f9d1f73b236e04ecf4ca3248d0" + "reference": "eb2b351927098c24860daa7484e290d3eed693be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/ca242a0b7309e0f9d1f73b236e04ecf4ca3248d0", - "reference": "ca242a0b7309e0f9d1f73b236e04ecf4ca3248d0", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/eb2b351927098c24860daa7484e290d3eed693be", + "reference": "eb2b351927098c24860daa7484e290d3eed693be", "shasum": "" }, "require": { @@ -18721,9 +18959,9 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0", "phpcsstandards/phpcsdevcs": "^1.1", "phpstan/phpstan": "^1.7", - "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0", + "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0 || ^10.5.32 || ^11.3.3", "sirbrillig/phpcs-import-detection": "^1.1", - "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0@beta" + "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0" }, "type": "phpcodesniffer-standard", "autoload": { @@ -18755,7 +18993,7 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2024-04-13T16:42:46+00:00" + "time": "2024-12-02T16:37:49+00:00" }, { "name": "slevomat/coding-standard", @@ -18824,16 +19062,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.2", + "version": "3.11.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" + "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", - "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079", + "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079", "shasum": "" }, "require": { @@ -18900,20 +19138,20 @@ "type": "open_collective" } ], - "time": "2024-04-23T20:25:34+00:00" + "time": "2024-12-11T16:04:26+00:00" }, { "name": "symfony/browser-kit", - "version": "v6.4.3", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e" + "reference": "65d4b3fd9556e4b5b41287bef93c671f8f9f86ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/495ffa2e6d17e199213f93768efa01af32bbf70e", - "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/65d4b3fd9556e4b5b41287bef93c671f8f9f86ab", + "reference": "65d4b3fd9556e4b5b41287bef93c671f8f9f86ab", "shasum": "" }, "require": { @@ -18952,7 +19190,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.4.3" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.13" }, "funding": [ { @@ -18968,20 +19206,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/css-selector", - "version": "v6.4.3", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229" + "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ee0f7ed5cf298cc019431bb3b3977ebc52b86229", - "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e", + "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e", "shasum": "" }, "require": { @@ -19017,7 +19255,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.3" + "source": "https://github.com/symfony/css-selector/tree/v6.4.13" }, "funding": [ { @@ -19033,20 +19271,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.4.3", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "6db31849011fefe091e94d0bb10cba26f7919894" + "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/6db31849011fefe091e94d0bb10cba26f7919894", - "reference": "6db31849011fefe091e94d0bb10cba26f7919894", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4304e6ad5c894a9c72831ad459f627bfd35d766d", + "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d", "shasum": "" }, "require": { @@ -19084,7 +19322,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.3" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.16" }, "funding": [ { @@ -19100,20 +19338,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-11-13T15:06:22+00:00" }, { "name": "symfony/lock", - "version": "v6.4.3", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "1cabf3cc775b1aa6008ebd471fa773444af4e956" + "reference": "a69c3dd151ab7e14925f119164cfdf65d55392a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/1cabf3cc775b1aa6008ebd471fa773444af4e956", - "reference": "1cabf3cc775b1aa6008ebd471fa773444af4e956", + "url": "https://api.github.com/repos/symfony/lock/zipball/a69c3dd151ab7e14925f119164cfdf65d55392a4", + "reference": "a69c3dd151ab7e14925f119164cfdf65d55392a4", "shasum": "" }, "require": { @@ -19163,7 +19401,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.4.3" + "source": "https://github.com/symfony/lock/tree/v6.4.13" }, "funding": [ { @@ -19179,20 +19417,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-10-25T15:19:46+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v6.4.3", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "d49b4f6dc4690cf2c194311bb498abf0cf4f7485" + "reference": "cebafe2f1ad2d1e745c1015b7c2519592341e4e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d49b4f6dc4690cf2c194311bb498abf0cf4f7485", - "reference": "d49b4f6dc4690cf2c194311bb498abf0cf4f7485", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/cebafe2f1ad2d1e745c1015b7c2519592341e4e6", + "reference": "cebafe2f1ad2d1e745c1015b7c2519592341e4e6", "shasum": "" }, "require": { @@ -19212,8 +19450,8 @@ "type": "symfony-bridge", "extra": { "thanks": { - "name": "phpunit/phpunit", - "url": "https://github.com/sebastianbergmann/phpunit" + "url": "https://github.com/sebastianbergmann/phpunit", + "name": "phpunit/phpunit" } }, "autoload": { @@ -19224,7 +19462,8 @@ "Symfony\\Bridge\\PhpUnit\\": "" }, "exclude-from-classmap": [ - "/Tests/" + "/Tests/", + "/bin/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -19244,7 +19483,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.4.3" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.16" }, "funding": [ { @@ -19260,7 +19499,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-11-13T15:06:22+00:00" }, { "name": "symfony/polyfill-php73", @@ -19338,18 +19577,150 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-php80", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + }, + "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": "2024-09-09T11:45:10+00:00" + }, + { + "name": "tbachert/spi", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/Nevay/spi.git", + "reference": "2ddfaf815dafb45791a61b08170de8d583c16062" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nevay/spi/zipball/2ddfaf815dafb45791a61b08170de8d583c16062", + "reference": "2ddfaf815dafb45791a61b08170de8d583c16062", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "composer/semver": "^1.0 || ^2.0 || ^3.0", + "php": "^8.1" + }, + "require-dev": { + "composer/composer": "^2.0", + "infection/infection": "^0.27.9", + "phpunit/phpunit": "^10.5", + "psalm/phar": "^5.18" + }, + "type": "composer-plugin", + "extra": { + "class": "Nevay\\SPI\\Composer\\Plugin", + "branch-alias": { + "dev-main": "0.2.x-dev" + }, + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Nevay\\SPI\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Service provider loading facility", + "keywords": [ + "service provider" + ], + "support": { + "issues": "https://github.com/Nevay/spi/issues", + "source": "https://github.com/Nevay/spi/tree/v1.0.2" + }, + "time": "2024-10-04T16:36:12+00:00" + }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -19378,7 +19749,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.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -19386,7 +19757,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "weitzman/drupal-test-traits", diff --git a/conf/cmi/rest.resource.helfi_debug_package_version.yml b/conf/cmi/rest.resource.helfi_debug_package_version.yml deleted file mode 100644 index 93b112db..00000000 --- a/conf/cmi/rest.resource.helfi_debug_package_version.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 81595d9f-0cce-4ecc-93ba-756c5c586eaa -langcode: en -status: true -dependencies: - module: - - basic_auth - - helfi_api_base - - serialization - - user -id: helfi_debug_package_version -plugin_id: helfi_debug_package_version -granularity: resource -configuration: - methods: - - GET - formats: - - json - authentication: - - cookie - - basic_auth - - basic_auth diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 4328f653..1982e3da 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -15,7 +15,7 @@ endif PHONY += oc-sync oc-sync: - docker run --env-file .env -it --rm -v .:/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)" + @docker run --env-file .env -it --rm -v $(shell pwd):/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)" $(call drush,sql-query --file=${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME),SQL dump imported) $(call drush,sql-query \"UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');\",Sanitized Azure URIs) $(call drush,cr) From 4f7ca8138a87c190e40aeba5f840411ded18f390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Risto=20Nyk=C3=A4nen?= Date: Wed, 18 Dec 2024 11:32:34 +0200 Subject: [PATCH 9/9] platform_config to 4.10.5 and drupal/core 10.3.10 --- composer.lock | 64 ++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 032e7c27..78e869c1 100644 --- a/composer.lock +++ b/composer.lock @@ -2257,16 +2257,16 @@ }, { "name": "drupal/core", - "version": "10.4.0", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", "shasum": "" }, "require": { @@ -2312,7 +2312,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.15.0" + "twig/twig": "^3.14.2" }, "conflict": { "drush/drush": "<12.4.3" @@ -2415,22 +2415,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.4.0" + "source": "https://github.com/drupal/core/tree/10.3.10" }, - "time": "2024-12-17T22:18:01+00:00" + "time": "2024-11-22T12:51:33+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.4.0", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55" + "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/db17b59620ce1c142a34dc017d9e696ce4771e55", - "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/f58ab5c0d02d275c5aa226c4505b457e41b161cc", + "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc", "shasum": "" }, "require": { @@ -2465,9 +2465,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" }, - "time": "2024-08-22T14:31:30+00:00" + "time": "2024-08-22T14:31:34+00:00" }, { "name": "drupal/crop", @@ -4418,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.4", + "version": "4.10.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac" + "reference": "7c52e541f43948f3ad5603a07690f946c6604241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/24833b53e247ee6e56a852eb497139ee8883e6ac", - "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7c52e541f43948f3ad5603a07690f946c6604241", + "reference": "7c52e541f43948f3ad5603a07690f946c6604241", "shasum": "" }, "require": { @@ -4496,8 +4496,9 @@ "ruflin/elastica": "^8.0" }, "conflict": { - "drupal/core": "<10.3.10", - "drupal/core-composer-scaffold": "<10.3", + "drupal/core": ">=10.4.0", + "drupal/core-composer-scaffold": ">=10.4.0", + "drupal/core-dev": ">=10.4.0", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/default_content": ">2.0.0-alpha2", "drupal/gin_toolbar": ">1.0.0-rc6", @@ -4523,7 +4524,8 @@ "[#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 configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", + "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4552,10 +4554,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-18T06:30:07+00:00" + "time": "2024-12-18T08:08:55+00:00" }, { "name": "drupal/helfi_proxy", @@ -15506,28 +15508,28 @@ }, { "name": "drupal/core-dev", - "version": "10.4.0", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "9c6c089f73671083d9588affa287a59a80e6edc8" + "reference": "2f117398ad5e7df411b4715c1b69ab4847c5cc08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/9c6c089f73671083d9588affa287a59a80e6edc8", - "reference": "9c6c089f73671083d9588affa287a59a80e6edc8", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/2f117398ad5e7df411b4715c1b69ab4847c5cc08", + "reference": "2f117398ad5e7df411b4715c1b69ab4847c5cc08", "shasum": "" }, "require": { "behat/mink": "^1.11", "behat/mink-browserkit-driver": "^2.2", "colinodell/psr-testlogger": "^1.2", - "composer/composer": "^2.8.1", + "composer/composer": "^2.7.7", "drupal/coder": "^8.3.10", "justinrainbow/json-schema": "^5.2", "lullabot/mink-selenium2-driver": "^1.7", "lullabot/php-webdriver": "^2.0.4", - "mglaman/phpstan-drupal": "^1.2.12", + "mglaman/phpstan-drupal": "^1.2.10", "micheh/phpcs-gitlab": "^1.1", "mikey179/vfsstream": "^1.6.11", "open-telemetry/exporter-otlp": "^1", @@ -15535,7 +15537,7 @@ "php-http/guzzle7-adapter": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.12.4", + "phpstan/phpstan": "^1.11.0", "phpstan/phpstan-phpunit": "^1.3.16", "phpunit/phpunit": "^9.6.13", "symfony/browser-kit": "^6.4", @@ -15556,9 +15558,9 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/10.4.0" + "source": "https://github.com/drupal/core-dev/tree/10.3.10" }, - "time": "2024-11-21T12:39:32+00:00" + "time": "2024-07-04T10:19:29+00:00" }, { "name": "google/protobuf",