4.7.0

SU-SWS · Nov 21, 2024 · 1a05b3f · 1a05b3f
2 parents f256dfc + 4dc459f
commit 1a05b3f
Show file tree

Hide file tree

Showing 167 changed files with 1,895 additions and 2,427 deletions.
diff --git a/.github/workflows/deploy_branch.yml b/.github/workflows/deploy_branch.yml
@@ -11,7 +11,7 @@ jobs:
     name: Deploy Artifact
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     steps:
       - uses: actions/checkout@v4
       - name: Restore Cache
@@ -22,11 +22,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            4.x-${{ hashFiles('blt/blt.yml') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     permissions: write-all
     if: github.event.pull_request.merged
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     steps:
       - name: Get Next Release
         id: tag
@@ -58,11 +58,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            4.x-${{ hashFiles('blt/blt.yml') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Deploy Tag
         if: ${{ steps.tag.outputs.tag }}
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
     name: PHPUnit Coverage Tests
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     services:
       mysql:
         image: mysql:5.7
@@ -38,11 +38,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            4.x-${{ hashFiles('blt/blt.yml') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Run Unit Tests
         # env:
         #   CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
@@ -69,7 +69,7 @@ jobs:
       DRUPAL_DATABASE_PASSWORD: drupal
       DRUPAL_DATABASE_HOST: mysql
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
       options: '--network-alias drupal8ci'
     services:
       selenium:
@@ -95,11 +95,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            4.x-${{ hashFiles('blt/blt.yml') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Install Site
         run: |
           git config --system --add safe.directory '*' &&
@@ -124,7 +124,7 @@ jobs:
     name: Test Sustainability Site Sync
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
       options: '--network-alias drupal8ci'
     env:
       DRUPAL_DATABASE_NAME: drupal
@@ -163,11 +163,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            4.x-${{ hashFiles('blt/blt.yml') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            4.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Sync Database
         run: |
           git config --system --add safe.directory '*' &&

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.7.0] - 2024-11-21
+
+### Maintenance
+ac4907ea SDSS-1314: Drupal 10.3 / PHP 8.3 (#510)
+d680167c SDSS-1394: Update stanford_circle image style image mask file path (#508)
+
+
 ## [4.6.2] - 2024-10-16
 
 ### Removed

diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.3",
         "ext-imagick": "*",
         "acquia/blt": "^13.7",
         "acquia/drupal-environment-detector": "^1.0",
@@ -79,9 +79,9 @@
         "drupal/config_split": "^2.0",
         "drupal/confirm_leave": "^1.0@beta",
         "drupal/content_lock": "^2.2",
-        "drupal/core": "~10.2.0",
-        "drupal/core-composer-scaffold": "~10.2.0",
-        "drupal/core-recommended": "~10.2.0",
+        "drupal/core": "~10.3.0",
+        "drupal/core-composer-scaffold": "~10.3.0",
+        "drupal/core-recommended": "~10.3.0",
         "drupal/cshs": "^4.0",
         "drupal/default_content": "^2.0@alpha",
         "drupal/diff": "^1.3",
@@ -107,8 +107,8 @@
         "drupal/google_tag": "^2.0",
         "drupal/graphql_compose": "^2.0",
         "drupal/hook_event_dispatcher": "^4.0@beta",
-        "drupal/image_effects": "^3.2",
-        "drupal/imagemagick": "^3.1",
+        "drupal/image_effects": "^4.0",
+        "drupal/imagemagick": "^4.0",
         "drupal/jquery_ui_draggable": "^2.0",
         "drupal/js_cookie": "^1.0",
         "drupal/jsonapi_extras": "^3.20",
@@ -118,8 +118,8 @@
         "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_builder_modal": "^2.0",
+        "drupal/layout_builder_restrictions": "^3.0",
         "drupal/layout_library": "^1.0-beta1",
         "drupal/layout_paragraphs": "^2.0",
         "drupal/link_attributes": "^2.0",
@@ -135,7 +135,7 @@
         "drupal/name": "^1.0@RC",
         "drupal/next": "^1.2",
         "drupal/nobots": "^1.0",
-        "drupal/node_revision_delete": "^1.0@RC",
+        "drupal/node_revision_delete": "^2.0",
         "drupal/oembed_lazyload": "^2.0",
         "drupal/page_manager": "^4.0@beta",
         "drupal/paragraphs": "^1.11",
@@ -156,16 +156,15 @@
         "drupal/shs": "^2.0@RC",
         "drupal/smart_date": "^4.0",
         "drupal/smart_trim": "^2.0",
-        "drupal/stage_file_proxy": "^2.0",
+        "drupal/stage_file_proxy": "^3.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_bulk_edit": "^3.0",
         "drupal/views_contextual_filters_or": "^1.3",
         "drupal/views_custom_cache_tag": "^1.2",
         "drupal/views_infinite_scroll": "^2.0",
@@ -192,7 +191,6 @@
     "require-dev": {
         "acquia/blt-drupal-test": "^1.0",
         "acquia/blt-multisite": "^1.0",
-        "drupal/color": "^1.0",
         "drupal/upgrade_status": "^4.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "su-sws/drupal-dev": "^10"
@@ -201,19 +199,7 @@
         "drupal/coder": "*"
     },
     "conflict": {
-        "drupal/drupal": "*",
-        "drupal/autologout": "<1.5.0",
-        "drupal/config_ignore": "<3.0.0-rc1",
-        "drupal/diff": "<1.3.0",
-        "drupal/fast_404": "<3.0.0-rc1",
-        "drupal/field_encrypt": "<3.0.0",
-        "drupal/field_group": ">3.4",
-        "drupal/focal_point": "<2.0.0-alpha1",
-        "drupal/google_analytics": "<4.0.0",
-        "drupal/menu_link": "<2.0.0",
-        "drupal/migrate_plus": ">6.0.2",
-        "drupal/views_infinite_scroll": "<2.0.0",
-        "su-sws/stanford_actions": ">8.2.9"
+        "drupal/drupal": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -317,14 +303,11 @@
             "drupal/diff": {
                 "https://www.drupal.org/project/diff/issues/2882334#comment-13913401": "patches/contrib/diff-mr-42.patch"
             },
-            "drupal/encrypt": {
-                "https://www.drupal.org/project/encrypt/issues/2975098": "https://www.drupal.org/files/issues/2024-05-23/missing-route-canonical-2975098-5.patch"
-            },
             "drupal/field_encrypt": {
                 "https://www.drupal.org/project/field_encrypt/issues/3299175": "patches/contrib/field_encrypt-mr-31.patch"
             },
             "drupal/field_group": {
-                "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2023-12-19/2969051-100_2.patch"
+                "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2024-08-05/2787179-highlight-html5-validation-101.patch"
             },
             "drupal/google_analytics": {
                 "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"
@@ -348,6 +331,9 @@
                 "https://www.drupal.org/project/menu_link_weight/issues/3410674": "https://www.drupal.org/files/issues/2023-12-23/menu_link_weight-3410674.patch",
                 "https://www.drupal.org/project/menu_link_weight/issues/3099139": "https://www.drupal.org/files/issues/2019-12-05/menu_link_weight-target_blank-3099139.patch"
             },
+            "drupal/node_revision_delete": {
+                "https: //www.drupal.org/project/node_revision_delete/issues/3436432: Check if queue table exists": "patches/contrib/node_revision_delete-mr-26.patch"
+            },
             "drupal/paranoia": {
                 "https://stanfordits.atlassian.net/browse/D8CORE-1351": "patches/contrib/paranoia.patch"
             },
@@ -376,9 +362,6 @@
             },
             "drupal/webp": {
                 "https://www.drupal.org/project/webp/issues/3281606": "patches/contrib/webp-mr-33.patch"
-            },
-            "su-sws/stanford_migrate": {
-                "Remove placeimage URL from unit test": "patches/stanford/stanford_migrate-placeimg-test-fix.patch"
             }
         }
     },