D11 compatibility

.github/workflows/tests.yml

@@ -11,23 +11,26 @@ on:
 
 env:
   DRUPAL_TESTING_COMPOSER_PROJECT: thunder/thunder-project
-  DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^4.0@stable"
+  DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "dev-drush-13"
+  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_GROUP: Thunder
   DRUPAL_TESTING_HTTP_PORT: 8888
   DRUPAL_TESTING_VERBOSE: false
-  DRUPAL_TESTING_VERSION: "^1.0.42"
+  DRUPAL_TESTING_VERSION: "dev-parallel-testing"
   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: 4.1.0
@@ -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
@@ -76,6 +79,8 @@ jobs:
           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
+          composer global config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+          composer global require mglaman/composer-drupal-lenient
 
       - name: Lint
         run: |
@@ -85,6 +90,10 @@ jobs:
       - name: Prepare the build
         run: test-drupal-project prepare_build
 
+      - name: Add necessary packages to lenient
+        run: composer config --json extra.drupal-lenient.allowed-list '["drupal/autosave_form", "drupal/vgwort", "drupal/media_entity_slideshow", "drupal/media_entity_twitter", "drupal/metatag_async_widget", "drupal/media_library_media_modify", "drupal/paragraphs_features", "drupal/select2", "drupal/paragraphs_paste", "drupal/ivw_integration", "thunder/thunder_testing_demo"]'
+        working-directory: /tmp/test/thunder/install
+
       - name: Build the docroot
         run: test-drupal-project build
 
@@ -98,7 +107,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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-${{ matrix.PHP_VERSION }}
           path: build-${{ matrix.PHP_VERSION }}.tgz
@@ -125,7 +134,6 @@ jobs:
       fail-fast: false
       matrix:
         PHP_VERSION: [ '8.3' ]
-        CHUNK: [ 1, 2, 3 ]
 
     steps:
       - uses: actions/checkout@v3
@@ -134,7 +142,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 +156,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
@@ -162,11 +170,25 @@ jobs:
           site-directory: /tmp/test/thunder/install/docroot
           http-port: ${{ env.DRUPAL_TESTING_HTTP_PORT }}
 
+      - name: Run config tests
+        run: test-drupal-project run_tests -nc
+        env:
+          DRUPAL_TESTING_TEST_GROUP: ThunderConfig
+
+      - name: Run installer tests
+        run: test-drupal-project run_tests -nc
+        env:
+          DRUPAL_TESTING_TEST_GROUP: ThunderInstaller
+
       - 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
+
+      - 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:
 
@@ -193,7 +215,6 @@ jobs:
 
     env:
       DRUPAL_TESTING_TEST_GROUP_EXCLUDE: "NoUpdate"
-      DRUPAL_TESTING_TEST_GROUP: Thunder
 
     steps:
       - uses: actions/checkout@v3
@@ -202,7 +223,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
@@ -300,17 +321,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

CHANGELOG.md

@@ -1,26 +1,5 @@
 # Changelog
 
-## [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)

composer.json

@@ -41,12 +41,33 @@
             "drupal/diff": {
                 "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch"
             },
+            "drupal/media_entity_slideshow": {
+                "#3431882: D11": "https://www.drupal.org/files/issues/2024-05-30/media_entity_slideshow.2.x-dev.rector.patch"
+            },
+            "drupal/media_entity_twitter": {
+                "#3431884: D11": "https://git.drupalcode.org/project/media_entity_twitter/-/merge_requests/13.diff"
+            },
+            "drupal/paragraphs_features": {
+                "#3433828: D11": "https://www.drupal.org/files/issues/2024-03-24/paragraphs_features.2.0.0-beta4.rector.patch"
+            },
+            "drupal/select2": {
+                "#3454104: D11": "https://git.drupalcode.org/project/select2/-/merge_requests/38.diff"
+            },
             "drupal/focal_point": {
                 "Issue #3462165: Preview results in Error: Call to a member function getDefinitions() on null": "https://www.drupal.org/files/issues/2024-07-18/Preview-results-in-Error-3462165.patch"
             },
             "drupal/gin": {
                 "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/files/issues/2024-08-06/3455558-Refactor-toggle-styles-mr438.patch"
             }
+        },
+        "drupal-lenient": {
+            "allowed-list": [
+                "drupal/media_entity_slideshow",
+                "drupal/media_entity_twitter",
+                "drupal/paragraphs_features",
+                "drupal/select2",
+                "drupal/paragraphs_paste"
+            ]
         }
     },
     "require": {
@@ -55,62 +76,62 @@
         "drupal/access_unpublished": "^1.5",
         "drupal/admin_toolbar": "^3.4",
         "drupal/autofill": "^1.1",
-        "drupal/autosave_form": "^1.6",
+        "drupal/autosave_form": "dev-1.x",
         "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.0.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/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.1",
+        "drupal/focal_point": "2.1.1",
         "drupal/facets": "^2.0.7",
         "drupal/gin": "3.0-rc11",
         "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",
+        "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": "^1.18",
         "drupal/paragraphs_features": "^2.0.0-beta3",
         "drupal/paragraphs_paste": "^2.0-beta3",
         "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": "dev-1.x",
         "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/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"
     },
@@ -130,7 +151,7 @@
     },
     "require-dev": {
         "burdamagazinorg/thunder-dev-tools": "dev-master",
-        "thunder/thunder_testing_demo": "4.x-dev",
+        "thunder/thunder_testing_demo": "dev-d11-readiness",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0"
     }

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]'

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]'

modules/thunder_article/src/Form/NodeRevisionRevertDefaultForm.php

@@ -83,7 +83,7 @@ public function getDescription(): TranslatableMarkup {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, NodeInterface $node = NULL): array {
+  public function buildForm(array $form, FormStateInterface $form_state, ?NodeInterface $node = NULL): array {
     $this->revision = $node;
     return parent::buildForm($form, $form_state);
   }

modules/thunder_article/thunder_article.info.yml

@@ -1,7 +1,7 @@
 name: 'Thunder Article'
 description: 'Provide Article content type for Thunder.'
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^11
 package: Thunder
 dependencies:
   - drupal:node

modules/thunder_gqls/src/Traits/ResolverHelperTrait.php

@@ -63,7 +63,7 @@ protected function createResolverBuilder(): void {
    * @return \Drupal\graphql\GraphQL\Resolver\Composite
    *   The field data producer.
    */
-  public function fromEntityReference(string $field, ResolverInterface $entity = NULL, bool $multiValue = TRUE): Composite {
+  public function fromEntityReference(string $field, ?ResolverInterface $entity = NULL, bool $multiValue = TRUE): Composite {
     return $this->builder->compose(
       $this->builder->produce('entity_reference')
         ->map('field', $this->builder->fromValue($field))

modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderBreadcrumbTest.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\thunder_gqls\Functional;
 
-use Drupal\redirect\Entity\Redirect;
 use Drupal\Tests\graphql\Traits\DataProducerExecutionTrait;
+use Drupal\redirect\Entity\Redirect;
 
 /**
  * Test the schema.

modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderSearchApiTest.php

@@ -2,9 +2,9 @@
 
 namespace Drupal\Tests\thunder_gqls\Functional\DataProducer;
 
-use Drupal\search_api\Query\QueryInterface;
 use Drupal\Tests\graphql\Traits\DataProducerExecutionTrait;
 use Drupal\Tests\thunder_gqls\Functional\ThunderGqlsTestBase;
+use Drupal\search_api\Query\QueryInterface;
 
 /**
  * Test ThunderSearchApi data producer.