Drupal 11 support

.ddev/config.yaml

@@ -10,7 +10,7 @@ additional_hostnames: []
 additional_fqdns: []
 database:
   type: mariadb
-  version: "10.3"
+  version: "10.6"
 nfs_mount_enabled: false
 mutagen_enabled: false
 use_dns_when_possible: true

.github/workflows/test.yml

@@ -7,9 +7,11 @@ on:
   push:
     branches:
       - '3.x'
+      - '3.2.x'
   pull_request:
     branches:
       - '3.x'
+      - '3.2.x'
   schedule:
     - cron: '0 7 * * *'
   workflow_dispatch:
@@ -28,14 +30,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '3.x'
-        drupal-version:
-          - '~10.0'
-        php-version:
-          - '8.1'
-          - '8.2'
-          - '8.3'
+        include:
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.2'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.3'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.4'
+          - localgov-version: '3.x'
+            drupal-version: '~11.0'
+            php-version: '8.3'
+          - localgov-version: '3.x'
+            drupal-version: '~11.0'
+            php-version: '8.4'
 
     steps:
       - name: Save git branch and git repo names to env if this is not a pull request
@@ -78,10 +91,14 @@ jobs:
           ref: php${{ matrix.php-version }}
 
       - name: Create LocalGov Drupal project
-        run: composer create-project --stability dev localgovdrupal/localgov-project:${COMPOSER_REF} ./html
+        run: |
+          composer create-project --stability dev --no-install localgovdrupal/localgov-project:${COMPOSER_REF} ./html
+          composer require --working-dir=./html --no-install --with-all-dependencies drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
+          composer install --working-dir=./html
 
       - name: Obtain all dev dependencies for LocalGov Drupal
-        run: jq --raw-output '.packages[] | select(.name | startswith("localgovdrupal/")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction
+        run: |
+          jq --raw-output '.packages[] | select(.name | startswith("localgovdrupal/")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction
 
   phpcs:
     name: Coding standards checks
@@ -94,9 +111,9 @@ jobs:
         localgov-version:
           - '3.x'
         drupal-version:
-          - '~10.0'
+          - '~11.0'
         php-version:
-          - '8.3'
+          - '8.4'
 
     steps:
       - name: Cached workspace
@@ -128,9 +145,9 @@ jobs:
         localgov-version:
           - '3.x'
         drupal-version:
-          - '~10.0'
+          - '~11.0'
         php-version:
-          - '8.3'
+          - '8.4'
 
     steps:
       - name: Cached workspace
@@ -150,6 +167,7 @@ jobs:
         run: |
           cd html
           ./bin/phpstan analyse -c ./phpstan.neon ./web/modules/contrib/localgov* ./web/profiles/contrib/localgov* ./web/themes/contrib/localgov*
+
   phpunit:
     name: PHPUnit tests
     needs: build
@@ -158,14 +176,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '3.x'
-        drupal-version:
-          - '~10.0'
-        php-version:
-          - '8.1'
-          - '8.2'
-          - '8.3'
+        include:
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.2'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.3'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.4'
+          - localgov-version: '3.x'
+            drupal-version: '~11.0'
+            php-version: '8.3'
+          - localgov-version: '3.x'
+            drupal-version: '~11.0'
+            php-version: '8.4'
 
     steps:
       - name: Clone Drupal container

.gitignore

@@ -1,5 +1,6 @@
 # Ignore directories generated by Composer
 /drush/contrib/
+/recipes/
 /vendor/
 /web/core/
 /web/modules/contrib/

.lando.dist.yml

@@ -1,9 +1,9 @@
 name: localgov
-recipe: drupal10
+recipe: drupal11
 config:
   webroot: web
-  php: '8.1'
-  database: mariadb:10.6
+  php: '8.3'
+  database: mariadb:10.11
 proxy:
   mailhog:
     - mail.localgov.lndo.site

composer.json

@@ -11,18 +11,18 @@
         }
     },
     "require": {
-        "composer/installers": "^1.10",
+        "composer/installers": "^1.10 || ^2.3",
         "cweagans/composer-patches": "^1.6",
-        "drupal/core-composer-scaffold": "^10.3",
-        "drupal/core-recommended": "^10.3",
+        "drupal/core-composer-scaffold": "^10.3 || ^11.0",
+        "drupal/core-recommended": "^10.3 || ^11.0",
         "localgovdrupal/localgov": "^3.0",
         "localgovdrupal/localgov_search_solr": "^1.1",
         "wikimedia/composer-merge-plugin": "^2.1"
     },
     "require-dev": {
-        "brianium/paratest": "^6.0",
+        "brianium/paratest": "^6.0 || ^7.3.1",
         "drupal/coder": "^8.3",
-        "drupal/core-dev": "^10.3",
+        "drupal/core-dev": "^10.3 || ^11.0",
         "mglaman/phpstan-drupal": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/phpstan": "^1.0",

phpunit.d11.xml.dist

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="web/core/tests/bootstrap.php" colors="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutChangesToGlobalState="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         cacheResult="false">
+
+  <php>
+    <!-- Set error reporting to E_ALL. -->
+    <ini name="error_reporting" value="32767"/>
+    <!-- Do not limit the amount of memory tests take to run. -->
+    <ini name="memory_limit" value="-1"/>
+    <!-- Example SIMPLETEST_BASE_URL value: http://localhost -->
+    <env name="SIMPLETEST_BASE_URL" value="http://localgov.lndo.site"/>
+    <!-- Example SIMPLETEST_DB value: mysql://username:password@localhost/databasename#table_prefix -->
+    <env name="SIMPLETEST_DB" value="mysql://database:database@database/database"/>
+    <!-- Example BROWSERTEST_OUTPUT_DIRECTORY value: /path/to/webroot/sites/simpletest/browser_output -->
+    <env name="BROWSERTEST_OUTPUT_DIRECTORY" value=""/>
+    <!-- To have browsertest output use an alternative base URL. For example if
+     SIMPLETEST_BASE_URL is an internal DDEV URL, you can set this to the
+     external DDev URL so you can follow the links directly.
+    -->
+    <env name="BROWSERTEST_OUTPUT_BASE_URL" value=""/>
+  </php>
+
+  <extensions>
+    <!-- Functional tests HTML output logging. -->
+    <bootstrap class="Drupal\TestTools\Extension\HtmlLogging\HtmlOutputLogger">
+      <!-- The directory where the browser output will be stored. If a relative
+        path is specified, it will be relative to the current working directory
+        of the process running the PHPUnit CLI. In CI environments, this can be
+        overridden by the value set for the "BROWSERTEST_OUTPUT_DIRECTORY"
+        environment variable.
+      -->
+      <parameter name="outputDirectory" value="sites/simpletest/browser_output"/>
+      <!-- By default browser tests print the individual links in the test run
+        report. To avoid overcrowding the output in CI environments, you can
+        set the "verbose" parameter or the "BROWSERTEST_OUTPUT_VERBOSE"
+        environment variable to "false". In GitLabCI, the output is saved
+        anyway as an artifact that can be browsed or downloaded from Gitlab.
+      -->
+      <parameter name="verbose" value="true"/>
+    </bootstrap>
+  </extensions>
+
+  <testsuites>
+    <testsuite name="profile">
+      <directory>web/profiles/contrib/localgov</directory>
+    </testsuite>
+    <testsuite name="modules">
+      <directory>web/modules/contrib/localgov_*</directory>
+    </testsuite>
+    <testsuite name="themes">
+      <directory>./web/themes/contrib/localgov_*</directory>
+    </testsuite>
+  </testsuites>
+
+</phpunit>

phpunit.xml.dist

@@ -4,6 +4,8 @@
          beStrictAboutTestsThatDoNotTestAnything="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutChangesToGlobalState="true"
+         failOnWarning="true"
+         cacheResult="false"
          printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter">
 
   <php>