Merge branch '8.0.x' into replace-toolbar-by-navigation

* 8.0.x: (41 commits) D11 compatibility Fix Fix Thunder 7.4 release Cast to string in strip_tags Load entity types and add cache tags and contexts in search api producer Drupal 10.4 Release 7.3.9 Remove committed core patch #3487031 Issue #3488601: Release Thunder 7.3.8 Add patch from issue #3487031 Make private methods in SearchApiResponse protected. Add node query to GraphQl schema Disable redis extension Release Thunder 7.3.7 Re-add list tags to graphql queries Issue #3478701: Release Thunder 7.3.6 Update diff module (#846) Fix notices in graphql requests Issue #3476367: Release Thunder 7.3.5 ...
thunder · Jan 10, 2025 · 00d1dc8 · 00d1dc8
2 parents d15b391 + 3efaa57
commit 00d1dc8
Show file tree

Hide file tree

Showing 83 changed files with 5,644 additions and 4,405 deletions.
diff --git a/.github/workflows/test.yml → .github/workflows/tests.yml b/.github/workflows/test.yml → .github/workflows/tests.yml
@@ -12,22 +12,25 @@ on:
 env:
   DRUPAL_TESTING_COMPOSER_PROJECT: thunder/thunder-project
   DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^4.0@stable"
+  DRUPAL_TESTING_CLEANUP: false
   DRUPAL_TESTING_DATABASE_USER: root
   DRUPAL_TESTING_DATABASE_PASSWORD: root
   DRUPAL_TESTING_TEST_DUMP_FILE: site-dump.tar.gz
   DRUPAL_TESTING_DATABASE_ENGINE: mysql
   DRUPAL_TESTING_TEST_CODING_STYLES: false
   DRUPAL_TESTING_TEST_PROFILE: thunder
+  DRUPAL_TESTING_TEST_CONFIGURATION: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/
   DRUPAL_TESTING_HTTP_PORT: 8888
   DRUPAL_TESTING_VERBOSE: false
-  DRUPAL_TESTING_VERSION: "^1.0.42"
+  DRUPAL_TESTING_VERSION: "^1.0.45"
   DRUPAL_TESTING_TEST_FILTER: ""
   DRUPAL_TESTING_SELENIUM_HOST: 127.0.0.1
   DRUPAL_TESTING_SELENIUM_PORT: 9515
   PHPSTAN_MEMORY_LIMIT: 4G
   DRUPAL_TESTING_PARALLEL_TESTING: false
-  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]'
+  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]'
   SIMPLETEST_BASE_URL: http://thunder-testing:8888
+  BROWSERTEST_OUTPUT_DIRECTORY: /tmp
   SKIP_TEST_CLEANUP: true
   # The following variable set the version that the upgrade test starts with.
   DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION: 4.1.0
@@ -38,7 +41,7 @@ jobs:
 
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       mysql:
@@ -62,7 +65,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: Imagick
+          extensions: :redis, Imagick
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -98,15 +101,15 @@ jobs:
         run: cd /tmp/test; tar cfz build-${{ matrix.PHP_VERSION }}.tgz thunder; mv build-${{ matrix.PHP_VERSION }}.tgz ${GITHUB_WORKSPACE}
 
       - name: Upload build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-${{ matrix.PHP_VERSION }}
           path: build-${{ matrix.PHP_VERSION }}.tgz
 
   test-max:
     needs: build
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       mysql:
@@ -125,7 +128,7 @@ jobs:
       fail-fast: false
       matrix:
         PHP_VERSION: [ '8.3' ]
-        CHUNK: [ 1, 2, 3 ]
+        DRUPAL_TESTING_TEST_SUITE: [ 'kernel', 'functional', 'functional-javascript' ]
 
     steps:
       - uses: actions/checkout@v3
@@ -134,7 +137,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: :sodium, Imagick, gd, PDO, mysql, pdo_mysql, mbstring, xmlwriter, pdo, date, dom, filter, hash, json, pcre, session, SimpleXML, SPL, tokenizer, xml, curl
+          extensions: :redis, :sodium, Imagick, gd, PDO, mysql, pdo_mysql, mbstring, xmlwriter, pdo, date, dom, filter, hash, json, pcre, session, SimpleXML, SPL, tokenizer, xml, curl
 
       - name: Add host
         run: echo "127.0.0.1 thunder-testing" | sudo tee -a /etc/hosts
@@ -148,12 +151,12 @@ jobs:
           composer global require thunder/drupal-testing:${DRUPAL_TESTING_VERSION}
 
       - name: Download build
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: build-${{ matrix.PHP_VERSION }}
 
       - name: Unzip build artifact
-        run: mkdir -p /tmp/test; tar xCfz /tmp/test build-${{ matrix.PHP_VERSION }}/build-${{ matrix.PHP_VERSION }}.tgz thunder; rm -rf build-${{ matrix.PHP_VERSION }}
+        run: mkdir -p /tmp/test; tar xCfz /tmp/test build-${{ matrix.PHP_VERSION }}.tgz thunder; rm -rf build-${{ matrix.PHP_VERSION }}
 
       - name: Setup Apache
         uses: thunder/apache-shiva-php-action@v1
@@ -165,12 +168,18 @@ jobs:
       - name: Run tests
         run: test-drupal-project run_tests
         env:
-          THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }}
-          DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php
+          DRUPAL_TESTING_TEST_SUITE: ${{ matrix.DRUPAL_TESTING_TEST_SUITE }}
+
+      - name: Upload test output
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: text-max-output-${{ matrix.DRUPAL_TESTING_TEST_SUITE }}-${{ matrix.PHP_VERSION }}
+          path: /tmp/test/thunder/install/docroot/sites/simpletest/browser_output/
 
   test-upgrade:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       mysql:
@@ -193,7 +202,6 @@ jobs:
 
     env:
       DRUPAL_TESTING_TEST_GROUP_EXCLUDE: "NoUpdate"
-      DRUPAL_TESTING_TEST_GROUP: Thunder
 
     steps:
       - uses: actions/checkout@v3
@@ -202,7 +210,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: Imagick, gd, pdo_mysql
+          extensions: :redis, Imagick, gd, pdo_mysql
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -280,7 +288,7 @@ jobs:
 
   test-min:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       mysql:
@@ -301,17 +309,14 @@ jobs:
 
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test-min') || github.event_name == 'schedule' }}
 
-    env:
-      DRUPAL_TESTING_TEST_GROUP: Thunder
-
     steps:
       - uses: actions/checkout@v3
 
       - uses: shivammathur/setup-php@v2
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: Imagick, gd, pdo_mysql
+          extensions: :redis, Imagick, gd, pdo_mysql
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -336,7 +341,7 @@ jobs:
 
       - name: Install suggested dependencies
         run: |
-          composer require "league/container:^4.2" "drupal/core-dev:^10.3" --no-update --no-progress --working-dir=/tmp/test/thunder/install
+          composer require "league/container:^4.2" "drupal/core-dev:^10.4" --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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,67 @@
 # Changelog
 
+## [7.4.0](https://github.com/thunder/thunder-distribution/tree/7.4.0) 2024-12-18
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.9...7.4.0)
+
+* Drupal 10.4 compatibility.
+* Updated Gin theme.
+* Load entity types and add cache tags and contexts in search api producer.
+
+## [7.3.9](https://github.com/thunder/thunder-distribution/tree/7.3.9) 2024-11-25
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.8...7.3.9)
+
+* Remove Drupal core patch [#3487031](https://www.drupal.org/i/3487031), because it was merged upstream.
+
+## [7.3.8](https://github.com/thunder/thunder-distribution/tree/7.3.8) 2024-11-20
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.7...7.3.8)
+
+* Pin autosave_form to 1.7 and apply patch from issue [#3487459](https://www.drupal.org/i/3487459)
+* Add a node Graphql query to fetch a single node by its UUID
+* Make private methods in SearchApiResponse protected.
+* Add Drupal core patch from issue [#3487031](https://www.drupal.org/i/3487031) because of a performance regression.
+
+## [7.3.7](https://github.com/thunder/thunder-distribution/tree/7.3.7) 2024-10-14
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.6...7.3.7)
+
+Re-add list tags to graphql queries
+
+## [7.3.6](https://github.com/thunder/thunder-distribution/tree/7.3.6) 2024-10-04
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.5...7.3.6)
+
+Update diff module to 1.8
+
+## [7.3.5](https://github.com/thunder/thunder-distribution/tree/7.3.5) 2024-09-24
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.3...7.3.5)
+
+Allow scheduler version ^3.0 in composer.json
+
+## [7.3.3](https://github.com/thunder/thunder-distribution/tree/7.3.3) 2024-08-22
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.2...7.3.3)
+
+Add search api GraphQl schema and data producer.
+
+## [7.3.2](https://github.com/thunder/thunder-distribution/tree/7.3.2) 2024-08-14
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.1...7.3.2)
+
+* [Issue #3462165: Add focal_point patch](https://www.drupal.org/node/3462165)
+
+## [7.3.1](https://github.com/thunder/thunder-distribution/tree/7.3.1) 2024-06-024
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.0...7.3.1)
+
+Add patches for upstream issues.
+
+* [Issue #3465364: Fatal error when changing password when password_policy_history is enabled](https://www.drupal.org/project/password_policy/issues/3465364)
+* [Issue #3455558: There is no visible change to a toggle when pressed (but it does trigger conditional fields, value is saved, etc)](https://www.drupal.org/project/gin/issues/3455558)
+
 ## [7.3.0](https://github.com/thunder/thunder-distribution/tree/7.1.0) 2024-06-024
 
 [Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.2.2...7.3.0)

diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ For general help using Thunder, please refer to [the official Thunder documentat
 
 ### Community support
 
-For additional help, you can use one of this channel to ask question:
+For additional help, you can use one of these channels to ask question:
 
 * [Slack](https://thunder.org/contact-us) (highly recommended for faster support)
 * [Twitter](https://twitter.com/ThunderCoreTeam)

diff --git a/composer.json b/composer.json
@@ -41,11 +41,11 @@
             "drupal/diff": {
                 "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch"
             },
-            "drupal/gin_toolbar": {
-                "Secondary toolbar does not show on the front end when core navigation enabled": "https://www.drupal.org/files/issues/2024-07-10/3460333-gin-toolbar-2.patch"
+            "drupal/autosave_form": {
+                "Issue #3487459: Deprecation error on user edit form": "https://git.drupalcode.org/project/autosave_form/-/merge_requests/19.diff"
             },
-            "drupal/gin": {
-                "Secondary toolbar does not show on the front end when core navigation enabled": "https://git.drupalcode.org/project/gin/-/merge_requests/464.diff"
+            "drupal/field_group": {
+                "Drupal 10.4 RC1 error with field_ui.js": "https://git.drupalcode.org/project/field_group/-/merge_requests/88.diff"
             }
         }
     },
@@ -54,62 +54,62 @@
         "cweagans/composer-patches": "^1.6.5",
         "drupal/access_unpublished": "^1.5",
         "drupal/autofill": "^1.1",
-        "drupal/autosave_form": "^1.6",
+        "drupal/autosave_form": "1.7",
         "drupal/checklistapi": "^2.1.3",
-        "drupal/core-recommended": "~10.3.0@stable",
-        "drupal/config_selector": "^2.1",
-        "drupal/config_update": "^1.7 || ^2.0",
+        "drupal/core-recommended": "~11.1.0",
+        "drupal/config_selector": "^3.0",
+        "drupal/config_update": "^2.0-alpha4",
         "drupal/content_lock": "^3.0.0-alpha2",
         "drupal/crop": "^2.2",
-        "drupal/diff": "1.7",
+        "drupal/diff": "1.8",
         "drupal/dropzonejs": "^2.8",
-        "drupal/empty_fields": "^1.0-alpha1",
-        "drupal/entity_reference_actions": "^1.1",
+        "drupal/empty_fields": "^1.0",
+        "drupal/entity_reference_actions": "^1.1.1",
         "drupal/entity_reference_revisions": "^1.3",
-        "drupal/field_group": "^3.4",
-        "drupal/focal_point": "^2.1",
+        "drupal/field_group": "3.6",
+        "drupal/focal_point": "^2.1.2",
         "drupal/facets": "^2.0.7",
-        "drupal/gin": "3.0-rc11",
+        "drupal/gin": "^3.0-rc15",
         "drupal/gin_toolbar": "^1.0-rc6",
         "drupal/graphql": "^4.7",
-        "drupal/inline_entity_form": "^3.0.0@rc",
+        "drupal/inline_entity_form": "^3.0.0-rc20",
         "drupal/ivw_integration": "^2.0",
         "drupal/length_indicator": "^1.2",
-        "drupal/linkit": "^6.0-beta4",
-        "drupal/media_entity_instagram": "^3.0.3",
+        "drupal/linkit": "^7.0.0-alpha1",
+        "drupal/media_entity_instagram": "^4.0",
         "drupal/media_entity_pinterest": "^2.7",
         "drupal/media_entity_slideshow": "^2.0-alpha1",
         "drupal/media_entity_twitter": "^2.5",
         "drupal/media_expire": "^2.6",
-        "drupal/media_library_media_modify": "^1.0.0-beta16",
+        "drupal/media_library_media_modify": "^2.0.0-beta1",
         "drupal/media_file_delete": "^1.2",
-        "drupal/metatag": "^1.26",
+        "drupal/metatag": "^2.0.2",
         "drupal/metatag_async_widget": "^1.0-alpha2",
-        "drupal/paragraphs": "^1.12",
-        "drupal/paragraphs_features": "^2.0.0-beta3",
+        "drupal/paragraphs": "^1.18",
+        "drupal/paragraphs_features": "^2.1.0",
         "drupal/paragraphs_paste": "^2.0-beta3",
-        "drupal/password_policy": "^4.0",
+        "drupal/password_policy": "^4.0.3",
         "drupal/pathauto": "^1.12",
         "drupal/responsive_preview": "^2.1",
         "drupal/redirect": "^1.7",
-        "drupal/scheduler": "^2.0.2",
-        "drupal/scheduler_content_moderation_integration": "^2.0",
-        "drupal/schema_metatag": "^2.5",
-        "drupal/select2": "^1.7",
+        "drupal/scheduler": "^2.1.0",
+        "drupal/scheduler_content_moderation_integration": "^3.0.1",
+        "drupal/schema_metatag": "^3.0.3",
+        "drupal/select2": "^2.0",
         "drupal/search_api_mark_outdated": "^1.0",
-        "drupal/simple_sitemap": "^4.1.6",
+        "drupal/simple_sitemap": "^4.2.1",
         "drupal/token": "^1.7",
         "drupal/update_helper": "^2.0||^3.0.3||^4.0",
         "drupal/search_api": "^1.29",
-        "drupal/views_bulk_edit": "^2.5",
+        "drupal/views_bulk_edit": "^3.0",
         "drupal/views_bulk_operations": "^4.2.7",
-        "drupal/vgwort": "^2.0@beta",
+        "drupal/vgwort": "^3.0@beta",
         "drupal/xymatic": "^1.0@beta",
         "npm-asset/dropzone": "^5.5.1",
         "npm-asset/exif-js": "^2.3.0",
         "npm-asset/blazy": "^1.8",
         "npm-asset/slick-carousel": "^1.8",
-        "npm-asset/select2": "^4.0.7",
+        "npm-asset/select2": "dev-develop",
         "caxy/php-htmldiff": "^0.1.14",
         "webonyx/graphql-php": "^14.11.8"
     },

diff --git a/config/optional/metatag.metatag_defaults.node__article.yml b/config/optional/metatag.metatag_defaults.node__article.yml
@@ -4,7 +4,6 @@ dependencies: {  }
 id: node__article
 label: 'Content: Article'
 tags:
-  content_language: '[node:langcode]'
   description: '[node:field_teaser_text]'
   image_src: '[node:field_teaser_media:entity:field_image]'
   referrer: no-referrer
@@ -22,8 +21,6 @@ tags:
   og_url: '[node:url]'
   twitter_cards_description: '[node:field_teaser_text]'
   twitter_cards_image: '[node:field_teaser_media:entity:field_image:twitter]'
-  twitter_cards_image_height: '[node:field_teaser_media:entity:field_image:twitter:height]'
-  twitter_cards_image_width: '[node:field_teaser_media:entity:field_image:twitter:width]'
   twitter_cards_type: summary_large_image
   schema_article_about: '[node:field_channel:entity:name]'
   schema_article_date_modified: '[node:changed:html_datetime]'

diff --git a/config/optional/metatag.metatag_defaults.node__news_article.yml b/config/optional/metatag.metatag_defaults.node__news_article.yml
@@ -6,7 +6,6 @@ dependencies:
 id: node__news_article
 label: 'Content: News Article'
 tags:
-  content_language: '[node:langcode]'
   description: '[node:field_teaser_text]'
   image_src: '[node:field_teaser_media:entity:field_image]'
   referrer: no-referrer
@@ -24,8 +23,6 @@ tags:
   og_url: '[node:url]'
   twitter_cards_description: '[node:field_teaser_text]'
   twitter_cards_image: '[node:field_teaser_media:entity:field_image:twitter]'
-  twitter_cards_image_height: '[node:field_teaser_media:entity:field_image:twitter:height]'
-  twitter_cards_image_width: '[node:field_teaser_media:entity:field_image:twitter:width]'
   twitter_cards_type: summary_large_image
   schema_article_about: '[node:field_channel:entity:name]'
   schema_article_date_modified: '[node:changed:html_datetime]'