Merge remote-tracking branch 'origin/7.2.x' into feature/improve-thun…

…der-menu-gqls

.github/workflows/docs.yml

@@ -8,7 +8,7 @@ on:
       - 'package-lock.json'
       - 'CHANGELOG.md'
     tags:
-      - 6.4.*
+      - 7.0.*
 jobs:
   docs:
     runs-on: ubuntu-latest

.github/workflows/tests.yml

@@ -11,24 +11,22 @@ on:
 
 env:
   DRUPAL_TESTING_COMPOSER_PROJECT: thunder/thunder-project
-  DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^3.0@stable"
+  DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^4.0@stable"
   DRUPAL_TESTING_DATABASE_USER: root
   DRUPAL_TESTING_DATABASE_PASSWORD: root
-  DRUPAL_TESTING_TEST_DUMP_FILE: db-dump.php
+  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_HTTP_PORT: 8888
   DRUPAL_TESTING_VERBOSE: false
-  DRUPAL_TESTING_VERSION: "^1.0.36"
+  DRUPAL_TESTING_VERSION: "^1.0.41"
   DRUPAL_TESTING_TEST_FILTER: ""
   DRUPAL_TESTING_SELENIUM_HOST: 127.0.0.1
   DRUPAL_TESTING_SELENIUM_PORT: 9515
-  THUNDER_ADMIN_BRANCH: 4.x
   PHPSTAN_MEMORY_LIMIT: 4G
-  DRUPAL_TESTING_PARALLEL_TESTING: true
+  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"]'
-
   SIMPLETEST_BASE_URL: http://thunder-testing:8888
   SKIP_TEST_CLEANUP: true
 
@@ -40,7 +38,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:latest
+        image: mariadb:lts
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -54,7 +52,7 @@ jobs:
       DRUPAL_TESTING_TEST_DEPRECATION: true
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -63,7 +61,7 @@ jobs:
           extensions: Imagick
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache
           key: ${{ runner.os }}-composer-cache-${{ hashFiles('**/composer.json') }}
@@ -77,21 +75,11 @@ jobs:
       - name: Prepare the build
         run: test-drupal-project prepare_build
 
-      - name: Add needed dependencies
-        run: composer require "drupal/core-dev:~9.3.0" "phpspec/prophecy-phpunit:^2" --no-update --no-progress --working-dir=/tmp/test/thunder/install
-
       - name: Build the docroot
         run: test-drupal-project build
 
-      - name: Get custom thunder_admin branch
-        run: |
-          rm -rf thunder_admin
-          git clone --depth 1 --single-branch --branch "${THUNDER_ADMIN_BRANCH}" https://github.com/BurdaMagazinOrg/theme-thunder-admin.git thunder_admin
-        working-directory: /tmp/test/thunder/install/docroot/themes/contrib
-
       - name: Test for deprecations
         run: test-drupal-project deprecation
-        continue-on-error: true
 
       - name: Install drupal
         run: test-drupal-project install
@@ -100,7 +88,7 @@ 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@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build-${{ matrix.PHP_VERSION }}
           path: build-${{ matrix.PHP_VERSION }}.tgz
@@ -112,7 +100,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:latest
+        image: mariadb:lts
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -130,7 +118,7 @@ jobs:
         CHUNK: [ 1, 2, 3 ]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -141,10 +129,6 @@ jobs:
       - name: Add host
         run: echo "127.0.0.1 thunder-testing" | sudo tee -a /etc/hosts
 
-      - name: Set mysql isolation level to read committed to prevent deadlocks
-        run: |
-          mysql --host="127.0.0.1" --user=root --password=root -e "SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;"
-
       - name: Prepare fixtures
         run: docker cp ./tests/fixtures chrome:/fixtures
 
@@ -180,7 +164,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:latest
+        image: mariadb:lts
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -193,7 +177,7 @@ jobs:
 
     strategy:
       matrix:
-        PHP_VERSION: [ '7.4' ]
+        PHP_VERSION: [ '8.1' ]
 
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test-upgrade') || github.event_name == 'schedule' }}
 
@@ -202,7 +186,7 @@ jobs:
       DRUPAL_TESTING_TEST_GROUP: Thunder
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -212,16 +196,12 @@ jobs:
           tools: composer:2.4.4
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache
           key: ${{ runner.os }}-composer-cache-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-cache-
 
-      - name: Set mysql isolation level to read committed to prevent deadlocks
-        run: |
-          mysql --host="127.0.0.1" --user=root --password=root -e "SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;"
-
       - name: Prepare fixtures
         run: docker cp ./tests/fixtures chrome:/fixtures
 
@@ -248,15 +228,24 @@ jobs:
 
       - name: Update the docroot
         run: |
+          composer config repositories.0 path "${GITHUB_WORKSPACE}"
           composer remove thunder/thunder-distribution --no-update
           composer config name "drupal-testing-thunder/thunder-distribution" --working-dir="${GITHUB_WORKSPACE}"
           composer require "drupal-testing-thunder/thunder-distribution:*" --no-update
+          composer require "drupal/ckeditor" --no-update
+          composer require "drupal/seven" --no-update
+          composer require "drupal/entity_browser" --no-update
+          composer require "drupal/thunder_admin" --no-update
+          composer require "drupal/shariff" --no-update
+          composer require "drupal/ctools" --no-update
+          composer require "drupal/core-dev:~10.0.0" --no-update
 
           composer update
           composer exec -- drush updb -y
 
           cd docroot
-          php core/scripts/db-tools.php dump-database-d8-mysql > db-dump.php
+          php core/scripts/db-tools.php dump-database-d8-mysql --database-url "${SIMPLETEST_DB}" >"sites/default/database-dump.php"
+          tar -czf "${DRUPAL_TESTING_TEST_DUMP_FILE}" --exclude='config_*' --exclude='php' --exclude='styles' --directory='sites/default' files database-dump.php
         working-directory: /tmp/test/thunder/install
 
       - name: Setup Apache
@@ -275,7 +264,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:latest
+        image: mariadb:lts
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -288,16 +277,15 @@ jobs:
 
     strategy:
       matrix:
-        PHP_VERSION: [ '7.4' ]
+        PHP_VERSION: [ '8.1' ]
 
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test-min') || github.event_name == 'schedule' }}
 
     env:
-      DRUPAL_TESTING_DRUPAL_VERSION: '~9.3.0'
       DRUPAL_TESTING_TEST_GROUP: Thunder
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -306,16 +294,12 @@ jobs:
           extensions: Imagick, gd, pdo_mysql
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache
           key: ${{ runner.os }}-composer-cache-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-cache-
 
-      - name: Set mysql isolation level to read committed to prevent deadlocks
-        run: |
-          mysql --host="127.0.0.1" --user=root --password=root -e "SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;"
-
       - name: Prepare fixtures
         run: docker cp ./tests/fixtures chrome:/fixtures
 
@@ -331,7 +315,7 @@ jobs:
         run: test-drupal-project prepare_build
 
       - name: Install suggested dependencies
-        run: composer require "drupal/core-dev:~9.3.0" --no-update --no-progress --working-dir=/tmp/test/thunder/install
+        run: composer require "league/container:^4.2" "consolidation/config:^2.1.2" --no-update --no-progress --working-dir=/tmp/test/thunder/install
 
       - name: Build the docroot
         run: test-drupal-project build

CHANGELOG.md

@@ -1,49 +1,95 @@
 # Changelog
 
-## [6.5.7](https://github.com/thunder/thunder-distribution/tree/6.5.7) 2023-08-03
+## [7.2.1](https://github.com/thunder/thunder-distribution/tree/7.2.1) 2024-04-10
 
-[Full Changelog](https://github.com/thunder/thunder-distribution/compare/6.5.6...6.5.7)
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.2.0...7.2.1)
 
-Remove patch and unpin media_entity_pinterest.
+* Fix thunder redirect data producer with query strings.
+* Move xymatic GraphQL schema to base.
+* Update to gin rc9.
+* Update graphql module to 4.7.0 and remove patch.
 
-## [6.5.6](https://github.com/thunder/thunder-distribution/tree/6.5.6) 2023-06-15
+## [7.2.0](https://github.com/thunder/thunder-distribution/tree/7.2.0) 2024-03-07
 
-[Full Changelog](https://github.com/thunder/thunder-distribution/compare/6.5.5...6.5.6)
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.7...7.2.0)
 
-Adds decoratable type resolver for GraphQL.
+Support Drupal 10.2
 
-## [6.5.5](https://github.com/thunder/thunder-distribution/tree/6.5.5) 2023-05-22
+## [7.1.7](https://github.com/thunder/thunder-distribution/tree/7.1.7) 2024-02-14
 
-[Full Changelog](https://github.com/thunder/thunder-distribution/compare/6.5.4...6.5.5)
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.6...7.1.7)
 
-Several improvements to xymatic integration. GraphQl schema additions and entity view displays.
+* Add patch to fix [Checkbox for Media library modal missing after search](https://www.drupal.org/project/drupal/issues/3388913)
 
-## [6.5.4](https://github.com/thunder/thunder-distribution/tree/6.5.4) 2023-03-30
+## [7.1.6](https://github.com/thunder/thunder-distribution/tree/7.1.6) 2024-01-09
 
-[Full Changelog](https://github.com/thunder/thunder-distribution/compare/6.5.3...6.5.4)
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.5...7.1.6)
 
-* This release adds an integration for the [Xymatic](https://www.drupal.org/project/xymatic/) module.
-* A new content type "News Article", that is similar to the "Article" content type, but has different metadata.
+* Allow update_helper version "^4.0" in composer.json
+
+## [7.1.5](https://github.com/thunder/thunder-distribution/tree/7.1.5) 2023-12-21
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.4...7.1.5)
+
+* Improved update path from Thunder 6 to 7
+
+## [7.1.4](https://github.com/thunder/thunder-distribution/tree/7.1.4) 2023-12-04
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.3...7.1.4)
+
+* Fix possible break of Thunder GraphQL schema with drupal/graphql:4.6.0
+* Fix warning on missing entityLinks keys in GraphQL
+
+## [7.1.3](https://github.com/thunder/thunder-distribution/tree/7.1.3) 2023-11-07
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.2...7.1.3)
+
+* Update to gin rc7
+* Fix issue with form fields for media
+* Bump Drupal version number in thunder.profile
+* Update focal point patch
+
+## [7.1.2](https://github.com/thunder/thunder-distribution/tree/7.1.2) 2023-09-01
 
-## [6.5.3](https://github.com/thunder/thunder-distribution/tree/6.5.3) 2023-03-01
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.1...7.1.2)
 
-[Full Changelog](https://github.com/thunder/thunder-distribution/compare/6.5.2...6.5.3)
+* Fix yaml error in xymatic config.
+
+## [7.1.1](https://github.com/thunder/thunder-distribution/tree/7.1.1) 2023-08-28
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.1.0...7.1.1)
+
+* Update Gin to RC5.
+* Change paragraphs_feature requirement to ^2.0.0-beta3.
+* Remove all entity browser permissions in all roles during the Thunder 6 to 7 migration.
+
+## [7.1.0](https://github.com/thunder/thunder-distribution/tree/7.1.0) 2023-07-03
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.0.0...7.1.0)
+
+* Drupal 10.1 compatibility.
+
+## [7.0.0](https://github.com/thunder/thunder-distribution/tree/7.0.0) 2023-06-15
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.0.0-beta2...7.0.0)
+
+* Add decoratable type resolver for GraphQL.
+* Add integration for the Xymatic module.
+* A new content type "News Article", that is similar to the "Article" content type, but has different metadata.
 
-This is a security release of Thunder.
+## [7.0.0-beta2](https://github.com/thunder/thunder-distribution/tree/7.0.0-beta2) 2023-03-13
 
-## [6.5.2](https://github.com/thunder/thunder-distribution/tree/6.5.2) 2023-02-23
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.0.0-beta1...7.0.0-beta2)
 
-[Full Changelog](https://github.com/thunder/thunder-distribution/compare/6.5.1...6.5.2)
+Remove merged Gin patches and update to latest Gin release candidate.
 
-* [Fix Attempted to create an instance of field with name field_meta_tags on entity type node when the field storage does not exist](https://www.drupal.org/node/3340586)
-* [Patch too fix "Call to a member function mainPropertyName() on null"](https://www.drupal.org/issues/3179172)
-* Fix caching of GraphQl sub request data producers.
+## [7.0.0-beta1](https://github.com/thunder/thunder-distribution/tree/7.0.0-beta1) 2023-03-09
 
-## [6.5.1](https://github.com/thunder/thunder-distribution/tree/6.5.1) 2023-01-19
+First beta of Thunder 7.0.0 with Drupal 10 support.
 
-Adding Entity Browser patch for SA-CONTRIB-2023-002. We cannot update entity browser, so we have to backport the patch.
-Our Entity Browser will still be shown as vulnerable, but it is fixed with this patch.
+Besides being Drupal 10 compatible the most notable changes are the retirement of the Thunder admin theme in favor
+of the community driven Gin theme and the switch from Entity Browser to Drupal core Media Library.
 
-## [6.5.0](https://github.com/thunder/thunder-distribution/tree/6.5.0) 2023-01-05
+Manual update steps from Thunder 6 are required and can be found here:
 
-Minor release, that bumps the Drupal core dependency to 9.5.x.
+[Migrate Thunder 6 to Thunder 7](https://thunder.github.io/developer-guide/migration/migrate-6-7.html)