From 7c8725d7b69c4f489a77967a70211643698b6294 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Mon, 3 Apr 2023 17:58:51 +0000 Subject: [PATCH 1/7] 9.4.15 --- .../humsci_default_content/humsci_default_content.info.yml | 2 +- .../humsci_events_listeners/humsci_events_listeners.info.yml | 2 +- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml index fafd54bc4a..1f026b2a11 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml @@ -3,7 +3,7 @@ description: 'DO NOT INSTALL. This is for profile installation task only.' core_version_requirement: '^8.8 || ^9' hidden: true type: module -version: 9.4.14 +version: 9.4.15 default_content: shortcut: - 0c69448d-c6fa-4fb8-9b2e-f93f3a955baf diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml index eceff331ba..2753180189 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml @@ -14,4 +14,4 @@ dependencies: - 'hook_event_dispatcher:toolbar_event_dispatcher' - 'hook_event_dispatcher:user_event_dispatcher' - 'hook_event_dispatcher:views_event_dispatcher' -version: 9.4.14 +version: 9.4.15 diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index c6ea0db362..2db133dc79 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 9.4.14 +version: 9.4.15 core_version_requirement: '^8.8 || ^9' themes: - material_admin From 9d56d53e52b9b7dfd824bb950f1ee1e6ce6f96e4 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Wed, 5 Apr 2023 14:07:31 +0000 Subject: [PATCH 2/7] Updated dependencies Apr 5 2023 --- composer.lock | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index fdc3105fe1..995099954b 100644 --- a/composer.lock +++ b/composer.lock @@ -5679,17 +5679,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.0.11", + "version": "2.0.12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.0.11" + "reference": "2.0.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.11.zip", - "reference": "2.0.11", - "shasum": "08e690cdf40d44a6d9386b393f83259a2cf07a21" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.12.zip", + "reference": "2.0.12", + "shasum": "e0e584a2f409709f4547dfe9cc7376a80f8fa317" }, "require": { "drupal/core": "^9 || ^10" @@ -5697,8 +5697,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.11", - "datestamp": "1679952007", + "version": "2.0.12", + "datestamp": "1680556093", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -11062,10 +11062,6 @@ "homepage": "https://www.drupal.org/u/markie", "role": "Maintainer" }, - { - "name": "newsignature", - "homepage": "https://www.drupal.org/user/765518" - }, { "name": "ultimike", "homepage": "https://www.drupal.org/user/51132" @@ -11305,6 +11301,10 @@ "name": "DanielVeza", "homepage": "https://www.drupal.org/user/3362504" }, + { + "name": "dieuwe", + "homepage": "https://www.drupal.org/user/1536006" + }, { "name": "jazzslider", "homepage": "https://www.drupal.org/user/430722" @@ -18338,16 +18338,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "32cab695bf99c63aff7d27ac67919944c00530ed" + "reference": "5ed986c4ef65f0dea5e9753630b5cb1f07f847d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/32cab695bf99c63aff7d27ac67919944c00530ed", - "reference": "32cab695bf99c63aff7d27ac67919944c00530ed", + "url": "https://api.github.com/repos/symfony/cache/zipball/5ed986c4ef65f0dea5e9753630b5cb1f07f847d6", + "reference": "5ed986c4ef65f0dea5e9753630b5cb1f07f847d6", "shasum": "" }, "require": { @@ -18415,7 +18415,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.21" + "source": "https://github.com/symfony/cache/tree/v5.4.22" }, "funding": [ { @@ -18431,7 +18431,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T12:11:13+00:00" + "time": "2023-03-29T20:01:08+00:00" }, { "name": "symfony/cache-contracts", @@ -20972,16 +20972,16 @@ }, { "name": "symfony/string", - "version": "v6.2.7", + "version": "v6.2.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "67b8c1eec78296b85dc1c7d9743830160218993d" + "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d", - "reference": "67b8c1eec78296b85dc1c7d9743830160218993d", + "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef", + "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef", "shasum": "" }, "require": { @@ -21038,7 +21038,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.7" + "source": "https://github.com/symfony/string/tree/v6.2.8" }, "funding": [ { @@ -21054,7 +21054,7 @@ "type": "tidelift" } ], - "time": "2023-02-24T10:42:00+00:00" + "time": "2023-03-20T16:06:02+00:00" }, { "name": "symfony/translation", @@ -21448,16 +21448,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74" + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", - "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", "shasum": "" }, "require": { @@ -21517,7 +21517,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.21" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" }, "funding": [ { @@ -21533,7 +21533,7 @@ "type": "tidelift" } ], - "time": "2023-02-23T10:00:28+00:00" + "time": "2023-03-25T09:27:28+00:00" }, { "name": "symfony/var-exporter", @@ -25410,16 +25410,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.16.1", + "version": "1.17.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571" + "reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571", - "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/d3753fcb3abc6f78f5de6f72153d4b9c99c72dee", + "reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee", "shasum": "" }, "require": { @@ -25449,9 +25449,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.17.1" }, - "time": "2023-02-07T18:11:17+00:00" + "time": "2023-04-04T11:11:22+00:00" }, { "name": "phpunit/php-code-coverage", @@ -27809,5 +27809,5 @@ "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } From f924ae39a6ef379d8e4181b24cc101aecb5da839 Mon Sep 17 00:00:00 2001 From: pookmish Date: Fri, 7 Apr 2023 19:05:12 -0700 Subject: [PATCH 3/7] Upgrade modules & custom code for Drupal 10 prep (#1289) --- composer.json | 20 +- composer.lock | 786 +++++++++++++++--- .../config_split.config_split.local.yml | 1 + .../default/editor.editor.webform_default.yml | 52 ++ .../default/filter.format.webform_default.yml | 11 + config/default/webform.settings.yml | 6 +- config/envs/local/upgrade_status.settings.yml | 3 + .../humsci/hs_actions/hs_actions.info.yml | 2 +- .../hs_basic_page/hs_basic_page.info.yml | 2 +- .../hs_basic_page_display.info.yml | 2 +- .../humsci/hs_blocks/hs_blocks.info.yml | 2 +- .../humsci/hs_blocks/hs_blocks.libraries.yml | 3 +- .../js/hs_blocks.group_block.admin.js | 10 +- .../Controller/HsChooseBlockController.php | 2 +- .../hs_blocks/src/Plugin/Block/GroupBlock.php | 18 +- .../modules/humsci/hs_capx/hs_capx.info.yml | 2 +- .../hs_capx/src/Form/CapxImporterForm.php | 3 +- .../hs_capx/tests/src/Unit/CapxTest.php | 4 +- .../migrate/process/CapxTaggingTest.php | 2 +- .../hs_config_prefix.info.yml | 2 +- .../hs_config_readonly.info.yml | 2 +- .../humsci/hs_courses/hs_courses.info.yml | 2 +- .../hs_courses_importer.info.yml | 2 +- .../hs_event_series/hs_event_series.info.yml | 2 +- .../hs_event_series_display.info.yml | 2 +- .../humsci/hs_events/hs_events.info.yml | 2 +- .../humsci/hs_events/hs_events.install | 127 +-- .../hs_events_display.info.yml | 2 +- .../hs_events_importer.info.yml | 2 +- .../hs_field_helpers.info.yml | 2 +- .../hs_field_helpers/hs_field_helpers.module | 10 +- .../hs_field_helpers.services.yml | 2 +- .../src/EventSubscriber/EventSubscriber.php | 27 +- .../Plugin/TwigPlugin/HsJumpstartUITwig.php | 2 +- .../hs_field_helpers/src/PreRenderer.php | 2 +- .../humsci/hs_layouts/hs_layouts.info.yml | 4 +- .../generic-three-column.html.twig | 4 +- .../gradient-hero/gradient-hero.html.twig | 6 +- .../hero-text-overlay.html.twig | 4 +- .../patterns/spotlight/spotlight.html.twig | 4 +- .../src/TwigExtension/TwigFilters.php | 15 +- .../letsencrypt_challenge.info.yml | 2 +- .../hs_masquerade/hs_masquerade.info.yml | 2 +- .../hs_mathematics/hs_mathematics.info.yml | 2 +- .../humsci/hs_megamenu/hs_megamenu.info.yml | 4 +- .../humsci/hs_migrate/hs_migrate.info.yml | 2 +- .../modules/humsci/hs_news/hs_news.info.yml | 2 +- .../hs_news_display/hs_news_display.info.yml | 2 +- .../hs_page_reports/hs_page_reports.info.yml | 2 +- .../PageReportsEventSubscriber.php | 9 +- .../PageReportsEventSubscriberTest.php | 2 + .../hs_paragraph_types.info.yml | 2 +- .../hs_hero_image/hs_hero_image.info.yml | 2 +- .../hs_hero_image_display.info.yml | 2 +- .../modules/hs_postcard/hs_postcard.info.yml | 2 +- .../hs_postcard_display.info.yml | 2 +- .../modules/hs_row/hs_row.info.yml | 2 +- .../hs_row_display/hs_row_display.info.yml | 2 +- .../modules/hs_slide/hs_slide.info.yml | 2 +- .../hs_slide_display.info.yml | 2 +- .../hs_slideshow/hs_slideshow.info.yml | 2 +- .../hs_slideshow_display.info.yml | 2 +- .../hs_text_area/hs_text_area.info.yml | 2 +- .../hs_text_area_display.info.yml | 2 +- .../modules/hs_view/hs_view.info.yml | 2 +- .../hs_view_display/hs_view_display.info.yml | 2 +- .../modules/hs_webform/hs_webform.info.yml | 2 +- .../hs_paragraphs_between.info.yml | 2 +- .../humsci/hs_person/hs_person.info.yml | 2 +- .../hs_person_display.info.yml | 2 +- .../hs_publications/hs_publications.info.yml | 2 +- .../hs_publications_display.info.yml | 2 +- .../humsci/hs_research/hs_research.info.yml | 2 +- .../hs_research_display.info.yml | 2 +- .../hs_revision_cleanup.info.yml | 2 +- .../hs_table_filter/hs_table_filter.info.yml | 2 +- .../hs_views_helper/hs_views_helper.info.yml | 2 +- .../hs_views_helper_test_config.info.yml | 2 +- .../Normalizer/HumsciMarkupNormalizerTest.php | 2 +- .../mrc_bricks_helper.info.yml | 2 +- .../modules/mrc_date/mrc_date.info.yml | 2 +- .../mrc_display_modes.info.yml | 2 +- .../mrc_ds_blocks/mrc_ds_blocks.info.yml | 2 +- .../modules/mrc_events/mrc_events.info.yml | 2 +- .../mrc_events_importer.info.yml | 2 +- .../modules/mrc_helper/mrc_helper.info.yml | 2 +- .../mrc_migrate_processors.info.yml | 2 +- .../modules/mrc_news/mrc_news.info.yml | 2 +- .../modules/mrc_page/mrc_page.info.yml | 2 +- .../mrc_paragraphs_cta.info.yml | 2 +- .../mrc_paragraphs_postcard.info.yml | 2 +- .../mrc_paragraphs_slide.info.yml | 2 +- .../mrc_paragraphs_slideshow.info.yml | 2 +- .../mrc_paragraphs_view.info.yml | 2 +- .../mrc_paragraphs_webform.info.yml | 2 +- .../modules/mrc_people/mrc_people.info.yml | 2 +- .../mrc_permissions/mrc_permissions.info.yml | 2 +- .../modules/mrc_visitor/mrc_visitor.info.yml | 2 +- .../mrc_yearonly/mrc_yearonly.info.yml | 2 +- .../views_block_filter_block.info.yml | 2 +- .../humsci/stanford_mrc/stanford_mrc.info.yml | 2 +- .../math_research_center.info.yml | 2 +- .../su_humsci_profile/drush.services.yml | 2 +- .../humsci_default_content.info.yml | 2 +- .../humsci_events_listeners.info.yml | 2 +- .../src/Commands/HumsciCommands.php | 17 +- .../CKEditorPlugin/HumsciFontAwesome.php | 36 +- .../su_humsci_profile.info.yml | 2 +- .../humsci/archaeology/archaeology.info.yml | 2 +- .../francestanford/francestanford.info.yml | 2 +- .../humsci/humsci_airy/humsci_airy.info.yml | 2 +- .../humsci/humsci_basic/humsci_basic.info.yml | 12 +- .../humsci/humsci_basic/humsci_basic.theme | 15 +- .../templates/menus/menu--main.html.twig | 4 +- .../menus/menu--menu-block--main.html.twig | 4 +- .../humsci/humsci_basic/theme-settings.php | 6 +- .../humsci_colorful/humsci_colorful.info.yml | 2 +- .../humsci_traditional.info.yml | 2 +- .../humsci/mathematics/mathematics.info.yml | 2 +- .../su_humsci_admin/su_humsci_admin.info.yml | 2 +- .../su_humsci_subtheme.info.yml | 2 +- .../humsci/su_humsci_theme/color/color.inc | 4 +- .../su_humsci_theme/js/nodes/hs_person.js | 10 +- .../su_humsci_theme/js/su_humsci_theme.js | 6 +- .../su_humsci_theme/scss/base/_global.scss | 4 +- .../su_humsci_theme/su_humsci_theme.info.yml | 4 +- .../su_humsci_theme.libraries.yml | 4 +- .../su_humsci_theme/su_humsci_theme.theme | 9 +- .../pattern_hero_text_overlay.html.twig | 4 +- patches/contrib/stanford_basic.patch | 31 +- .../codeception/acceptance/MenuItemsCest.php | 2 - 131 files changed, 1047 insertions(+), 438 deletions(-) create mode 100644 config/default/editor.editor.webform_default.yml create mode 100644 config/default/filter.format.webform_default.yml create mode 100644 config/envs/local/upgrade_status.settings.yml diff --git a/composer.json b/composer.json index 2cc820e94c..503441dbb6 100644 --- a/composer.json +++ b/composer.json @@ -135,12 +135,12 @@ "drupal/asset_injector": "^2.7", "drupal/audio_embed_field": "^2.0", "drupal/auto_entitylabel": "^3.0@beta", - "drupal/better_exposed_filters": "^5.2", + "drupal/better_exposed_filters": "^6.0", "drupal/better_normalizers": "^1.0@beta", "drupal/block_class": "^2.0", "drupal/block_content_permissions": "^1.10", "drupal/block_field": "^1.0@RC", - "drupal/bricks": "^2.0", + "drupal/bricks": "^2.1@alpha", "drupal/cancel_button": "^1.1", "drupal/chosen": "^3.0", "drupal/ckeditor_blockimagepaste": "^1.4", @@ -154,7 +154,7 @@ "drupal/config_pages_overrides": "^2.0", "drupal/config_readonly": "^1.0@beta", "drupal/config_split": "^1.0", - "drupal/config_update": "^1.7", + "drupal/config_update": "^2.0@alpha", "drupal/confirm_leave": "^1.0@beta", "drupal/content_access": "^1.0@alpha", "drupal/core": "^9.4.5", @@ -187,10 +187,12 @@ "drupal/field_validation": "^1.0@beta", "drupal/fontawesome": "^2.22", "drupal/google_analytics": "^4.0", + "drupal/hal": "^1.0", "drupal/honeypot": "^2.0", - "drupal/hook_event_dispatcher": "~3.2.0", + "drupal/hook_event_dispatcher": "^4.0@alpha", "drupal/imagemagick": "^3.1", "drupal/insert": "^2.0", + "drupal/jquery_ui_menu": "^2.0", "drupal/jsonapi_extras": "^3.21", "drupal/key": "^1.14", "drupal/layout_builder_component_attributes": "^2.0", @@ -230,13 +232,13 @@ "drupal/role_watchdog": "^2.0", "drupal/search_api": "^1.18", "drupal/seckit": "^2.0", - "drupal/selective_better_exposed_filters": "^2.0@beta", + "drupal/selective_better_exposed_filters": "^3.0@beta", "drupal/shield": "^1.4", "drupal/shortcut_menu": "^3.0@beta", "drupal/slick_paragraphs": "^2.0", "drupal/smart_date": "^3.1", "drupal/smart_trim": "^2.0", - "drupal/spamspan": "^1.3", + "drupal/spamspan": "^3.0@beta", "drupal/stage_file_proxy": "^2.0", "drupal/term_condition": "^2.0", "drupal/ui_patterns": "^1.2", @@ -254,7 +256,7 @@ "drupal/views_infinite_scroll": "^2.0", "drupal/views_taxonomy_term_name_depth": "^7.0", "drupal/we_megamenu": "^1.13", - "drupal/webform": "^6.0", + "drupal/webform": "^6.2@beta", "drupal/webp": "^1.0@beta", "drupal/xmlsitemap": "^1.0", "drupal/yearonly": "^9.0", @@ -264,6 +266,7 @@ "onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7", "sainsburys/guzzle-oauth2-plugin": "^3.0", "simplesamlphp/simplesamlphp": "^1.19", + "su-sws/ckeditor5_plugins": "^1.0", "su-sws/nobots": "^8.2", "su-sws/react_paragraphs": "^8.2", "su-sws/stanford_basic": "dev-8.x-2.x#9d6391431de1aefa93c4dfe671e309cef1496d81", @@ -275,6 +278,7 @@ }, "require-dev": { "acquia/blt-drupal-test": "^1.0", + "drupal/upgrade_status": "^4.0", "phpspec/prophecy-phpunit": "^2.0", "su-sws/blt-sws": "dev-main", "su-sws/drupal-dev": "^8.2" @@ -386,7 +390,7 @@ "https://www.drupal.org/project/we_megamenu/issues/3055213 & https://www.drupal.org/project/we_megamenu/issues/3274934": "patches/contrib/we_megamenu.patch" }, "su-sws/stanford_basic": { - "D9 Update": "patches/contrib/stanford_basic.patch" + "D9/10 Update": "patches/contrib/stanford_basic.patch" } }, "drupal-scaffold": { diff --git a/composer.lock b/composer.lock index 995099954b..92f45a6f2f 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": "e779272cc707ee33ba0e4ffde1b603d1", + "content-hash": "2cb7ec20d00860a4cd47bf01948b8726", "packages": [ { "name": "acquia/blt", @@ -2669,30 +2669,30 @@ }, { "name": "drupal/better_exposed_filters", - "version": "5.2.0", + "version": "6.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/better_exposed_filters.git", - "reference": "8.x-5.2" + "reference": "6.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-8.x-5.2.zip", - "reference": "8.x-5.2", - "shasum": "43f0d013d78ab72c29d797ac5fe9be682ffbfb85" + "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-6.0.2.zip", + "reference": "6.0.2", + "shasum": "e06e8f88fab14942e4d3f71faaa64a30f136792c" }, "require": { - "drupal/core": "^8.8 || ^9", + "drupal/core": "^9 || ^10", "drupal/jquery_ui": "^1.4", - "drupal/jquery_ui_datepicker": "^1.0", + "drupal/jquery_ui_datepicker": "^1.2", "drupal/jquery_ui_slider": "^1.1", "drupal/jquery_ui_touch_punch": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-5.2", - "datestamp": "1657172286", + "version": "6.0.2", + "datestamp": "1666017720", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3084,20 +3084,20 @@ }, { "name": "drupal/bricks", - "version": "2.0.3", + "version": "2.1.0-alpha1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/bricks.git", - "reference": "2.0.3" + "reference": "2.1.0-alpha1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/bricks-2.0.3.zip", - "reference": "2.0.3", - "shasum": "50e9b97b0d03c342d22bd219aeb7ceaf42df0742" + "url": "https://ftp.drupal.org/files/projects/bricks-2.1.0-alpha1.zip", + "reference": "2.1.0-alpha1", + "shasum": "638a47eb3fe83e5a2a1bc059cc9b55b2e3db3cff" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.3 || ^10" }, "require-dev": { "drupal/bricks_inline": "*", @@ -3112,11 +3112,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.3", - "datestamp": "1658177888", + "version": "2.1.0-alpha1", + "datestamp": "1678484271", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." } } }, @@ -4302,29 +4302,29 @@ }, { "name": "drupal/config_update", - "version": "1.7.0", + "version": "2.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_update.git", - "reference": "8.x-1.7" + "reference": "2.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_update-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "8f079abf7c2ea826a27fa5224b0770a26404c968" + "url": "https://ftp.drupal.org/files/projects/config_update-2.0.0-alpha2.zip", + "reference": "2.0.0-alpha2", + "shasum": "e6406bbde77234689f93e1ce589c5b2384949ce9" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.4 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.7", - "datestamp": "1586355587", + "version": "2.0.0-alpha2", + "datestamp": "1677596924", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." } } }, @@ -4342,7 +4342,7 @@ "homepage": "https://www.drupal.org/user/80733" } ], - "description": "Provides basic revert and update functionality for other modules", + "description": "Provides basic revert and update functionality for other modules.", "homepage": "https://www.drupal.org/project/config_update", "support": { "source": "https://git.drupalcode.org/project/config_update" @@ -7220,29 +7220,29 @@ }, { "name": "drupal/hook_event_dispatcher", - "version": "3.2.0", + "version": "4.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hook_event_dispatcher.git", - "reference": "3.2.0" + "reference": "4.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-3.2.0.zip", - "reference": "3.2.0", - "shasum": "08e975804e8c11c33ec19cb619dee5cf4d14dc7c" + "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-4.0.0-alpha2.zip", + "reference": "4.0.0-alpha2", + "shasum": "1c55cf57c44d36741925783eff797ed5380e9f59" }, "require": { - "drupal/core": "^9.3" + "drupal/core": "^9.3 || ^10", + "php": ">=8.1.0" }, "require-dev": { "drupal/core_event_dispatcher": "*", - "drupal/eck": "^1.0@alpha", "drupal/paragraphs": "^1.10", - "drupal/webform": "^6.0", + "drupal/webform": "*", "mglaman/phpstan-drupal": "^1.1", "mockery/mockery": "^1.3", - "phpmd/phpmd": "^2.8", + "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0" }, "suggest": { @@ -7252,11 +7252,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.2.0", - "datestamp": "1653279726", + "version": "4.0.0-alpha2", + "datestamp": "1677506490", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." } } }, @@ -7734,6 +7734,71 @@ "source": "https://git.drupalcode.org/project/jquery_ui_draggable" } }, + { + "name": "drupal/jquery_ui_menu", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/jquery_ui_menu.git", + "reference": "2.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/jquery_ui_menu-2.0.0.zip", + "reference": "2.0.0", + "shasum": "5e1b56bf457669c7779a81784f49da63e3956854" + }, + "require": { + "drupal/core": "^9.2 || ^10", + "drupal/jquery_ui": "^1.6" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0", + "datestamp": "1670871546", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "bnjmnm", + "homepage": "https://www.drupal.org/user/2369194" + }, + { + "name": "lauriii", + "homepage": "https://www.drupal.org/user/1078742" + }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + }, + { + "name": "phenaproxima", + "homepage": "https://www.drupal.org/user/205645" + }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" + }, + { + "name": "zrpnr", + "homepage": "https://www.drupal.org/user/1448368" + } + ], + "description": "Provides jQuery UI Menu library.", + "homepage": "https://www.drupal.org/project/jquery_ui_menu", + "support": { + "source": "https://git.drupalcode.org/project/jquery_ui_menu" + } + }, { "name": "drupal/jquery_ui_slider", "version": "1.1.0", @@ -10602,27 +10667,27 @@ }, { "name": "drupal/selective_better_exposed_filters", - "version": "2.0.0-beta6", + "version": "3.0.0-beta1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/selective_better_exposed_filters.git", - "reference": "8.x-2.0-beta6" + "reference": "3.0.0-beta1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/selective_better_exposed_filters-8.x-2.0-beta6.zip", - "reference": "8.x-2.0-beta6", - "shasum": "66e5606a40a88d57fa017e786a74de6fed190989" + "url": "https://ftp.drupal.org/files/projects/selective_better_exposed_filters-3.0.0-beta1.zip", + "reference": "3.0.0-beta1", + "shasum": "8aa0be38f499a9b2e55aec7aacba9a7e92199ecf" }, "require": { - "drupal/better_exposed_filters": "^4.0 || ^5.0", - "drupal/core": "^8 || ^9" + "drupal/better_exposed_filters": "^4.0 || ^5.0 || ^6.0", + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta6", - "datestamp": "1595929214", + "version": "3.0.0-beta1", + "datestamp": "1671917757", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -11130,29 +11195,29 @@ }, { "name": "drupal/spamspan", - "version": "1.3.0", + "version": "3.0.0-beta2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/spamspan.git", - "reference": "8.x-1.3" + "reference": "3.0.0-beta2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/spamspan-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "fa3a4b8b18bcf0c51b740d0b3697d097305ad385" + "url": "https://ftp.drupal.org/files/projects/spamspan-3.0.0-beta2.zip", + "reference": "3.0.0-beta2", + "shasum": "697de9e59c92d68efd24e75d096218e311d05cdb" }, "require": { - "drupal/core": "~8.1 || ^9" + "drupal/core": "^9.5 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1663789807", + "version": "3.0.0-beta2", + "datestamp": "1671314184", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." } } }, @@ -12398,46 +12463,45 @@ }, { "name": "drupal/webform", - "version": "6.1.4", + "version": "6.2.0-beta5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/webform.git", - "reference": "6.1.4" + "reference": "6.2.0-beta5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/webform-6.1.4.zip", - "reference": "6.1.4", - "shasum": "b1c27c2a210670b6d149cdd92cbb37100b19cf64" + "url": "https://ftp.drupal.org/files/projects/webform-6.2.0-beta5.zip", + "reference": "6.2.0-beta5", + "shasum": "db1e05e7dc841b52b5721e82c5ad9f8aa2583c61" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.4 || ^10" }, "require-dev": { "drupal/address": "~1.0", + "drupal/bartik": "~1.0", "drupal/bootstrap": "~3.0", "drupal/captcha": "~1.0", "drupal/chosen": "~3.0", - "drupal/clientside_validation": "*", + "drupal/ckeditor": "~1.0", + "drupal/clientside_validation": "~4.0", "drupal/clientside_validation_jquery": "*", - "drupal/devel": "*", + "drupal/devel": "~5.0", "drupal/entity": "~1.0", - "drupal/entity_print": "*", - "drupal/gnode": "*", - "drupal/group": "*", + "drupal/entity_print": "~2.0", + "drupal/hal": "1 - 2", "drupal/jquery_ui": "~1.0", - "drupal/jquery_ui_checkboxradio": "*", + "drupal/jquery_ui_checkboxradio": "~2.0", "drupal/jquery_ui_datepicker": "~1.0", - "drupal/lingotek": "~3.0", + "drupal/lingotek": "~4.0", "drupal/mailsystem": "~4.0", "drupal/paragraphs": "~1.0", "drupal/select2": "~1.0", + "drupal/seven": "~1.0", "drupal/smtp": "~1.0", - "drupal/styleguide": "~2.0", - "drupal/telephone_validation": "~2.0", - "drupal/token": "*", + "drupal/token": "~1.0", "drupal/variationcache": "~1.0", - "drupal/webform-webform_group": "*", "drupal/webform_access": "*", "drupal/webform_attachment": "*", "drupal/webform_clientside_validation": "*", @@ -12456,16 +12520,16 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.4", - "datestamp": "1673535467", + "version": "6.2.0-beta5", + "datestamp": "1673535773", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." } }, "drush": { "services": { - "drush.services.yml": "^9 || ^10" + "drush.services.yml": ">=9" } } }, @@ -12508,27 +12572,27 @@ }, { "name": "drupal/webp", - "version": "1.0.0-beta6", + "version": "1.0.0-beta7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/webp.git", - "reference": "8.x-1.0-beta6" + "reference": "8.x-1.0-beta7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/webp-8.x-1.0-beta6.zip", - "reference": "8.x-1.0-beta6", - "shasum": "8e8edd2f4a407c41724046a09b612c5b9a20f637" + "url": "https://ftp.drupal.org/files/projects/webp-8.x-1.0-beta7.zip", + "reference": "8.x-1.0-beta7", + "shasum": "121b2477c1ba7248c9ab0e435b2802a5e5542c70" }, "require": { - "drupal/core": "^8 || ^9", + "drupal/core": "^8 || ^9 || ^10", "ext-gd": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-beta6", - "datestamp": "1642191512", + "version": "8.x-1.0-beta7", + "datestamp": "1680802363", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -12542,13 +12606,17 @@ "authors": [ { "name": "Bart Vanhoutte", - "homepage": "https://www.drupal.org/user/1133754", + "homepage": "https://www.drupal.org/user/145609", "email": "bart@croquemonsieur.be", "role": "Maintainer" }, { - "name": "alexmoreno", - "homepage": "https://www.drupal.org/user/145609" + "name": "Bart Vanhoutte", + "homepage": "https://www.drupal.org/user/1133754" + }, + { + "name": "mandclu", + "homepage": "https://www.drupal.org/user/52136" } ], "description": "Generates WebP copies of image style derivatives.", @@ -17948,6 +18016,35 @@ }, "time": "2020-01-30T12:17:27+00:00" }, + { + "name": "su-sws/ckeditor5_plugins", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/SU-SWS/ckeditor5_plugins.git", + "reference": "44ee2bed3f4eae749cb271fe85637bcd9d087437" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SU-SWS/ckeditor5_plugins/zipball/44ee2bed3f4eae749cb271fe85637bcd9d087437", + "reference": "44ee2bed3f4eae749cb271fe85637bcd9d087437", + "shasum": "" + }, + "require": { + "drupal/core": "^9.5 || ^10.0" + }, + "type": "drupal-custom-module", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0-or-later" + ], + "description": "Drupal CKEditor5 Plugin extensions", + "support": { + "issues": "https://github.com/SU-SWS/ckeditor5_plugins/issues", + "source": "https://github.com/SU-SWS/ckeditor5_plugins/tree/1.0.0" + }, + "time": "2023-04-06T17:10:14+00:00" + }, { "name": "su-sws/nobots", "version": "8.2.1", @@ -24407,6 +24504,81 @@ "source": "https://git.drupalcode.org/project/devel_php" } }, + { + "name": "drupal/upgrade_status", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/upgrade_status.git", + "reference": "4.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/upgrade_status-4.0.0.zip", + "reference": "4.0.0", + "shasum": "013afdb46a03c9db0119cb1ce60ca49631d64368" + }, + "require": { + "drupal/core": "^9 || ^10", + "mathieuviossat/arraytotexttable": "~1.0.0", + "mglaman/phpstan-drupal": "^1.0.0", + "nikic/php-parser": "^4.0.0", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "symfony/process": "^3.4|^4.0|^5.0|^6.0", + "webflo/drupal-finder": "^1.2" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "4.0.0", + "datestamp": "1678815090", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "colan", + "homepage": "https://www.drupal.org/user/58704" + }, + { + "name": "Gábor Hojtsy", + "homepage": "https://www.drupal.org/user/4166" + }, + { + "name": "herczogzoltan", + "homepage": "https://www.drupal.org/user/3528391" + }, + { + "name": "sun", + "homepage": "https://www.drupal.org/user/54136" + }, + { + "name": "webchick", + "homepage": "https://www.drupal.org/user/24967" + }, + { + "name": "xjm", + "homepage": "https://www.drupal.org/user/65776" + } + ], + "description": "Review Drupal major upgrade readiness of the environment and components of the site.", + "homepage": "http://drupal.org/project/upgrade_status", + "support": { + "source": "https://git.drupalcode.org/project/upgrade_status" + } + }, { "name": "easyrdf/easyrdf", "version": "1.1.1", @@ -24675,6 +24847,156 @@ }, "time": "2022-10-28T13:30:35+00:00" }, + { + "name": "laminas/laminas-servicemanager", + "version": "3.20.0", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-servicemanager.git", + "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", + "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", + "shasum": "" + }, + "require": { + "laminas/laminas-stdlib": "^3.2.1", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "psr/container": "^1.0" + }, + "conflict": { + "ext-psr": "*", + "laminas/laminas-code": "<3.3.1", + "zendframework/zend-code": "<3.3.1", + "zendframework/zend-servicemanager": "*" + }, + "provide": { + "psr/container-implementation": "^1.0" + }, + "replace": { + "container-interop/container-interop": "^1.2.0" + }, + "require-dev": { + "composer/package-versions-deprecated": "^1.11.99.5", + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-container-config-test": "^0.8", + "laminas/laminas-dependency-plugin": "^2.2", + "mikey179/vfsstream": "^1.6.11@alpha", + "ocramius/proxy-manager": "^2.14.1", + "phpbench/phpbench": "^1.2.7", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" + }, + "suggest": { + "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" + }, + "bin": [ + "bin/generate-deps-for-config-factory", + "bin/generate-factory-for-class" + ], + "type": "library", + "autoload": { + "files": [ + "src/autoload.php" + ], + "psr-4": { + "Laminas\\ServiceManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Factory-Driven Dependency Injection Container", + "homepage": "https://laminas.dev", + "keywords": [ + "PSR-11", + "dependency-injection", + "di", + "dic", + "laminas", + "service-manager", + "servicemanager" + ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-servicemanager/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-servicemanager/issues", + "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom", + "source": "https://github.com/laminas/laminas-servicemanager" + }, + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2022-12-01T17:03:38+00:00" + }, + { + "name": "laminas/laminas-text", + "version": "2.10.0", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-text.git", + "reference": "40f7acdb284d41553d32db811e704d6e15e415b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-text/zipball/40f7acdb284d41553d32db811e704d6e15e415b4", + "reference": "40f7acdb284d41553d32db811e704d6e15e415b4", + "shasum": "" + }, + "require": { + "laminas/laminas-servicemanager": "^3.19.0", + "laminas/laminas-stdlib": "^3.7.1", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "conflict": { + "zendframework/zend-text": "*" + }, + "require-dev": { + "laminas/laminas-coding-standard": "~2.4.0", + "phpunit/phpunit": "^9.5", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Laminas\\Text\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Create FIGlets and text-based tables", + "homepage": "https://laminas.dev", + "keywords": [ + "laminas", + "text" + ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-text/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-text/issues", + "rss": "https://github.com/laminas/laminas-text/releases.atom", + "source": "https://github.com/laminas/laminas-text" + }, + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2022-12-11T15:36:27+00:00" + }, { "name": "league/html-to-markdown", "version": "5.1.0", @@ -24834,6 +25156,161 @@ }, "time": "2021-12-22T16:42:49+00:00" }, + { + "name": "mathieuviossat/arraytotexttable", + "version": "v1.0.9", + "source": { + "type": "git", + "url": "https://github.com/viossat/arraytotexttable.git", + "reference": "518ec338fe62e92c064a9d3d3bc8c64fb6e77d1c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/viossat/arraytotexttable/zipball/518ec338fe62e92c064a9d3d3bc8c64fb6e77d1c", + "reference": "518ec338fe62e92c064a9d3d3bc8c64fb6e77d1c", + "shasum": "" + }, + "require": { + "laminas/laminas-text": "^2.9", + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "MathieuViossat\\Util\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mathieu Viossat", + "email": "mathieu@viossat.fr", + "homepage": "https://viossat.fr" + } + ], + "description": "Display arrays in terminal", + "homepage": "https://github.com/viossat/arraytotexttable", + "keywords": [ + "array", + "ascii", + "table", + "terminal", + "text", + "unicode" + ], + "support": { + "issues": "https://github.com/viossat/arraytotexttable/issues", + "source": "https://github.com/viossat/arraytotexttable/tree/v1.0.9" + }, + "time": "2022-08-30T15:33:10+00:00" + }, + { + "name": "mglaman/phpstan-drupal", + "version": "1.1.29", + "source": { + "type": "git", + "url": "https://github.com/mglaman/phpstan-drupal.git", + "reference": "e6f6191c53b159013fcbd186d7f85511f3f96ff8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/e6f6191c53b159013fcbd186d7f85511f3f96ff8", + "reference": "e6f6191c53b159013fcbd186d7f85511f3f96ff8", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "phpstan/phpstan": "^1.9.0", + "symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0", + "symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0", + "webflo/drupal-finder": "^1.2" + }, + "require-dev": { + "behat/mink": "^1.8", + "composer/installers": "^1.9", + "drupal/core-recommended": "^8.8@alpha || ^9.0", + "drush/drush": "^9.6 || ^10.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9", + "slevomat/coding-standard": "^7.1", + "squizlabs/php_codesniffer": "^3.3", + "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.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": { + "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" + ] + }, + "phpstan": { + "includes": [ + "extension.neon", + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "mglaman\\PHPStanDrupal\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Glaman", + "email": "nmd.matt@gmail.com" + } + ], + "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.1.29" + }, + "funding": [ + { + "url": "https://github.com/mglaman", + "type": "github" + }, + { + "url": "https://opencollective.com/phpstan-drupal", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/mglaman/phpstan-drupal", + "type": "tidelift" + } + ], + "time": "2023-02-08T21:44:03+00:00" + }, { "name": "mikey179/vfsstream", "version": "v1.6.11", @@ -25453,6 +25930,116 @@ }, "time": "2023-04-04T11:11:22+00:00" }, + { + "name": "phpstan/phpstan", + "version": "1.10.11", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8aa62e6ea8b58ffb650e02940e55a788cbc3fe21", + "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2023-04-04T19:17:42+00:00" + }, + { + "name": "phpstan/phpstan-deprecation-rules", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", + "reference": "a22b36b955a2e9a3d39fe533b6c1bb5359f9c319" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/a22b36b955a2e9a3d39fe533b6c1bb5359f9c319", + "reference": "a22b36b955a2e9a3d39fe533b6c1bb5359f9c319", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.10" + }, + "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" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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.3" + }, + "time": "2023-03-17T07:50:08+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.26", @@ -27773,8 +28360,10 @@ "drupal/auto_entitylabel": 10, "drupal/better_normalizers": 10, "drupal/block_field": 5, + "drupal/bricks": 15, "drupal/conditional_fields": 15, "drupal/config_readonly": 10, + "drupal/config_update": 15, "drupal/confirm_leave": 10, "drupal/content_access": 15, "drupal/eck": 10, @@ -27782,6 +28371,7 @@ "drupal/entity_reference_exposed_filters": 15, "drupal/fast_404": 15, "drupal/field_validation": 10, + "drupal/hook_event_dispatcher": 15, "drupal/linkit": 10, "drupal/markup": 10, "drupal/masquerade": 10, @@ -27794,10 +28384,12 @@ "drupal/paragraphs_edit": 15, "drupal/selective_better_exposed_filters": 10, "drupal/shortcut_menu": 10, + "drupal/spamspan": 10, "drupal/ui_patterns_field_variants": 20, "drupal/viewfield": 10, "drupal/views_field_view": 10, "drupal/views_ical": 15, + "drupal/webform": 10, "drupal/webp": 10, "onlyextart/colorbox": 20, "su-sws/stanford_basic": 20, @@ -27809,5 +28401,5 @@ "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/config/default/config_split.config_split.local.yml b/config/default/config_split.config_split.local.yml index e4e3bc2fed..cc2db870ae 100644 --- a/config/default/config_split.config_split.local.yml +++ b/config/default/config_split.config_split.local.yml @@ -16,6 +16,7 @@ module: config_inspector: 0 devel_php: 0 update: 0 + upgrade_status: 0 theme: { } blacklist: { } graylist: diff --git a/config/default/editor.editor.webform_default.yml b/config/default/editor.editor.webform_default.yml new file mode 100644 index 0000000000..a550248952 --- /dev/null +++ b/config/default/editor.editor.webform_default.yml @@ -0,0 +1,52 @@ +langcode: en +status: true +dependencies: + config: + - filter.format.webform_default + module: + - ckeditor + - webform +format: webform_default +editor: ckeditor +settings: + toolbar: + rows: + - + - + name: Formatting + items: + - Format + - Bold + - Italic + - Superscript + - Subscript + - + name: Media + items: + - SpecialChar + - ImceImage + - + name: Linking + items: + - DrupalLink + - DrupalUnlink + - + name: Lists + items: + - NumberedList + - BulletedList + - + name: Indentation + items: + - Outdent + - Indent + - + name: 'Block Formatting' + items: + - Blockquote + - + name: Tools + items: + - Source + - Maximize + plugins: { } diff --git a/config/default/filter.format.webform_default.yml b/config/default/filter.format.webform_default.yml new file mode 100644 index 0000000000..919e2f2fed --- /dev/null +++ b/config/default/filter.format.webform_default.yml @@ -0,0 +1,11 @@ +langcode: en +status: true +dependencies: + module: + - webform +name: 'Webform (Default) - DO NOT EDIT' +format: webform_default +weight: 100 +roles: + - authenticated +filters: { } diff --git a/config/default/webform.settings.yml b/config/default/webform.settings.yml index e990505842..3ccf807074 100644 --- a/config/default/webform.settings.yml +++ b/config/default/webform.settings.yml @@ -156,8 +156,6 @@ element: default_empty_option: true default_empty_option_required: '' default_empty_option_optional: '' - default_algolia_places_app_id: '' - default_algolia_places_api_key: '' excluded_elements: password: password password_confirm: password_confirm @@ -165,8 +163,8 @@ element: default_google_maps_api_key: '' html_editor: disabled: false - element_format: '' - mail_format: '' + element_format: webform_default + mail_format: webform_default tidy: true make_unused_managed_files_temporary: true format: '' diff --git a/config/envs/local/upgrade_status.settings.yml b/config/envs/local/upgrade_status.settings.yml new file mode 100644 index 0000000000..c5e874415b --- /dev/null +++ b/config/envs/local/upgrade_status.settings.yml @@ -0,0 +1,3 @@ +_core: + default_config_hash: BqkUHiXXGvu2L7NR_nblxtP6f03MdD16XSMWwVM0QEc +paths_per_scan: 30 diff --git a/docroot/modules/humsci/hs_actions/hs_actions.info.yml b/docroot/modules/humsci/hs_actions/hs_actions.info.yml index 36374d8947..de6eca9a49 100644 --- a/docroot/modules/humsci/hs_actions/hs_actions.info.yml +++ b/docroot/modules/humsci/hs_actions/hs_actions.info.yml @@ -1,7 +1,7 @@ name: 'H&S Actions' type: module description: 'Provides action plugins to work with VBO module.' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 version: 8.2.7 package: 'Humanities & Sciences' dependencies: diff --git a/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml b/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml index d97ee6e850..0190ecda00 100755 --- a/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml +++ b/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml @@ -1,6 +1,6 @@ name: 'H&S Basic Page' description: 'Basic Page content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml b/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml index d6019567e8..e8af24ef5f 100755 --- a/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml +++ b/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml @@ -1,6 +1,6 @@ name: 'H&S Basic Page Display' description: 'Basic Page content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml b/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml index 3ec9b17843..fa05a6232a 100644 --- a/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml +++ b/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml @@ -1,7 +1,7 @@ name: 'H&S Blocks' type: module description: 'Custom blocks for Humsci' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 version: 8.2.7 package: 'Humanities & Sciences' dependencies: diff --git a/docroot/modules/humsci/hs_blocks/hs_blocks.libraries.yml b/docroot/modules/humsci/hs_blocks/hs_blocks.libraries.yml index 815a5459ef..dda0d959eb 100644 --- a/docroot/modules/humsci/hs_blocks/hs_blocks.libraries.yml +++ b/docroot/modules/humsci/hs_blocks/hs_blocks.libraries.yml @@ -13,7 +13,8 @@ group_block.admin: js: js/hs_blocks.group_block.admin.js: {} dependencies: - - core/jquery.once + - core/jquery + - core/once back_to_top: version: VERSION css: diff --git a/docroot/modules/humsci/hs_blocks/js/hs_blocks.group_block.admin.js b/docroot/modules/humsci/hs_blocks/js/hs_blocks.group_block.admin.js index 51cc4b10f3..0704cd5cda 100644 --- a/docroot/modules/humsci/hs_blocks/js/hs_blocks.group_block.admin.js +++ b/docroot/modules/humsci/hs_blocks/js/hs_blocks.group_block.admin.js @@ -1,17 +1,17 @@ + (function ($, Drupal, once) { Drupal.behaviors.hsGroupBlocksAdmin = { - attach: function (context, settings) { - const previewChanges = $('[name=toggle_content_preview]'); + attach: function (context) { + const previewChanges = $('[name=toggle_content_preview]', context); if (!previewChanges.is(':checked')) { $('[data-layout-content-preview-placeholder-label] > [data-layout-content-preview-placeholder-label]').show(); } - previewChanges.once('group-blocks').on('change', function () { + $(once('group-blocks', '[name=toggle_content_preview]', context)).on('change', function () { if (!previewChanges.is(':checked')) { $('[data-layout-content-preview-placeholder-label] > [data-layout-content-preview-placeholder-label]').show(); } - }) - + }); } }; })(jQuery, Drupal, once); diff --git a/docroot/modules/humsci/hs_blocks/src/Controller/HsChooseBlockController.php b/docroot/modules/humsci/hs_blocks/src/Controller/HsChooseBlockController.php index 250e98fe6c..87cfcd01fb 100644 --- a/docroot/modules/humsci/hs_blocks/src/Controller/HsChooseBlockController.php +++ b/docroot/modules/humsci/hs_blocks/src/Controller/HsChooseBlockController.php @@ -27,7 +27,7 @@ public function build(SectionStorageInterface $section_storage, $delta, $group) $build['#type'] = 'container'; $build['#attributes']['class'][] = 'block-categories'; - $definitions = $this->blockManager->getFilteredDefinitions('layout_builder', $this->getAvailableContexts($section_storage), [ + $definitions = $this->blockManager->getFilteredDefinitions('layout_builder', $this->getPopulatedContexts($section_storage), [ 'section_storage' => $section_storage, 'delta' => $delta, 'group' => $group, diff --git a/docroot/modules/humsci/hs_blocks/src/Plugin/Block/GroupBlock.php b/docroot/modules/humsci/hs_blocks/src/Plugin/Block/GroupBlock.php index 9b51bfd5c2..5d01635084 100644 --- a/docroot/modules/humsci/hs_blocks/src/Plugin/Block/GroupBlock.php +++ b/docroot/modules/humsci/hs_blocks/src/Plugin/Block/GroupBlock.php @@ -14,6 +14,7 @@ use Drupal\Core\Plugin\Context\ContextDefinition; use Drupal\Core\Plugin\Context\ContextRepositoryInterface; use Drupal\Core\PrivateKey; +use Drupal\Core\Render\RendererInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Site\Settings; use Drupal\Core\Url; @@ -70,6 +71,13 @@ class GroupBlock extends BlockBase implements ContainerFactoryPluginInterface, R */ protected $privateKey; + /** + * Renderer service. + * + * @var \Drupal\Core\Render\RendererInterface + */ + protected $renderer; + /** * Constructs a new InlineBlock. * @@ -85,13 +93,16 @@ class GroupBlock extends BlockBase implements ContainerFactoryPluginInterface, R * Context repository service. * @param \Drupal\Component\Uuid\UuidInterface $uuid_generator * Uuid Service. + * @param \Drupal\Core\Render\RendererInterface $renderer + * Rendering service. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, RequestStack $request_stack, ContextRepositoryInterface $context_repo, UuidInterface $uuid_generator, PrivateKey $private_key) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, RequestStack $request_stack, ContextRepositoryInterface $context_repo, UuidInterface $uuid_generator, PrivateKey $private_key, RendererInterface $renderer) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->requestStack = $request_stack; $this->contextRepository = $context_repo; $this->uuidGenerator = $uuid_generator; $this->privateKey = $private_key->get(); + $this->renderer = $renderer; } /** @@ -105,7 +116,8 @@ public static function create(ContainerInterface $container, array $configuratio $container->get('request_stack'), $container->get('context.repository'), $container->get('uuid'), - $container->get('private_key') + $container->get('private_key'), + $container->get('renderer') ); } @@ -127,7 +139,7 @@ protected function blockAccess(AccountInterface $account) { $components = $this->getComponents(); // This prevents the block label from displaying if there are no contents. - if (empty(render($components))) { + if (empty($this->renderer->renderPlain($components))) { return AccessResult::forbidden(); } return parent::blockAccess($account); diff --git a/docroot/modules/humsci/hs_capx/hs_capx.info.yml b/docroot/modules/humsci/hs_capx/hs_capx.info.yml index 661a1b380d..682fd12619 100644 --- a/docroot/modules/humsci/hs_capx/hs_capx.info.yml +++ b/docroot/modules/humsci/hs_capx/hs_capx.info.yml @@ -1,6 +1,6 @@ name: 'H&S CAPx' description: 'Simple form to change the workgroup or organization for CAPx importer' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php b/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php index 30c0861a20..8dce454211 100644 --- a/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php +++ b/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php @@ -238,7 +238,8 @@ protected function invalidateMigrationHashes() { } $entity_query = $this->entityTypeManager->getStorage('node') - ->getQuery('OR'); + ->getQuery('OR') + ->accessCheck(FALSE); // Find all node ids that are tagged with the fields. This allows us to only // invalidate the hashes that are applicable. diff --git a/docroot/modules/humsci/hs_capx/tests/src/Unit/CapxTest.php b/docroot/modules/humsci/hs_capx/tests/src/Unit/CapxTest.php index 10e34fa8a6..456d1366d8 100644 --- a/docroot/modules/humsci/hs_capx/tests/src/Unit/CapxTest.php +++ b/docroot/modules/humsci/hs_capx/tests/src/Unit/CapxTest.php @@ -5,7 +5,7 @@ use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ImmutableConfig; -use Drupal\Core\Database\Driver\mysql\Connection; +use Drupal\Core\Database\Connection as DatabaseConnection; use Drupal\Core\Database\Query\Merge; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\Entity\EntityStorageBase; @@ -53,7 +53,7 @@ protected function setUp(): void { $this->cache = $this->createMock(CacheBackendInterface::class); - $database = $this->createMock(Connection::class); + $database = $this->createMock(DatabaseConnection::class); $merge = $this->createMock(Merge::class); $merge->method('fields')->will($this->returnValue($merge)); $merge->method('key')->will($this->returnValue($merge)); diff --git a/docroot/modules/humsci/hs_capx/tests/src/Unit/Plugin/migrate/process/CapxTaggingTest.php b/docroot/modules/humsci/hs_capx/tests/src/Unit/Plugin/migrate/process/CapxTaggingTest.php index 00683a93b2..4592859f34 100644 --- a/docroot/modules/humsci/hs_capx/tests/src/Unit/Plugin/migrate/process/CapxTaggingTest.php +++ b/docroot/modules/humsci/hs_capx/tests/src/Unit/Plugin/migrate/process/CapxTaggingTest.php @@ -60,7 +60,7 @@ public function testPluginTransformWithoutImporter() { // Urls do match. $tranformed_value = $plugin->transform(NULL, $migrate_executable, $row, $destination_property); - $this->assertArrayEquals([1, 2, 3], $tranformed_value); + $this->assertEquals([1, 2, 3], $tranformed_value); } /** diff --git a/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml b/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml index 399e57a427..a244aaebdf 100644 --- a/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml +++ b/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml @@ -1,6 +1,6 @@ name: 'H&S Config Prefix' type: module description: 'Prefix any configuration entities with a specified string' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml b/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml index d150e045f8..76ea3a4d9e 100644 --- a/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml +++ b/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml @@ -1,6 +1,6 @@ name: 'H&S Config Read Only' description: 'Modify the Config Read Only to blacklist specific config' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_courses/hs_courses.info.yml b/docroot/modules/humsci/hs_courses/hs_courses.info.yml index 3a72ca4b33..fde3da7377 100644 --- a/docroot/modules/humsci/hs_courses/hs_courses.info.yml +++ b/docroot/modules/humsci/hs_courses/hs_courses.info.yml @@ -1,7 +1,7 @@ name: 'H&S Courses' type: module description: 'Courses content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 version: 8.2.7 package: 'Humanities & Sciences' dependencies: diff --git a/docroot/modules/humsci/hs_courses/modules/hs_courses_importer/hs_courses_importer.info.yml b/docroot/modules/humsci/hs_courses/modules/hs_courses_importer/hs_courses_importer.info.yml index c9a91e080f..43a4f3d906 100644 --- a/docroot/modules/humsci/hs_courses/modules/hs_courses_importer/hs_courses_importer.info.yml +++ b/docroot/modules/humsci/hs_courses/modules/hs_courses_importer/hs_courses_importer.info.yml @@ -1,7 +1,7 @@ name: 'H&S Courses Importer' type: module description: 'Courses Migration Importer' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 package: 'Humanities & Sciences' dependencies: - hs_courses diff --git a/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml b/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml index 63522f091c..98174ba222 100644 --- a/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml +++ b/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml @@ -1,6 +1,6 @@ name: 'H&S Event Series' description: 'Event Series content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml b/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml index 3c9b7ebd17..61d50512fa 100644 --- a/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml +++ b/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml @@ -1,6 +1,6 @@ name: 'H&S Event Series Display' description: 'Event Series content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_events/hs_events.info.yml b/docroot/modules/humsci/hs_events/hs_events.info.yml index d20039766c..4acd62120b 100755 --- a/docroot/modules/humsci/hs_events/hs_events.info.yml +++ b/docroot/modules/humsci/hs_events/hs_events.info.yml @@ -1,6 +1,6 @@ name: 'H&S Events' description: 'Events content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_events/hs_events.install b/docroot/modules/humsci/hs_events/hs_events.install index b6ccf7843c..4276702d85 100644 --- a/docroot/modules/humsci/hs_events/hs_events.install +++ b/docroot/modules/humsci/hs_events/hs_events.install @@ -27,129 +27,8 @@ function hs_events_install() { } /** - * Manually write the speaker configs to change field type. + * Implements hook_update_last_removed(). */ -function hs_events_update_8001() { - // Manually change the speaker field storage. - $source = new FileStorage('../config/default'); - /** @var \Drupal\Core\Config\CachedStorage $config_storage */ - $config_storage = \Drupal::service('config.storage'); - $name = 'field.storage.node.field_hs_event_speaker'; - $config_storage->write($name, $source->read($name)); - $name = 'field.field.node.hs_event.field_hs_event_speaker'; - $config_storage->write($name, $source->read($name)); - drupal_flush_all_caches(); - - $definitions = \Drupal::database()->select('key_value', 'k') - ->fields('k', ['value']) - ->condition('name', 'node.field_storage_definitions') - ->execute()->fetchField(); - $definitions = unserialize($definitions); - $field_storage = FieldStorageConfig::load('node.field_hs_event_speaker'); - $definitions['field_hs_event_speaker'] = $field_storage; - \Drupal::database() - ->update('key_value') - ->fields(['value' => serialize($definitions)]) - ->condition('name', 'node.field_storage_definitions') - ->execute(); - - $map = \Drupal::database()->select('key_value', 'k') - ->fields('k', ['value']) - ->condition('collection', 'entity.definitions.bundle_field_map') - ->condition('name', 'node') - ->execute()->fetchField(); - $map = unserialize($map); - $map['field_hs_event_speaker']['type'] = 'entity_reference'; - \Drupal::database() - ->update('key_value') - ->fields(['value' => serialize($map)]) - ->condition('collection', 'entity.definitions.bundle_field_map') - ->condition('name', 'node') - ->execute(); - - Cache::invalidateTags(['entity_types']); -} - -/** - * Rebuild entity usage statistics for event speakers. - * - * @see \Drupal\entity_usage\Form\BatchUpdateForm::updateSourcesBatchWorker() - */ -function hs_events_update_8002() { - // Flush caches so we clear up any field cacheing from the previous update. - drupal_flush_all_caches(); - $entity_storage = \Drupal::entityTypeManager()->getStorage('node'); - - $nids = \Drupal::entityQuery('node') - ->condition('type', 'hs_event') - ->execute(); - $events = Node::loadMultiple($nids); - - foreach ($events as $entity) { - // Track all revisions and translations of the source entity. Sources - // are tracked as if they were new entities. - $result = $entity_storage->getQuery()->allRevisions() - ->condition($entity->getEntityType()->getKey('id'), $entity->id()) - ->sort($entity->getEntityType()->getKey('revision'), 'DESC') - ->execute(); - $revision_ids = array_keys($result); - - foreach ($revision_ids as $revision_id) { - /** @var \Drupal\Core\Entity\EntityInterface $entity_revision */ - if (!$entity_revision = $entity_storage->loadRevision($revision_id)) { - continue; - } - - \Drupal::service('entity_usage.entity_update_manager') - ->trackUpdateOnCreation($entity_revision); - } - - } - - // Now that we have tracked the event speakers, lets clean up the ECK - // entities that are not being used anywhere. - _he_field_helpers_clean_eck(); -} - -/** - * Fix speaker field configuration. - */ -function hs_events_update_8003() { - $tables = [ - 'node__field_hs_event_speaker', - 'node_revision__field_hs_event_speaker', - ]; - $fields = [ - 'field_hs_event_speaker_depth', - 'field_hs_event_speaker_options', - ]; - $field_data = []; - // Remove the unwanted columns from the database. - foreach ($tables as $table) { - foreach ($fields as $field) { - if (\Drupal::database()->schema()->fieldExists($table, $field)) { - \Drupal::database()->schema()->dropField($table, $field); - } - } - $query = \Drupal::database()->select($table, 't')->fields('t')->execute(); - - // Gather all the field data to be inserted after we rebuild the field - // storage. - while ($row = $query->fetchAssoc()) { - $field_data[$table][] = $row; - } - \Drupal::database()->truncate($table)->execute(); - } - - // Resave the field so it resets the schema in the field data tables. - $field = FieldStorageConfig::load('node.field_hs_event_speaker'); - $field->save(); - - // Insert all the old data back into the database. - foreach ($field_data as $table => $rows) { - foreach ($rows as $row) { - \Drupal::database()->insert($table)->fields($row)->execute(); - } - } - +function hs_events_update_last_removed() { + return '8003'; } diff --git a/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml b/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml index f538cf3f3e..bb7103611b 100644 --- a/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml +++ b/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml @@ -1,6 +1,6 @@ name: 'H&S Events Display' description: 'Events content type' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml b/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml index a16e5d7895..336138c3f6 100644 --- a/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml +++ b/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml @@ -1,6 +1,6 @@ name: 'H&S Events Importer' description: 'Migrate importer for stanford events.' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 type: module version: 8.2.7 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml index a16574955b..ea0b83b122 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml @@ -1,7 +1,7 @@ name: 'H&S Field Helpers' type: module description: 'Additional field widgets and display formatters' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.4 || ^10 version: 8.2.7 package: 'Humanities & Sciences' dependencies: diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module index 45959670ec..235ec0801a 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module @@ -204,6 +204,7 @@ function hs_fields_helpers_cleanup_layout_builder(array &$variables) { * Pattern ID being used. */ function _hs_field_helpers_cleanup_pattern_regions(array &$pattern, $pattern_id) { + $renderer = \Drupal::service('renderer'); try { $pattern_definition = UiPatterns::getPatternDefinition($pattern_id); } catch (Exception $e) { @@ -212,7 +213,14 @@ function _hs_field_helpers_cleanup_pattern_regions(array &$pattern, $pattern_id) } foreach (array_keys($pattern_definition->getFieldsAsOptions()) as $region) { if (empty($pattern[$region]) || !is_array($pattern[$region]) || isset($pattern[$region]['#theme'])) { - $rendered = render($pattern[$region]); + + try { + $pattern_region = is_array($pattern[$region]) ? $pattern[$region] : (string) $pattern[$region]; + $rendered = $renderer->renderPlain($pattern_region); + } + catch (\Throwable $e) { + continue; + } // Remove all wrapper divs so we can check if the region actually has any // visible output. diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.services.yml b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.services.yml index c5017c48c7..4f79515bcf 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.services.yml +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.services.yml @@ -1,7 +1,7 @@ services: hs_field_helpers.event_subscriber: class: '\Drupal\hs_field_helpers\EventSubscriber\EventSubscriber' - arguments: ['@menu.active_trail', '@plugin.manager.menu.link'] + arguments: ['@menu.active_trail', '@plugin.manager.menu.link', '@renderer'] tags: - { name: 'event_subscriber' } hs_field_helpers.twig: diff --git a/docroot/modules/humsci/hs_field_helpers/src/EventSubscriber/EventSubscriber.php b/docroot/modules/humsci/hs_field_helpers/src/EventSubscriber/EventSubscriber.php index 0288aba246..1ee043b258 100644 --- a/docroot/modules/humsci/hs_field_helpers/src/EventSubscriber/EventSubscriber.php +++ b/docroot/modules/humsci/hs_field_helpers/src/EventSubscriber/EventSubscriber.php @@ -5,6 +5,7 @@ use Drupal\Core\Link; use Drupal\Core\Menu\MenuActiveTrailInterface; use Drupal\Core\Menu\MenuLinkManagerInterface; +use Drupal\Core\Render\RendererInterface; use Drupal\layout_builder\Event\SectionComponentBuildRenderArrayEvent; use Drupal\layout_builder\LayoutBuilderEvents; use Drupal\menu_block\Plugin\Block\MenuBlock; @@ -18,31 +19,17 @@ */ class EventSubscriber implements EventSubscriberInterface { - /** - * Active trail service. - * - * @var \Drupal\Core\Menu\MenuActiveTrailInterface - */ - protected $activeTrail; - - /** - * Menu link manager service. - * - * @var \Drupal\Core\Menu\MenuLinkManagerInterface - */ - protected $linkManager; - /** * EventSubscriber constructor. * - * @param \Drupal\Core\Menu\MenuActiveTrailInterface $active_trail + * @param \Drupal\Core\Menu\MenuActiveTrailInterface $activeTrail * Active trail service. - * @param \Drupal\Core\Menu\MenuLinkManagerInterface $link_manager + * @param \Drupal\Core\Menu\MenuLinkManagerInterface $linkManager * Menu link manager service. + * @param \Drupal\Core\Render\RendererInterface $renderer + * Rendering service. */ - public function __construct(MenuActiveTrailInterface $active_trail, MenuLinkManagerInterface $link_manager) { - $this->activeTrail = $active_trail; - $this->linkManager = $link_manager; + public function __construct(protected MenuActiveTrailInterface $activeTrail, protected MenuLinkManagerInterface $linkManager, protected RendererInterface $renderer) { } /** @@ -110,7 +97,7 @@ public function onLayoutBuilderRender(SectionComponentBuildRenderArrayEvent $eve * Rendered and clean markup. */ protected function getCleanRender(array $render_array) { - return trim(strip_tags(render($render_array), '