From 9ba71c96702d62cb7abb460ba07b8d9211458b8c Mon Sep 17 00:00:00 2001 From: melwong-jcc Date: Tue, 20 Sep 2022 09:24:22 -0700 Subject: [PATCH 1/6] SRL-647: correct indexlink visibility logic --- web/themes/custom/atrium/includes/node.inc | 4 ++-- .../custom/atrium/includes/paragraph.inc | 18 ++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/web/themes/custom/atrium/includes/node.inc b/web/themes/custom/atrium/includes/node.inc index 0eeedc15..f32ea82c 100644 --- a/web/themes/custom/atrium/includes/node.inc +++ b/web/themes/custom/atrium/includes/node.inc @@ -20,13 +20,13 @@ function atrium_preprocess_node(&$variables) { case "basic": case "srl_onramp": $variables['previous_label'] = t('Previous Page'); - if (!$node->get('field_case_type_override')->isEmpty()) { + if ($node->get('field_case_type_override') && !$node->get('field_case_type_override')->isEmpty()) { $case_type_override = $node->get('field_case_type_override'); $variables['case_index']['url'] = Url::fromUri($case_type_override[0]->get('uri')->getValue()); $variables['case_index']['label'] = t('Index: All Pages'); } else { $terms = $node->get('field_case_types')->referencedEntities(); - if(count($terms) == 1){ + if($terms) { if (!$terms[0]->get('field_url')->isEmpty()) { $lang_code = \Drupal::languageManager()->getCurrentLanguage()->getId(); $term_custom_uri = $terms[0]->get('field_url')->getValue(); diff --git a/web/themes/custom/atrium/includes/paragraph.inc b/web/themes/custom/atrium/includes/paragraph.inc index d221c678..b2f9515c 100644 --- a/web/themes/custom/atrium/includes/paragraph.inc +++ b/web/themes/custom/atrium/includes/paragraph.inc @@ -34,21 +34,11 @@ function atrium_preprocess_paragraph(&$variables) { } $variables['switchboard_footer']['buttons'][1]['url'] = Url::fromUri($term_custom_uri[0]['uri']); $variables['switchboard_footer']['buttons'][1]['icon']['name'] = 'list'; - if ($term_custom_uri[0]['title'] != '') { - if($case_forms_url) { - $variables['switchboard_footer']['buttons'][0]['title'] = t('See All Forms'); - } - $variables['switchboard_footer']['buttons'][1]['title'] = t('Index: All Pages'); - } else { - // Translation through taxonomy management. - $lang_code = \Drupal::languageManager()->getCurrentLanguage()->getId(); - $term_translated = Drupal::service('entity.repository')->getTranslationFromContext($terms[0], $lang_code); - $term_name = $term_translated->getName(); - if($case_forms_url) { - $variables['switchboard_footer']['buttons'][0]['title'] = t('See All Forms'); - } - $variables['switchboard_footer']['buttons'][1]['title'] = t('Index: All Pages'); + if($case_forms_url) { + $variables['switchboard_footer']['buttons'][0]['title'] = t('See All Forms'); } + $variables['switchboard_footer']['buttons'][1]['title'] = t('Index: All Pages'); + } } } From 19bcd18a0b4b390de4b2f9b36c2e42272323ed08 Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Wed, 21 Sep 2022 15:06:17 -0700 Subject: [PATCH 2/6] SRL-647: correct switch statement for link apperance by content type --- web/themes/custom/atrium/includes/node.inc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/themes/custom/atrium/includes/node.inc b/web/themes/custom/atrium/includes/node.inc index f32ea82c..40e6a3a7 100644 --- a/web/themes/custom/atrium/includes/node.inc +++ b/web/themes/custom/atrium/includes/node.inc @@ -16,17 +16,21 @@ use Drupal\menu_link_content\Plugin\Menu\MenuLinkContent; function atrium_preprocess_node(&$variables) { $node = $variables['node']; switch ($node->getType()) { - case "srl_howto_instruction": - case "basic": - case "srl_onramp": + case 'court': + break; + case 'timeline': + break; + default: + // Previous page link label if in use. $variables['previous_label'] = t('Previous Page'); - if ($node->get('field_case_type_override') && !$node->get('field_case_type_override')->isEmpty()) { + // Index page link if tagged as case type. + if ($node->field_case_type_override && !$node->get('field_case_type_override')->isEmpty()) { $case_type_override = $node->get('field_case_type_override'); $variables['case_index']['url'] = Url::fromUri($case_type_override[0]->get('uri')->getValue()); $variables['case_index']['label'] = t('Index: All Pages'); } else { $terms = $node->get('field_case_types')->referencedEntities(); - if($terms) { + if ($terms) { if (!$terms[0]->get('field_url')->isEmpty()) { $lang_code = \Drupal::languageManager()->getCurrentLanguage()->getId(); $term_custom_uri = $terms[0]->get('field_url')->getValue(); @@ -40,7 +44,6 @@ function atrium_preprocess_node(&$variables) { } else { break; } - } } From 012cf10c7d47ee7bf8df4f96680a47c283bced30 Mon Sep 17 00:00:00 2001 From: Baptiste Niviere Date: Mon, 26 Sep 2022 10:54:58 -0700 Subject: [PATCH 3/6] to be tested --- .../paragraph/paragraph--hero-cards.html.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig b/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig index 406c4197..74465ab7 100644 --- a/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig +++ b/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig @@ -52,11 +52,11 @@ {% if menu_links[menu_id]['second_level'] %} {% set menu_type = 'cascading' %} - {% set menu_label = menu.field_label.value ?: '' %} - {% set menu_default_option = menu.field_default_option.value ?: '' %} + {% set menu_label = menu.field_label.value|t ?: '' %} + {% set menu_default_option = menu.field_default_option.value|t ?: '' %} - {% set menu_child_label = menu.field_label2.value ?: '' %} - {% set menu_default_child_option = menu.field_default_child_option.value ?: '' %} + {% set menu_child_label = menu.field_label2.value|t ?: '' %} + {% set menu_default_child_option = menu.field_default_child_option.value|t ?: '' %} {% for key, link in menu_links[menu_id] %} {% if link.title %} @@ -70,7 +70,7 @@ {% endfor %} {% set links = links|merge([{ name: link.title, - default_option: 'Choose option', + default_option: 'Choose option|t', items: cascading_links, }]) %} {% endif %} From d1fa2d3af3c44ac619bb252e4f01b2759d41ae59 Mon Sep 17 00:00:00 2001 From: Baptiste Niviere Date: Tue, 27 Sep 2022 08:43:40 -0700 Subject: [PATCH 4/6] fix for missing label --- ...rm_display.paragraph.card_form.default.yml | 18 +++++++++++ ...ew_display.paragraph.card_form.default.yml | 20 ++++++++++++- ..._form.field_dropdown_menu_default_opt2.yml | 30 +++++++++++++++++++ ..._form.field_dropdown_menu_default_opti.yml | 30 +++++++++++++++++++ ...graph.field_dropdown_menu_default_opt2.yml | 21 +++++++++++++ ...graph.field_dropdown_menu_default_opti.yml | 21 +++++++++++++ .../paragraph/paragraph--hero-cards.html.twig | 15 ++++++---- 7 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opt2.yml create mode 100644 config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opti.yml create mode 100644 config/config-default/field.storage.paragraph.field_dropdown_menu_default_opt2.yml create mode 100644 config/config-default/field.storage.paragraph.field_dropdown_menu_default_opti.yml diff --git a/config/config-default/core.entity_form_display.paragraph.card_form.default.yml b/config/config-default/core.entity_form_display.paragraph.card_form.default.yml index cd36345d..e906c7ce 100644 --- a/config/config-default/core.entity_form_display.paragraph.card_form.default.yml +++ b/config/config-default/core.entity_form_display.paragraph.card_form.default.yml @@ -5,6 +5,8 @@ dependencies: config: - field.field.paragraph.card_form.field_body - field.field.paragraph.card_form.field_dropdown_menu + - field.field.paragraph.card_form.field_dropdown_menu_default_opt2 + - field.field.paragraph.card_form.field_dropdown_menu_default_opti - field.field.paragraph.card_form.field_item - field.field.paragraph.card_form.field_title_display - paragraphs.paragraphs_type.card_form @@ -53,6 +55,22 @@ content: third_party_settings: cc: status: 0 + field_dropdown_menu_default_opt2: + type: string_textfield + weight: 14 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_dropdown_menu_default_opti: + type: string_textfield + weight: 13 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } field_item: type: entity_reference_paragraphs weight: 4 diff --git a/config/config-default/core.entity_view_display.paragraph.card_form.default.yml b/config/config-default/core.entity_view_display.paragraph.card_form.default.yml index 48815824..f5f6691a 100644 --- a/config/config-default/core.entity_view_display.paragraph.card_form.default.yml +++ b/config/config-default/core.entity_view_display.paragraph.card_form.default.yml @@ -5,6 +5,8 @@ dependencies: config: - field.field.paragraph.card_form.field_body - field.field.paragraph.card_form.field_dropdown_menu + - field.field.paragraph.card_form.field_dropdown_menu_default_opt2 + - field.field.paragraph.card_form.field_dropdown_menu_default_opti - field.field.paragraph.card_form.field_item - field.field.paragraph.card_form.field_title_display - paragraphs.paragraphs_type.card_form @@ -25,12 +27,28 @@ content: region: content field_dropdown_menu: type: entity_reference_label - label: above + label: hidden settings: link: true third_party_settings: { } weight: 5 region: content + field_dropdown_menu_default_opt2: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 7 + region: content + field_dropdown_menu_default_opti: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 6 + region: content field_item: type: entity_reference_revisions_entity_view label: hidden diff --git a/config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opt2.yml b/config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opt2.yml new file mode 100644 index 00000000..8de69356 --- /dev/null +++ b/config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opt2.yml @@ -0,0 +1,30 @@ +uuid: 6b19f34b-fad5-4df8-a8b3-1dfd38d62b60 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_dropdown_menu_default_opt2 + - paragraphs.paragraphs_type.card_form + module: + - datalayer + - tmgmt_content +third_party_settings: + datalayer: + expose: 0 + label: field_dropdown_menu_default_opt2 + tmgmt_content: + excluded: false +id: paragraph.card_form.field_dropdown_menu_default_opt2 +field_name: field_dropdown_menu_default_opt2 +entity_type: paragraph +bundle: card_form +label: 'Dropdown sub-menu default option' +description: '' +required: false +translatable: true +default_value: + - + value: Choose... +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opti.yml b/config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opti.yml new file mode 100644 index 00000000..a3302ed7 --- /dev/null +++ b/config/config-default/field.field.paragraph.card_form.field_dropdown_menu_default_opti.yml @@ -0,0 +1,30 @@ +uuid: 2c4772c7-80f0-4429-a48a-acd164a353a9 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_dropdown_menu_default_opti + - paragraphs.paragraphs_type.card_form + module: + - datalayer + - tmgmt_content +third_party_settings: + datalayer: + expose: 0 + label: field_dropdown_menu_default_opti + tmgmt_content: + excluded: false +id: paragraph.card_form.field_dropdown_menu_default_opti +field_name: field_dropdown_menu_default_opti +entity_type: paragraph +bundle: card_form +label: 'Dropdown menu default option' +description: '' +required: false +translatable: true +default_value: + - + value: Choose... +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/config-default/field.storage.paragraph.field_dropdown_menu_default_opt2.yml b/config/config-default/field.storage.paragraph.field_dropdown_menu_default_opt2.yml new file mode 100644 index 00000000..ad850006 --- /dev/null +++ b/config/config-default/field.storage.paragraph.field_dropdown_menu_default_opt2.yml @@ -0,0 +1,21 @@ +uuid: 86f35ac8-06ab-41bb-9612-fd6e594bbf4a +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_dropdown_menu_default_opt2 +field_name: field_dropdown_menu_default_opt2 +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/config-default/field.storage.paragraph.field_dropdown_menu_default_opti.yml b/config/config-default/field.storage.paragraph.field_dropdown_menu_default_opti.yml new file mode 100644 index 00000000..d9cd3786 --- /dev/null +++ b/config/config-default/field.storage.paragraph.field_dropdown_menu_default_opti.yml @@ -0,0 +1,21 @@ +uuid: 21e4335d-b53f-4783-b904-7b4b476ada30 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_dropdown_menu_default_opti +field_name: field_dropdown_menu_default_opti +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig b/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig index 74465ab7..4f657742 100644 --- a/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig +++ b/web/themes/custom/atrium/templates/paragraph/paragraph--hero-cards.html.twig @@ -49,14 +49,17 @@ {% if dropdown_menu %} {% set menu_id = card.field_dropdown_menu.get(0).entity.id %} + {% set default_label = card.field_dropdown_menu_default_opti.0.value %} + {% set default_sub_label = card.field_dropdown_menu_default_opt2.0.value %} {% if menu_links[menu_id]['second_level'] %} {% set menu_type = 'cascading' %} - {% set menu_label = menu.field_label.value|t ?: '' %} - {% set menu_default_option = menu.field_default_option.value|t ?: '' %} + {% set menu_label = menu.field_label.value ?: '' %} + {% set menu_default_option = default_label ?: '' %} + + {% set menu_child_label = default_label ?: '' %} + {% set menu_default_child_option = default_sub_label ?: '' %} - {% set menu_child_label = menu.field_label2.value|t ?: '' %} - {% set menu_default_child_option = menu.field_default_child_option.value|t ?: '' %} {% for key, link in menu_links[menu_id] %} {% if link.title %} @@ -70,7 +73,7 @@ {% endfor %} {% set links = links|merge([{ name: link.title, - default_option: 'Choose option|t', + default_option: menu_default_child_option, items: cascading_links, }]) %} {% endif %} @@ -84,7 +87,7 @@ {% endfor %} {% set menu_type = 'single' %} {% set menu_label = menu.field_label.value ?: '' %} - {% set menu_default_option = menu.field_default_option.value ?: '' %} + {% set menu_default_option = default_label ?: '' %} {% endif %} {% else %} {% if type == 'menu_links' %} From 663ab11e8bc75972294de7b0e4912a446d47f722 Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Wed, 28 Sep 2022 11:37:37 -0700 Subject: [PATCH 5/6] Upgrade to Drupal 9.4.7 for Twig security patch --- composer.lock | 452 ++++++++++++++++++++++---------------------------- 1 file changed, 201 insertions(+), 251 deletions(-) diff --git a/composer.lock b/composer.lock index 4d7210ec..9b2467fe 100644 --- a/composer.lock +++ b/composer.lock @@ -1330,26 +1330,27 @@ }, { "name": "doctrine/collections", - "version": "1.6.8", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af" + "reference": "09dde3eb237756190f2de738d3c97cff10a8407b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af", - "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af", + "url": "https://api.github.com/repos/doctrine/collections/zipball/09dde3eb237756190f2de738d3c97cff10a8407b", + "reference": "09dde3eb237756190f2de738d3c97cff10a8407b", "shasum": "" }, "require": { + "doctrine/deprecations": "^0.5.3 || ^1", "php": "^7.1.3 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^0.12", + "doctrine/coding-standard": "^9.0 || ^10.0", + "phpstan/phpstan": "^1.4.8", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", - "vimeo/psalm": "^4.2.1" + "vimeo/psalm": "^4.22" }, "type": "library", "autoload": { @@ -1393,9 +1394,9 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.6.8" + "source": "https://github.com/doctrine/collections/tree/1.7.3" }, - "time": "2021-08-10T18:51:53+00:00" + "time": "2022-09-01T19:34:23+00:00" }, { "name": "doctrine/common", @@ -1498,36 +1499,76 @@ ], "time": "2020-06-05T16:46:05+00:00" }, + { + "name": "doctrine/deprecations", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + }, + "time": "2022-05-02T15:47:09+00:00" + }, { "name": "doctrine/event-manager", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" + "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", - "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/eb2ecf80e3093e8f3c2769ac838e27d8ede8e683", + "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "conflict": { - "doctrine/common": "<2.9@dev" + "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpunit/phpunit": "^7.0" + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "~1.4.10 || ^1.5.4", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.22" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\": "lib/Doctrine/Common" @@ -1574,7 +1615,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.1.x" + "source": "https://github.com/doctrine/event-manager/tree/1.1.2" }, "funding": [ { @@ -1590,7 +1631,7 @@ "type": "tidelift" } ], - "time": "2020-05-29T18:28:51+00:00" + "time": "2022-07-27T22:18:11+00:00" }, { "name": "doctrine/inflector", @@ -2946,16 +2987,16 @@ }, { "name": "drupal/core", - "version": "9.4.3", + "version": "9.4.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "7b1a403c093c7abc89ef3df1a6b05bdb19b3ffad" + "reference": "247431af7e33a8cf7c46677a79336103c6e83db1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/7b1a403c093c7abc89ef3df1a6b05bdb19b3ffad", - "reference": "7b1a403c093c7abc89ef3df1a6b05bdb19b3ffad", + "url": "https://api.github.com/repos/drupal/core/zipball/247431af7e33a8cf7c46677a79336103c6e83db1", + "reference": "247431af7e33a8cf7c46677a79336103c6e83db1", "shasum": "" }, "require": { @@ -3001,7 +3042,7 @@ "symfony/translation": "^4.4", "symfony/validator": "^4.4", "symfony/yaml": "^4.4.19", - "twig/twig": "^2.15", + "twig/twig": "^2.15.3", "typo3/phar-stream-wrapper": "^3.1.3" }, "conflict": { @@ -3009,29 +3050,6 @@ "symfony/http-foundation": "4.4.42" }, "replace": { - "drupal/action": "self.version", - "drupal/aggregator": "self.version", - "drupal/automated_cron": "self.version", - "drupal/ban": "self.version", - "drupal/bartik": "self.version", - "drupal/basic_auth": "self.version", - "drupal/big_pipe": "self.version", - "drupal/block": "self.version", - "drupal/block_content": "self.version", - "drupal/book": "self.version", - "drupal/breakpoint": "self.version", - "drupal/ckeditor": "self.version", - "drupal/ckeditor5": "self.version", - "drupal/claro": "self.version", - "drupal/classy": "self.version", - "drupal/color": "self.version", - "drupal/comment": "self.version", - "drupal/config": "self.version", - "drupal/config_translation": "self.version", - "drupal/contact": "self.version", - "drupal/content_moderation": "self.version", - "drupal/content_translation": "self.version", - "drupal/contextual": "self.version", "drupal/core-annotation": "self.version", "drupal/core-assertion": "self.version", "drupal/core-bridge": "self.version", @@ -3056,75 +3074,7 @@ "drupal/core-transliteration": "self.version", "drupal/core-utility": "self.version", "drupal/core-uuid": "self.version", - "drupal/core-version": "self.version", - "drupal/datetime": "self.version", - "drupal/datetime_range": "self.version", - "drupal/dblog": "self.version", - "drupal/dynamic_page_cache": "self.version", - "drupal/editor": "self.version", - "drupal/entity_reference": "self.version", - "drupal/field": "self.version", - "drupal/field_layout": "self.version", - "drupal/field_ui": "self.version", - "drupal/file": "self.version", - "drupal/filter": "self.version", - "drupal/forum": "self.version", - "drupal/hal": "self.version", - "drupal/help": "self.version", - "drupal/help_topics": "self.version", - "drupal/history": "self.version", - "drupal/image": "self.version", - "drupal/inline_form_errors": "self.version", - "drupal/jsonapi": "self.version", - "drupal/language": "self.version", - "drupal/layout_builder": "self.version", - "drupal/layout_discovery": "self.version", - "drupal/link": "self.version", - "drupal/locale": "self.version", - "drupal/media": "self.version", - "drupal/media_library": "self.version", - "drupal/menu_link_content": "self.version", - "drupal/menu_ui": "self.version", - "drupal/migrate": "self.version", - "drupal/migrate_drupal": "self.version", - "drupal/migrate_drupal_multilingual": "self.version", - "drupal/migrate_drupal_ui": "self.version", - "drupal/minimal": "self.version", - "drupal/mysql": "self.version", - "drupal/node": "self.version", - "drupal/olivero": "self.version", - "drupal/options": "self.version", - "drupal/page_cache": "self.version", - "drupal/path": "self.version", - "drupal/path_alias": "self.version", - "drupal/pgsql": "self.version", - "drupal/quickedit": "self.version", - "drupal/rdf": "self.version", - "drupal/responsive_image": "self.version", - "drupal/rest": "self.version", - "drupal/search": "self.version", - "drupal/serialization": "self.version", - "drupal/settings_tray": "self.version", - "drupal/seven": "self.version", - "drupal/shortcut": "self.version", - "drupal/sqlite": "self.version", - "drupal/standard": "self.version", - "drupal/stark": "self.version", - "drupal/statistics": "self.version", - "drupal/syslog": "self.version", - "drupal/system": "self.version", - "drupal/taxonomy": "self.version", - "drupal/telephone": "self.version", - "drupal/text": "self.version", - "drupal/toolbar": "self.version", - "drupal/tour": "self.version", - "drupal/tracker": "self.version", - "drupal/update": "self.version", - "drupal/user": "self.version", - "drupal/views": "self.version", - "drupal/views_ui": "self.version", - "drupal/workflows": "self.version", - "drupal/workspaces": "self.version" + "drupal/core-version": "self.version" }, "type": "drupal-core", "extra": { @@ -3198,9 +3148,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.4.3" + "source": "https://github.com/drupal/core/tree/9.4.7" }, - "time": "2022-07-20T15:11:38+00:00" + "time": "2022-09-28T16:19:47+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -3295,16 +3245,16 @@ }, { "name": "drupal/core-recommended", - "version": "9.4.3", + "version": "9.4.7", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "ff8662af0a5963a88ea856e9786e17a51f8e640c" + "reference": "287868a598996f1eb04ea57dbefb741d3784db23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/ff8662af0a5963a88ea856e9786e17a51f8e640c", - "reference": "ff8662af0a5963a88ea856e9786e17a51f8e640c", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/287868a598996f1eb04ea57dbefb741d3784db23", + "reference": "287868a598996f1eb04ea57dbefb741d3784db23", "shasum": "" }, "require": { @@ -3313,12 +3263,12 @@ "doctrine/annotations": "~1.13.2", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.4.3", + "drupal/core": "9.4.7", "egulias/email-validator": "~3.2", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.1", "guzzlehttp/psr7": "~1.9.0", - "laminas/laminas-diactoros": "~2.11.0", + "laminas/laminas-diactoros": "~2.11.1", "laminas/laminas-escaper": "~2.9.0", "laminas/laminas-feed": "~2.17.0", "laminas/laminas-stdlib": "~3.7.1", @@ -3362,7 +3312,7 @@ "symfony/validator": "~v4.4.41", "symfony/var-dumper": "~v5.4.9", "symfony/yaml": "~v4.4.37", - "twig/twig": "~v2.15.1", + "twig/twig": "~v2.15.3", "typo3/phar-stream-wrapper": "~v3.1.7" }, "conflict": { @@ -3375,9 +3325,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.4.3" + "source": "https://github.com/drupal/core-recommended/tree/9.4.7" }, - "time": "2022-07-20T15:11:38+00:00" + "time": "2022-09-28T16:19:47+00:00" }, { "name": "drupal/core-vendor-hardening", @@ -9241,16 +9191,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -9305,7 +9255,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -9321,7 +9271,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", @@ -10202,16 +10152,16 @@ }, { "name": "masterminds/html5", - "version": "2.7.5", + "version": "2.7.6", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" + "reference": "897eb517a343a2281f11bc5556d6548db7d93947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947", "shasum": "" }, "require": { @@ -10265,9 +10215,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.7.5" + "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" }, - "time": "2021-07-01T14:25:37+00:00" + "time": "2022-08-18T16:18:26+00:00" }, { "name": "mkalkbrenner/php-htmldiff-advanced", @@ -11592,16 +11542,16 @@ }, { "name": "symfony/console", - "version": "v4.4.43", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46" + "reference": "28b77970939500fb04180166a1f716e75a871ef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8a2628d2d5639f35113dc1b833ecd91e1ed1cf46", - "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46", + "url": "https://api.github.com/repos/symfony/console/zipball/28b77970939500fb04180166a1f716e75a871ef8", + "reference": "28b77970939500fb04180166a1f716e75a871ef8", "shasum": "" }, "require": { @@ -11662,7 +11612,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.43" + "source": "https://github.com/symfony/console/tree/v4.4.45" }, "funding": [ { @@ -11678,20 +11628,20 @@ "type": "tidelift" } ], - "time": "2022-06-23T12:22:25+00:00" + "time": "2022-08-17T14:50:19+00:00" }, { "name": "symfony/debug", - "version": "v4.4.41", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5" + "reference": "1a692492190773c5310bc7877cb590c04c2f05be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5", - "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5", + "url": "https://api.github.com/repos/symfony/debug/zipball/1a692492190773c5310bc7877cb590c04c2f05be", + "reference": "1a692492190773c5310bc7877cb590c04c2f05be", "shasum": "" }, "require": { @@ -11730,7 +11680,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.41" + "source": "https://github.com/symfony/debug/tree/v4.4.44" }, "funding": [ { @@ -11747,20 +11697,20 @@ } ], "abandoned": "symfony/error-handler", - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-07-28T16:29:46+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.43", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8d0ae6d87ceea5f3a352413f9d1f71ed2234dcbd" + "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8d0ae6d87ceea5f3a352413f9d1f71ed2234dcbd", - "reference": "8d0ae6d87ceea5f3a352413f9d1f71ed2234dcbd", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/25502a57182ba1e15da0afd64c975cae4d0a1471", + "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471", "shasum": "" }, "require": { @@ -11817,7 +11767,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.43" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.44" }, "funding": [ { @@ -11833,7 +11783,7 @@ "type": "tidelift" } ], - "time": "2022-06-22T15:01:38+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/deprecation-contracts", @@ -11904,16 +11854,16 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.41", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "529feb0e03133dbd5fd3707200147cc4903206da" + "reference": "be731658121ef2d8be88f3a1ec938148a9237291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/529feb0e03133dbd5fd3707200147cc4903206da", - "reference": "529feb0e03133dbd5fd3707200147cc4903206da", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/be731658121ef2d8be88f3a1ec938148a9237291", + "reference": "be731658121ef2d8be88f3a1ec938148a9237291", "shasum": "" }, "require": { @@ -11952,7 +11902,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v4.4.41" + "source": "https://github.com/symfony/error-handler/tree/v4.4.44" }, "funding": [ { @@ -11968,20 +11918,20 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-07-28T16:29:46+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.42", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "708e761740c16b02c86e3f0c932018a06b895d40" + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/708e761740c16b02c86e3f0c932018a06b895d40", - "reference": "708e761740c16b02c86e3f0c932018a06b895d40", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a", + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a", "shasum": "" }, "require": { @@ -12036,7 +11986,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.42" + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44" }, "funding": [ { @@ -12052,7 +12002,7 @@ "type": "tidelift" } ], - "time": "2022-05-05T15:33:49+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -12198,16 +12148,16 @@ }, { "name": "symfony/finder", - "version": "v5.4.8", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" + "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", + "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c", + "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c", "shasum": "" }, "require": { @@ -12241,7 +12191,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.8" + "source": "https://github.com/symfony/finder/tree/v5.4.11" }, "funding": [ { @@ -12257,7 +12207,7 @@ "type": "tidelift" } ], - "time": "2022-04-15T08:07:45+00:00" + "time": "2022-07-29T07:37:50+00:00" }, { "name": "symfony/http-client-contracts", @@ -12339,16 +12289,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.43", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "4441dada27f9208e03f449d73cb9253c639e53c5" + "reference": "b2f2e3cb66349d89cb46c939cea03c62ad71cf00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4441dada27f9208e03f449d73cb9253c639e53c5", - "reference": "4441dada27f9208e03f449d73cb9253c639e53c5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b2f2e3cb66349d89cb46c939cea03c62ad71cf00", + "reference": "b2f2e3cb66349d89cb46c939cea03c62ad71cf00", "shasum": "" }, "require": { @@ -12387,7 +12337,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.43" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.45" }, "funding": [ { @@ -12403,20 +12353,20 @@ "type": "tidelift" } ], - "time": "2022-06-19T13:07:44+00:00" + "time": "2022-08-17T15:29:03+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.43", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "c4c33fb9203e6f166ac0f318ce34e00686702522" + "reference": "4f2d38e9a3c6997ea0886ede5aaf337dfd0fc938" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c4c33fb9203e6f166ac0f318ce34e00686702522", - "reference": "c4c33fb9203e6f166ac0f318ce34e00686702522", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4f2d38e9a3c6997ea0886ede5aaf337dfd0fc938", + "reference": "4f2d38e9a3c6997ea0886ede5aaf337dfd0fc938", "shasum": "" }, "require": { @@ -12491,7 +12441,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.43" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.45" }, "funding": [ { @@ -12507,20 +12457,20 @@ "type": "tidelift" } ], - "time": "2022-06-26T16:51:30+00:00" + "time": "2022-08-26T14:34:48+00:00" }, { "name": "symfony/mime", - "version": "v5.4.10", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc" + "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc", - "reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc", + "url": "https://api.github.com/repos/symfony/mime/zipball/03876e9c5a36f5b45e7d9a381edda5421eff8a90", + "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90", "shasum": "" }, "require": { @@ -12574,7 +12524,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.10" + "source": "https://github.com/symfony/mime/tree/v5.4.12" }, "funding": [ { @@ -12590,7 +12540,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T12:22:40+00:00" + "time": "2022-08-19T14:24:03+00:00" }, { "name": "symfony/polyfill-ctype", @@ -13251,16 +13201,16 @@ }, { "name": "symfony/process", - "version": "v4.4.41", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce" + "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/9eedd60225506d56e42210a70c21bb80ca8456ce", - "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce", + "url": "https://api.github.com/repos/symfony/process/zipball/5cee9cdc4f7805e2699d9fd66991a0e6df8252a2", + "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2", "shasum": "" }, "require": { @@ -13293,7 +13243,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.41" + "source": "https://github.com/symfony/process/tree/v4.4.44" }, "funding": [ { @@ -13309,20 +13259,20 @@ "type": "tidelift" } ], - "time": "2022-04-04T10:19:07+00:00" + "time": "2022-06-27T13:16:42+00:00" }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34" + "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34", - "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d444f85dddf65c7e57c58d8e5b3a4dbb593b1840", + "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840", "shasum": "" }, "require": { @@ -13381,7 +13331,7 @@ ], "support": { "issues": "https://github.com/symfony/psr-http-message-bridge/issues", - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.2" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.3" }, "funding": [ { @@ -13397,20 +13347,20 @@ "type": "tidelift" } ], - "time": "2021-11-05T13:13:39+00:00" + "time": "2022-09-05T10:34:54+00:00" }, { "name": "symfony/routing", - "version": "v4.4.41", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "c25e38d403c00d5ddcfc514f016f1b534abdf052" + "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/c25e38d403c00d5ddcfc514f016f1b534abdf052", - "reference": "c25e38d403c00d5ddcfc514f016f1b534abdf052", + "url": "https://api.github.com/repos/symfony/routing/zipball/f7751fd8b60a07f3f349947a309b5bdfce22d6ae", + "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae", "shasum": "" }, "require": { @@ -13470,7 +13420,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v4.4.41" + "source": "https://github.com/symfony/routing/tree/v4.4.44" }, "funding": [ { @@ -13486,20 +13436,20 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/serializer", - "version": "v4.4.43", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "bd020a578d786952cf5d67f8140dfacc161f58a4" + "reference": "d19621a350491f76e2faed2afb982e0706f63252" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/bd020a578d786952cf5d67f8140dfacc161f58a4", - "reference": "bd020a578d786952cf5d67f8140dfacc161f58a4", + "url": "https://api.github.com/repos/symfony/serializer/zipball/d19621a350491f76e2faed2afb982e0706f63252", + "reference": "d19621a350491f76e2faed2afb982e0706f63252", "shasum": "" }, "require": { @@ -13564,7 +13514,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v4.4.43" + "source": "https://github.com/symfony/serializer/tree/v4.4.45" }, "funding": [ { @@ -13580,7 +13530,7 @@ "type": "tidelift" } ], - "time": "2022-06-24T10:10:05+00:00" + "time": "2022-08-17T14:28:21+00:00" }, { "name": "symfony/service-contracts", @@ -13667,16 +13617,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.41", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331" + "reference": "4e6b4c0dbeb04d6f004ed7f43eb0905ce8396def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/dcb67eae126e74507e0b4f0b9ac6ef35b37c3331", - "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331", + "url": "https://api.github.com/repos/symfony/translation/zipball/4e6b4c0dbeb04d6f004ed7f43eb0905ce8396def", + "reference": "4e6b4c0dbeb04d6f004ed7f43eb0905ce8396def", "shasum": "" }, "require": { @@ -13736,7 +13686,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.41" + "source": "https://github.com/symfony/translation/tree/v4.4.45" }, "funding": [ { @@ -13752,7 +13702,7 @@ "type": "tidelift" } ], - "time": "2022-04-21T07:22:34+00:00" + "time": "2022-08-02T12:44:49+00:00" }, { "name": "symfony/translation-contracts", @@ -13834,16 +13784,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.43", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "5ae0de59615dff1896d44bc986ad87600ea121e7" + "reference": "06db9bfca8fefea4dfe8e804bbcd0aa79a414d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/5ae0de59615dff1896d44bc986ad87600ea121e7", - "reference": "5ae0de59615dff1896d44bc986ad87600ea121e7", + "url": "https://api.github.com/repos/symfony/validator/zipball/06db9bfca8fefea4dfe8e804bbcd0aa79a414d0c", + "reference": "06db9bfca8fefea4dfe8e804bbcd0aa79a414d0c", "shasum": "" }, "require": { @@ -13920,7 +13870,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.43" + "source": "https://github.com/symfony/validator/tree/v4.4.45" }, "funding": [ { @@ -13936,20 +13886,20 @@ "type": "tidelift" } ], - "time": "2022-06-05T18:35:51+00:00" + "time": "2022-08-04T16:19:35+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "af52239a330fafd192c773795520dc2dd62b5657" + "reference": "b8f306d7b8ef34fb3db3305be97ba8e088fb4861" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657", - "reference": "af52239a330fafd192c773795520dc2dd62b5657", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b8f306d7b8ef34fb3db3305be97ba8e088fb4861", + "reference": "b8f306d7b8ef34fb3db3305be97ba8e088fb4861", "shasum": "" }, "require": { @@ -14009,7 +13959,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.9" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.11" }, "funding": [ { @@ -14025,20 +13975,20 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-07-20T13:00:38+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.43", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "07e392f0ef78376d080d5353c081a5e5704835bd" + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/07e392f0ef78376d080d5353c081a5e5704835bd", - "reference": "07e392f0ef78376d080d5353c081a5e5704835bd", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", "shasum": "" }, "require": { @@ -14080,7 +14030,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.43" + "source": "https://github.com/symfony/yaml/tree/v4.4.45" }, "funding": [ { @@ -14096,20 +14046,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T08:31:17+00:00" + "time": "2022-08-02T15:47:23+00:00" }, { "name": "twig/twig", - "version": "v2.15.1", + "version": "v2.15.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4" + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4", - "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a", + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a", "shasum": "" }, "require": { @@ -14164,7 +14114,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.1" + "source": "https://github.com/twigphp/Twig/tree/v2.15.3" }, "funding": [ { @@ -14176,7 +14126,7 @@ "type": "tidelift" } ], - "time": "2022-05-17T05:46:24+00:00" + "time": "2022-09-28T08:40:08+00:00" }, { "name": "typo3/phar-stream-wrapper", From e77ca4c34e8cfdcd8e2f55573218c66d59254850 Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Wed, 28 Sep 2022 12:11:25 -0700 Subject: [PATCH 6/6] Remove 3157183_20.patch which triggered composer.json updates --- composer-manifest.yaml | 49 +++++++++++++------------- composer.json | 3 +- web/sites/default/default.services.yml | 15 ++++++++ 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/composer-manifest.yaml b/composer-manifest.yaml index b9f6d2e8..e5ee698b 100644 --- a/composer-manifest.yaml +++ b/composer-manifest.yaml @@ -22,9 +22,10 @@ packages: dflydev/dot-access-data: v1.1.0 doctrine/annotations: 1.13.3 doctrine/cache: 1.13.0 - doctrine/collections: 1.6.8 + doctrine/collections: 1.7.3 doctrine/common: 2.13.3 - doctrine/event-manager: 1.1.1 + doctrine/deprecations: v1.0.0 + doctrine/event-manager: 1.1.2 doctrine/inflector: 1.4.4 doctrine/lexer: 1.2.3 doctrine/persistence: 1.3.8 @@ -45,10 +46,10 @@ packages: drupal/config_filter: 1.9.0 drupal/config_ignore: 2.3.0 drupal/config_split: 1.8.0 - drupal/core: 9.4.3 + drupal/core: 9.4.7 drupal/core-composer-scaffold: 9.4.1 drupal/core-project-message: 9.4.1 - drupal/core-recommended: 9.4.3 + drupal/core-recommended: 9.4.7 drupal/core-vendor-hardening: 9.4.1 drupal/crop: 2.2.0 drupal/csv_serialization: 2.1.0 @@ -145,7 +146,7 @@ packages: grasmash/expander: 1.0.0 grasmash/yaml-expander: 1.4.0 guzzlehttp/guzzle: 6.5.8 - guzzlehttp/promises: 1.5.1 + guzzlehttp/promises: 1.5.2 guzzlehttp/psr7: 1.9.0 harvesthq/chosen: 1.8.7 html2text/html2text: 4.3.1 @@ -160,7 +161,7 @@ packages: maennchen/zipstream-php: 2.2.1 markbaker/complex: 3.0.1 markbaker/matrix: 3.0.0 - masterminds/html5: 2.7.5 + masterminds/html5: 2.7.6 mkalkbrenner/php-htmldiff-advanced: 0.0.8 myclabs/php-enum: 1.8.3 nikic/php-parser: v4.14.0 @@ -184,19 +185,19 @@ packages: solarium/solarium: 6.2.4 stack/builder: v1.0.6 symfony-cmf/routing: 2.3.4 - symfony/console: v4.4.43 - symfony/debug: v4.4.41 - symfony/dependency-injection: v4.4.43 + symfony/console: v4.4.45 + symfony/debug: v4.4.44 + symfony/dependency-injection: v4.4.44 symfony/deprecation-contracts: v2.5.2 - symfony/error-handler: v4.4.41 - symfony/event-dispatcher: v4.4.42 + symfony/error-handler: v4.4.44 + symfony/event-dispatcher: v4.4.44 symfony/event-dispatcher-contracts: v1.1.13 symfony/filesystem: v4.4.42 - symfony/finder: v5.4.8 + symfony/finder: v5.4.11 symfony/http-client-contracts: v2.5.2 - symfony/http-foundation: v4.4.43 - symfony/http-kernel: v4.4.43 - symfony/mime: v5.4.10 + symfony/http-foundation: v4.4.45 + symfony/http-kernel: v4.4.45 + symfony/mime: v5.4.12 symfony/polyfill-ctype: v1.25.0 symfony/polyfill-iconv: v1.25.0 symfony/polyfill-intl-idn: v1.25.0 @@ -205,17 +206,17 @@ packages: symfony/polyfill-php72: v1.26.0 symfony/polyfill-php73: v1.26.0 symfony/polyfill-php80: v1.25.0 - symfony/process: v4.4.41 - symfony/psr-http-message-bridge: v2.1.2 - symfony/routing: v4.4.41 - symfony/serializer: v4.4.43 + symfony/process: v4.4.44 + symfony/psr-http-message-bridge: v2.1.3 + symfony/routing: v4.4.44 + symfony/serializer: v4.4.45 symfony/service-contracts: v2.5.2 - symfony/translation: v4.4.41 + symfony/translation: v4.4.45 symfony/translation-contracts: v2.5.2 - symfony/validator: v4.4.43 - symfony/var-dumper: v5.4.9 - symfony/yaml: v4.4.43 - twig/twig: v2.15.1 + symfony/validator: v4.4.45 + symfony/var-dumper: v5.4.11 + symfony/yaml: v4.4.45 + twig/twig: v2.15.3 typo3/phar-stream-wrapper: v3.1.7 vlucas/phpdotenv: v2.6.9 webflo/drupal-finder: 1.2.2 diff --git a/composer.json b/composer.json index 74539254..d2d5a5a8 100644 --- a/composer.json +++ b/composer.json @@ -287,8 +287,7 @@ "patches": { "drupal/core": { "Don't override media title with metadata on translation save.": "https://www.drupal.org/files/issues/2019-04-25/media-translation_hassourcefieldchanged-2999370-11.patch", - "Media library edit": "https://www.drupal.org/files/issues/2021-01-04/3168868-9.patch", - "Media name reverts to default": "https://www.drupal.org/files/issues/2020-10-28/3157183_20.patch" + "Media library edit": "https://www.drupal.org/files/issues/2021-01-04/3168868-9.patch" }, "drupal/webform": { "By default, do not save submissions.": "patches/disable-results-by-default.patch" diff --git a/web/sites/default/default.services.yml b/web/sites/default/default.services.yml index ff6797d9..cdeb41fc 100644 --- a/web/sites/default/default.services.yml +++ b/web/sites/default/default.services.yml @@ -93,6 +93,21 @@ parameters: # Disabling the Twig cache is not recommended in production environments. # @default true cache: true + # File extensions: + # + # List of file extensions the Twig system is allowed to load via the + # twig.loader.filesystem service. Files with other extensions will not be + # loaded unless they are added here. For example, to allow a file named + # 'example.partial' to be loaded, add 'partial' to this list. To load files + # with no extension, add an empty string '' to the list. + # + # @default ['css', 'html', 'js', 'svg', 'twig'] + allowed_file_extensions: + - css + - html + - js + - svg + - twig renderer.config: # Renderer required cache contexts: #