Merge branch '7.4.x' into fix/strip-tags-deprecation

thunder · Dec 18, 2024 · e531e4c · e531e4c
2 parents 9fde3db + 4120888
commit e531e4c
Show file tree

Hide file tree

Showing 111 changed files with 6,424 additions and 18,957 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,6 +12,7 @@ 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
@@ -20,21 +21,26 @@ env:
   DRUPAL_TESTING_TEST_PROFILE: thunder
   DRUPAL_TESTING_HTTP_PORT: 8888
   DRUPAL_TESTING_VERBOSE: false
-  DRUPAL_TESTING_VERSION: "^1.0.41"
+  DRUPAL_TESTING_VERSION: "^1.0.42"
   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"]'
   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: 3.0.12
+  DRUPAL_TESTING_UPGRADE_DRUSH_VERSION: 10.3.6
+  DRUPAL_TESTING_UPGRADE_VERSION: 6.5.4
 
 jobs:
 
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       mysql:
@@ -46,7 +52,7 @@ jobs:
 
     strategy:
       matrix:
-        PHP_VERSION: [ '8.1' ]
+        PHP_VERSION: [ '8.1', '8.3' ]
 
     env:
       DRUPAL_TESTING_TEST_DEPRECATION: true
@@ -58,7 +64,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: Imagick
+          extensions: :redis, Imagick
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -71,6 +77,12 @@ jobs:
         run: |
           composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true --no-plugins
           composer global require thunder/drupal-testing:${DRUPAL_TESTING_VERSION}
+          composer global require php-parallel-lint/php-parallel-lint
+
+      - name: Lint
+        run: |
+          parallel-lint --version
+          parallel-lint --no-progress -e php,module,install,inc,profile,theme .
 
       - name: Prepare the build
         run: test-drupal-project prepare_build
@@ -88,15 +100,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:
@@ -114,7 +126,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PHP_VERSION: [ '8.1' ]
+        PHP_VERSION: [ '8.3' ]
         CHUNK: [ 1, 2, 3 ]
 
     steps:
@@ -124,7 +136,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
@@ -138,12 +150,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
@@ -158,9 +170,16 @@ jobs:
           THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }}
           DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php
 
+      - name: Upload test output
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: text-max-output-${{ matrix.CHUNK }}-${{ 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:
@@ -192,8 +211,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: Imagick, gd, pdo_mysql
-          tools: composer:2.4.4
+          extensions: :redis, Imagick, gd, pdo_mysql
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -213,22 +231,30 @@ jobs:
           composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true --no-plugins
           composer global require thunder/drupal-testing:${DRUPAL_TESTING_VERSION}
 
-      - name: Prepare the build
-        run: test-drupal-project prepare_build
+      - name: Prepare the old install
+        run: test-drupal-project prepare_old_install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
-      - name: Use Thunder 6 lockfile
+      - name: Fix the old install
         run: |
-          touch /tmp/test/thunder/finished-stages/build
-          cp ${GITHUB_WORKSPACE}/tests/fixtures/thunder6.composer.lock composer.lock
-          composer install
+          composer upgrade caxy/php-htmldiff
         working-directory: /tmp/test/thunder/install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
       - name: Install drupal
         run: test-drupal-project install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
+
+      - name: Prepare the upgrade
+        run: test-drupal-project prepare_upgrade
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
       - 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
@@ -247,6 +273,8 @@ jobs:
           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
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
       - name: Setup Apache
         uses: thunder/apache-shiva-php-action@v1
@@ -257,10 +285,12 @@ jobs:
 
       - name: Run tests suite
         run: test-drupal-project run_tests
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
   test-min:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       mysql:
@@ -291,7 +321,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
@@ -315,7 +345,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.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
         run: test-drupal-project build

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,76 @@
 # Changelog
 
+## [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)
+
+* Drupal 10.3 compatibility.
+* Updated Gin theme.
+* PHP8.3 compatibility.
+
+## [7.2.2](https://github.com/thunder/thunder-distribution/tree/7.2.2) 2024-04-30
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.2.1...7.2.2)
+
+* Fix menu links active trail data producer
+* Update simple_sitemap and diff modules
+* Bring back paragraphs split!
+* [Possible break of Thunder GraphQL schema with drupal/graphql:4.6.0](https://www.drupal.org/node/3401211)
+
 ## [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/7.2.0...7.2.1)

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)