Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDSS-1314: Drupal 10.3 / PHP 8.3 #510

Merged
merged 40 commits into from
Nov 8, 2024
Merged

SDSS-1314: Drupal 10.3 / PHP 8.3 #510

Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
19e4e47
Updated core composer constraints and removed conflicts.
Oct 23, 2024
049c528
Updated dependencies and patches.
Oct 23, 2024
f4b4ca5
Updated major composer constraints.
Oct 23, 2024
1cde7f1
Updated configuration.
Oct 23, 2024
4f03ecc
Adjusted stage_file_proxy config_split config.
Oct 23, 2024
c6d9ab7
Restored local config split.
Oct 23, 2024
aadb4cc
Updated github actions workflows.
Oct 24, 2024
ffefe54
Upgraded image_effects module.
Oct 24, 2024
407c77e
Disable config_filter module.
Oct 24, 2024
d0a7a51
Removed transliterate_filenames package.
Oct 24, 2024
cf100b5
Cleaned up install and update hooks.
Oct 24, 2024
842d787
Drupal 10.3 code updates.
Oct 24, 2024
6007b30
PHPstan config.
Oct 24, 2024
98b35fa
fixup
Oct 24, 2024
581df03
Update assertion.
Oct 24, 2024
8e75562
Test fixups.
Oct 24, 2024
8b2e7ba
Updated eventsubscriber service.
Oct 24, 2024
311a5cf
fixup!
Oct 24, 2024
bae6651
Acceptance test updates.
Oct 25, 2024
e83ecf0
Updated core version requirements.
Oct 25, 2024
c56166d
Remove stanford_profile_helper composer.json.
Oct 25, 2024
07b704a
Updated codeception configuration.
Oct 25, 2024
16a4a8b
droped redirect for site renwal or contact info form.
Oct 25, 2024
41e9b95
Enabled delete action confirmation for files view.
Oct 25, 2024
19930c2
Add confirmation step to bulk deletion action.
Oct 25, 2024
c4aca68
Acceptance test updates.
Oct 25, 2024
5a5ec64
remove node_revision_delete cron job.
Oct 25, 2024
23a0dfd
Updated mediaforms test.
Nov 1, 2024
355906c
Update acceptance tests.
Nov 1, 2024
1a4be8f
fixup! add patch file.
Nov 1, 2024
9df07fc
Test updates.:
Nov 1, 2024
85f29a1
Revert back to extlink 1.7
Nov 1, 2024
1e6e221
Updated functional tests.
Nov 1, 2024
f131278
Updated node form styles for Drupal 10.3.
Nov 4, 2024
6ec28ac
Update navigation functional test.
Nov 4, 2024
e413d28
Updated unit tests.
Nov 4, 2024
cc65ce4
fixup!
Nov 4, 2024
856ec37
Update unit tests.
Nov 4, 2024
124d2e4
Implement hook_removed_post_updates.
Nov 7, 2024
330b3af
Update YAML include.
Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/deploy_branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}
Expand All @@ -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:
Expand All @@ -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 '*' &&
Expand All @@ -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
Expand Down Expand Up @@ -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 '*' &&
Expand Down
49 changes: 16 additions & 33 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
],
"require": {
"php": ">=8.0",
"php": ">=8.3",
"ext-imagick": "*",
"acquia/blt": "^13.7",
"acquia/drupal-environment-detector": "^1.0",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
Expand All @@ -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,
Expand Down Expand Up @@ -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"
Expand All @@ -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"
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down
Loading
Loading