From 2e5de00e2432603db4f6d8a98be653252c3b9fb4 Mon Sep 17 00:00:00 2001 From: alexpott Date: Mon, 24 Jun 2024 14:01:57 +0100 Subject: [PATCH] Test php 8.3 support * Use Drupal 10.3.x * Remove patch fixed in 10.3 * Fix deprecated code usage in test * Remove unused use * Rerigger build * Add fixes for 10.3.x * Fix MetatagTest * Fix kernel test * Update config for 10.3.x * Update minimum for media_library_media_modify * Ignore some config changes outside Thunder and covered by the views updater * Increase minimum version of Scheduler due to event dispatcher change * PHPCS * Fix GraphQL SchemaTest * Rmove core 10.3.x patch that has been fixed * Copy core and convert styles to webp on new thunder installs * Doh * Use new media_library_media_modify release * Update tests for webp * Update tests for webp pt 2 * tmate * Update image styles * Use new commands to do upgrade testing * Rerun * Rerun * Rerun * Set workspace directory * Magic sauce * Workspace fun * tmate * Rerun * Rerun * Rerun * Add step to fix old install due to borked packages * Fix webp assertion after updating * Ensure all supported entity types have the correct fields * Add return type * PHPCS * Add NoUpdate group to test that is hard to do in an update scenario * Rerun * Remove unneeded thunder 6 composer lock file * Use a stable version of DRUPAL_TESTING_VERSION * Better constraint * Add a comment about how expectations * Use ApiRequestTrait to make debugging tests with XDebug easier * Improve SchemaTest::testNonExistingEntityLinks() * One less phpstan error * Run tests on PHP 8.3 * Add patch for autosave_form * Update content_lock to latest version that supports PHP 8.3 without errors * Revert "Update content_lock to latest version that supports PHP 8.3 without errors" This reverts commit def4c8e1c20ae32038262de468962526becef599. * Use patch for entity reference actions * Add 8.3 build * Fix PHPStan issues on PHP 8.3 to do with dynamic properties * Ensure we are using Content Lock 2.4 so our test is consistent. Given the number of bug fixes in 2.4 that's not a bad thing. * Fix PHP 8.3 deprecation and make tests work regardless of the path * Add linting * Merge error * Remove unnecesary change * Missed a thing in the merge * Re-test on latest 10.3.x * Update media views * Update to releases * No jquery_ui_draggable needed anymore * Try * Foo * Foo * Foo * Foo --------- Co-authored-by: Daniel Bosen Co-authored-by: Christian Fritsch Co-authored-by: Christian Fritsch --- .github/workflows/test.yml | 8 +++++--- composer.json | 4 ++-- thunder.post_update.php | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf21ccc4e..b2a699ae0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: - PHP_VERSION: [ '8.1' ] + PHP_VERSION: [ '8.1', '8.3' ] env: DRUPAL_TESTING_TEST_DEPRECATION: true @@ -124,7 +124,7 @@ jobs: strategy: fail-fast: false matrix: - PHP_VERSION: [ '8.1' ] + PHP_VERSION: [ '8.3' ] CHUNK: [ 1, 2, 3 ] steps: @@ -336,7 +336,9 @@ jobs: run: test-drupal-project prepare_build - name: Install suggested dependencies - run: composer require "league/container:^4.2" "consolidation/config:^2.1.2" --no-update --no-progress --working-dir=/tmp/test/thunder/install + run: | + composer require "league/container:^4.2" "drupal/core-dev:^10.3" --no-update --no-progress --working-dir=/tmp/test/thunder/install + composer config allow-plugins.php-http/discovery true --no-plugins --working-dir=/tmp/test/thunder/install - name: Build the docroot run: test-drupal-project build diff --git a/composer.json b/composer.json index a764a783f..6dd974e56 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "drupal/access_unpublished": "^1.5", "drupal/admin_toolbar": "^3.4", "drupal/autofill": "^1.1", - "drupal/autosave_form": "^1.2", + "drupal/autosave_form": "^1.6", "drupal/blazy": "^2.14", "drupal/checklistapi": "^2.1", "drupal/core-recommended": "~10.3.0@stable", @@ -61,7 +61,7 @@ "drupal/diff": "1.7", "drupal/dropzonejs": "^2.8", "drupal/empty_fields": "^1.0-alpha1", - "drupal/entity_reference_actions": "^1.0", + "drupal/entity_reference_actions": "^1.1", "drupal/entity_reference_revisions": "^1.3", "drupal/field_group": "^3.4", "drupal/focal_point": "^2.1", diff --git a/thunder.post_update.php b/thunder.post_update.php index f2a19b737..e34b956ee 100644 --- a/thunder.post_update.php +++ b/thunder.post_update.php @@ -21,7 +21,6 @@ function thunder_post_update_0001_upgrade_to_thunder7(array &$sandbox): string { 'media_library_media_modify', 'gin_toolbar', 'jquery_ui', - 'jquery_ui_draggable', 'ckeditor5', ]);