Merge pull request #69 from SU-SWS/release-5.2.0

Upstream and dependency updates
SU-SWS · Jun 20, 2024 · dee5c5e · dee5c5e
2 parents 41faf29 + 867510e
commit dee5c5e
Show file tree

Hide file tree

Showing 296 changed files with 56,949 additions and 69,156 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-# READY FOR REVIEW/NOT READY
+# NOT READY FOR REVIEW
 - (Edit the above to reflect status)
 
 # Summary
@@ -7,23 +7,52 @@
 # Review By (Date)
 - When does this need to be reviewed by?
 
-# Urgency
-- How critical is this PR?
+# Criticality
+- How critical is this PR on a 1-10 scale? See [Severity Assessment](https://stanfordits.atlassian.net/browse/D8CORE-1705).
+- E.g., it affects one site, or every site and product?
 
-# Steps to Test
+# Review Tasks
 
-1. Do this
-1. Then this
-2. Then this
+## Setup tasks and/or behavior to test
+
+1. Check out this branch
+2. Navigate to...
+3. Verify...
+
+## Front End Validation
+- [ ] Is the markup using the appropriate semantic tags and passes HTML validation?
+- [ ] Cross-browser testing has been performed?
+- [ ] Automated accessibility scans performed?
+- [ ] Manual accessibility tests performed?
+- [ ] Design is approved by @ user?
+
+## Backend / Functional Validation
+### Code
+- [ ] Are the naming conventions following our standards?
+- [ ] Does the code have sufficient inline comments?
+- [ ] Is there anything in this code that would be hidden or hard to discover through the UI?
+- [ ] Are there any [code smells](https://blog.codinghorror.com/code-smells/)?
+- [ ] Are tests provided? eg (unit, behat, or codeception)
+
+### Code security
+- [ ] Are all [forms properly sanitized](https://www.drupal.org/docs/8/security/drupal-8-sanitizing-output)?
+- [ ] Any obvious [security flaws or new areas for attack](https://www.drupal.org/docs/8/security)?
+
+## General
+- [ ] Is there anything included in this PR that is not related to the problem it is trying to solve?
+- [ ] Is the approach to the problem appropriate?
 
 # Affected Projects or Products
 - Does this PR impact any particular projects, products, or modules?
 
 # Associated Issues and/or People
-- JIRA ticket
+- JIRA ticket(s)
 - Other PRs
 - Any other contextual information that might be helpful (e.g., description of a bug that this PR fixes, new functionality that it adds, etc.)
 - Anyone who should be notified? (`@mention` them here)
 
-# See Also
-- [PR Checklist](https://gist.github.com/sherakama/0ba17601381e3adbe0cad566ad4d80a5)
+# Resources
+- [AMP Tool](https://stanford.levelaccess.net/index.php)
+- [Accessibility Manual Test Script](https://docs.google.com/document/d/1ZXJ9RIUNXsS674ow9j3qJ2g1OAkCjmqMXl0Gs8XHEPQ/edit?usp=sharing)
+- [HTML Validator](https://validator.w3.org/)
+- [Browserstack](https://live.browserstack.com/dashboard) and link to [Browserstack Credentials](https://asconfluence.stanford.edu/confluence/display/SWS/External+Account+Credentials)
diff --git a/composer.json b/composer.json
@@ -8,135 +8,6 @@
     },
     "require": {
         "php": ">=8.0",
-        "ext-imagick": "*",
-        "acquia/drupal-environment-detector": "^1.0",
-        "acquia/memcache-settings": "^1.2",
-        "citation-style-language/locales": "1.0.0",
-        "citation-style-language/styles-distribution": "1.0.0",
-        "composer/installers": ">=1.2",
-        "drupal/address": "^2.0",
-        "drupal/admin_toolbar": "^3.1",
-        "drupal/allowed_formats": "^3.0",
-        "drupal/auto_entitylabel": "^3.0@beta",
-        "drupal/block_content_permissions": "^1.8",
-        "drupal/change_labels": "^1.0",
-        "drupal/chosen": "^4.0",
-        "drupal/colorbox": "^2.0",
-        "drupal/components": "^3.0",
-        "drupal/conditional_fields": "^4.0",
-        "drupal/config_filter": "^2.0",
-        "drupal/config_ignore": "^3.0",
-        "drupal/config_pages": "^2.6",
-        "drupal/config_pages_overrides": "^2.0",
-        "drupal/config_readonly": "^1.0@beta",
-        "drupal/config_split": "^2.0",
-        "drupal/confirm_leave": "^1.0@beta",
-        "drupal/content_lock": "^2.2",
-        "drupal/core": "~10.2.0",
-        "drupal/cshs": "^4.0",
-        "drupal/default_content": "^2.0@alpha",
-        "drupal/diff": "^1.0@RC",
-        "drupal/display_field_copy": "^2.0.",
-        "drupal/domain_301_redirect": "^2.0",
-        "drupal/ds": "^3.3",
-        "drupal/editoria11y": "^2.0",
-        "drupal/element_class_formatter": "^2.0@beta",
-        "drupal/encrypt": "^3.0",
-        "drupal/environment_indicator": "^4.0",
-        "drupal/extlink": "^1.3",
-        "drupal/fast_404_generator": "^1.0",
-        "drupal/field_encrypt": "^3.0",
-        "drupal/field_formatter_class": "^1.5",
-        "drupal/field_group": "^3.0@rc",
-        "drupal/field_label": "^1.4",
-        "drupal/field_permissions": "^1.0@RC",
-        "drupal/field_validation": "^1.0-alpha",
-        "drupal/file_mdm": "^2.4 || ^3.0",
-        "drupal/flat_taxonomy": "^2.0",
-        "drupal/fontawesome": "^2.19",
-        "drupal/google_analytics": "^4.0",
-        "drupal/google_tag": "^2.0",
-        "drupal/graphql_compose": "^2.0",
-        "drupal/hook_event_dispatcher": "^4.0@beta",
-        "drupal/image_effects": "^3.2",
-        "drupal/imagecache_external": "^3.0",
-        "drupal/imagemagick": "^3.1",
-        "drupal/jquery_ui_draggable": "^2.0",
-        "drupal/jsonapi_extras": "^3.20",
-        "drupal/jsonapi_hypermedia": "^1.9",
-        "drupal/jsonapi_image_styles": "^3.0",
-        "drupal/jsonapi_menu_items": "^1.2",
-        "drupal/jsonapi_search_api": "^1.0@RC",
-        "drupal/jsonapi_views": "^1.1",
-        "drupal/key": "^1.15",
-        "drupal/layout_builder_modal": "^1.0",
-        "drupal/layout_builder_restrictions": "^2.2",
-        "drupal/layout_library": "^1.0-beta1",
-        "drupal/layout_paragraphs": "^2.0",
-        "drupal/link_attributes": "^2.0",
-        "drupal/link_title_formatter": "^2.0",
-        "drupal/linkit": "^6.0",
-        "drupal/markup": "^2.0",
-        "drupal/mathjax": "^4.0",
-        "drupal/memcache": "^2.5",
-        "drupal/menu_admin_per_menu": "^1.0",
-        "drupal/menu_block": "^1.10",
-        "drupal/menu_link_weight": "^2.0@alpha",
-        "drupal/metatag": "^2.0",
-        "drupal/name": "^1.0@RC",
-        "drupal/next": "^1.2",
-        "drupal/nobots": "^1.0",
-        "drupal/node_revision_delete": "^1.0@RC",
-        "drupal/oembed_lazyload": "^2.0",
-        "drupal/page_cache_query_ignore": "^2.2",
-        "drupal/page_manager": "^4.0@beta",
-        "drupal/paragraphs": "^1.11",
-        "drupal/paragraphs_edit": "^3.0",
-        "drupal/paranoia": "^1.0@alpha",
-        "drupal/path_redirect_import": "^2.0",
-        "drupal/pathauto": "^1.6",
-        "drupal/pdb": "2.0.0",
-        "drupal/printable": "^3.0",
-        "drupal/rabbit_hole": "^1.0@beta",
-        "drupal/real_aes": "^2.4",
-        "drupal/redirect": "^1.0-beta1",
-        "drupal/responsive_tables_filter": "^1.9",
-        "drupal/role_delegation": "^1.0@beta",
-        "drupal/scheduler": "^2.0",
-        "drupal/search_api": "^1.19",
-        "drupal/search_api_algolia": "^3.0@beta",
-        "drupal/seckit": "^2.0",
-        "drupal/shs": "^2.0@RC",
-        "drupal/smart_date": "^4.0",
-        "drupal/smart_trim": "^2.0",
-        "drupal/taxonomy_entity_index": "^1.8",
-        "drupal/taxonomy_menu": "^3.5",
-        "drupal/token_or": "^2.0",
-        "drupal/transliterate_filenames": "^2.0",
-        "drupal/ui_patterns": "^1.0",
-        "drupal/view_unpublished": "^1.0",
-        "drupal/viewfield": "^3.0@beta",
-        "drupal/views_block_filter_block": "^2.0@beta",
-        "drupal/views_bulk_edit": "^2.6",
-        "drupal/views_contextual_filters_or": "^1.3",
-        "drupal/views_custom_cache_tag": "^1.2",
-        "drupal/views_infinite_scroll": "^2.0",
-        "drupal/views_taxonomy_term_name_depth": "^7.0",
-        "drupal/webp": "^1.0@beta",
-        "drupal/xmlsitemap": "^1.0",
-        "harvesthq/chosen": "^1.8",
-        "onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7",
-        "sainsburys/guzzle-oauth2-plugin": "^3.0",
-        "seboettg/citeproc-php": "2.4.1",
-        "su-sws/ckeditor5_plugins": "^1.0",
-        "su-sws/drupal-patches": "^10.0",
-        "su-sws/react_paragraphs": "^8.2",
-        "su-sws/stanford_actions": "^8.2",
-        "su-sws/stanford_fields": "^8.2",
-        "su-sws/stanford_media": "^11.0",
-        "su-sws/stanford_migrate": "^8.3",
-        "su-sws/stanford_profile_helper": "^9.5",
-        "su-sws/stanford_samlauth": "^1.0",
         "acquia/blt": "^13.7",
         "cweagans/composer-patches": "^1.6",
         "drupal/acquia_connector": "^3.0",
@@ -147,7 +18,8 @@
         "drupal/devel": "^5.1",
         "drupal/devel_php": "^1.5",
         "drupal/mysql56": "^1.1",
-        "drush/drush": "^12"
+        "drush/drush": "^12",
+        "wikimedia/composer-merge-plugin": "^2.1"
     },
     "require-dev": {
         "acquia/blt-drupal-test": "^1.0",
@@ -200,6 +72,12 @@
         "allow-plugins": true
     },
     "extra": {
+        "merge-plugin": {
+            "require": [
+                "docroot/profiles/custom/stanford_profile/composer.json"
+            ],
+            "merge-extra": true
+        },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "docroot/"
@@ -262,10 +140,7 @@
                 "https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
             },
             "drupal/hook_event_dispatcher": {
-                "https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2023-04-17/hook_event_dispatcher-4.x-3354751.patch"
-            },
-            "drupal/menu_block": {
-                "https://www.drupal.org/project/menu_block/issues/3271218": "https://www.drupal.org/files/issues/2022-04-29/menu_block_rendered_empty-3271218-17.patch"
+                "https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2024-03-14/hook_event_dispatcher-4.x-3354751-7.patch"
             },
             "drupal/menu_link": {
                 "https://www.drupal.org/project/menu_link/issues/3358081": "https://git.drupalcode.org/project/menu_link/-/merge_requests/9.patch"