Merge branch 'release/24.11.0'

.circleci/config.yml

@@ -57,7 +57,7 @@ aliases:
       # This container has all the necessary tools to run a dockerized environment.
       # @see https://github.com/drevops/ci-runner
       # @see https://hub.docker.com/repository/docker/drevops/ci-runner/tags
-      - image: drevops/ci-runner:24.10.0
+      - image: drevops/ci-runner:24.11.0
         auth:
           username: ${VORTEX_CONTAINER_REGISTRY_USER}
           password: ${VORTEX_CONTAINER_REGISTRY_PASS}
@@ -267,6 +267,10 @@ jobs:
               if [ -n \"${GITHUB_TOKEN:-}\" ]; then export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"${GITHUB_TOKEN-}\"}}'; fi && \
               COMPOSER_MEMORY_LIMIT=-1 composer --ansi install --prefer-dist"
 
+      - run:
+          name: Validate Composer configuration normalised
+          command: docker compose exec -T cli composer normalize --dry-run || [ "${VORTEX_CI_COMPOSER_NORMALIZE_IGNORE_FAILURE:-0}" -eq 1 ]
+
       - run:
           name: Lint code with PHPCS
           command: docker compose exec -T cli vendor/bin/phpcs || [ "${VORTEX_CI_PHPCS_IGNORE_FAILURE:-0}" -eq 1 ]

.docker/clamav.dockerfile

@@ -9,7 +9,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/commons/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons
-FROM uselagoon/commons:24.9.0 as commons
+FROM uselagoon/commons:24.10.0 AS commons
 
 FROM clamav/clamav:1.4.1
 

.docker/cli.dockerfile

@@ -6,7 +6,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.3-cli-drupal:24.9.0
+FROM uselagoon/php-8.3-cli-drupal:24.10.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

.docker/mariadb.dockerfile

@@ -8,7 +8,7 @@
 # @see https://github.com/drevops/mariadb-drupal-data
 #
 # The ARG value will be updated with a value passed from docker-compose.yml
-ARG IMAGE=uselagoon/mariadb-10.11-drupal:24.9.0
+ARG IMAGE=uselagoon/mariadb-10.11-drupal:24.10.0
 
 # hadolint ignore=DL3006
 FROM ${IMAGE}

.docker/nginx-drupal.dockerfile

@@ -9,7 +9,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal
-FROM uselagoon/nginx-drupal:24.9.0
+FROM uselagoon/nginx-drupal:24.10.0
 
 # Webroot is used for Nginx docroot configuration.
 ARG WEBROOT=web

.docker/php.dockerfile

@@ -10,7 +10,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
-FROM uselagoon/php-8.3-fpm:24.9.0
+FROM uselagoon/php-8.3-fpm:24.10.0
 
 RUN apk add --no-cache tzdata
 

.docker/solr.dockerfile

@@ -5,7 +5,7 @@ FROM ${CLI_IMAGE} as cli
 
 # @see https://hub.docker.com/r/uselagoon/solr-8/tags
 # @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile
-FROM uselagoon/solr-8:24.9.0
+FROM uselagoon/solr-8:24.10.0
 
 # Solr Jump-start config needs to be manually copied from search_api_solr module
 # /app/docroot/modules/contrib/search_api_solr/jump-start/solr8/config-set.

.github/workflows/build-test-deploy.yml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: drevops/ci-runner:24.10.0
+      image: drevops/ci-runner:24.11.0
 
       env:
         TZ: Australia/Melbourne
@@ -147,7 +147,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: drevops/ci-runner:24.10.0
+      image: drevops/ci-runner:24.11.0
 
       env:
         TZ: Australia/Melbourne
@@ -239,6 +239,10 @@ jobs:
             if [ -n \"${GITHUB_TOKEN:-}\" ]; then export COMPOSER_AUTH='{\"github-oauth\": {\"github.com\": \"${GITHUB_TOKEN-}\"}}'; fi && \
             COMPOSER_MEMORY_LIMIT=-1 composer --ansi install --prefer-dist"
 
+      - name: Validate Composer configuration normalised
+        run: docker compose exec -T cli composer normalize --dry-run
+        continue-on-error: ${{ vars.VORTEX_CI_COMPOSER_NORMALIZE_IGNORE_FAILURE == '1' }}
+
       - name: Lint code with PHPCS
         run: docker compose exec -T cli vendor/bin/phpcs
         continue-on-error: ${{ vars.VORTEX_CI_PHPCS_IGNORE_FAILURE == '1' }}
@@ -338,7 +342,7 @@ jobs:
     #;> !PROVISION_USE_PROFILE
 
     container:
-      image: drevops/ci-runner:24.10.0
+      image: drevops/ci-runner:24.11.0
       env:
         TZ: Australia/Melbourne
         TERM: xterm-256color

.github/workflows/renovate.yml

@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.2.2
 
       - uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.1.0
 
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v40.3.1
+        uses: renovatebot/github-action@v40.3.4
         with:
           configurationFile: renovate.json
           token: ${{ secrets.RENOVATE_TOKEN }}

.github/workflows/vortex-test-common.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: drevops/ci-runner:24.10.0
+      image: drevops/ci-runner:24.11.0
       env:
         # Prevent GitHub overriding the Docker config.
         DOCKER_CONFIG: /root/.docker
@@ -89,7 +89,7 @@ jobs:
         batch: [0, 1, 2]
 
     container:
-      image: drevops/ci-runner:24.10.0
+      image: drevops/ci-runner:24.11.0
       env:
         # Prevent GitHub overriding the Docker config.
         DOCKER_CONFIG: /root/.docker
@@ -141,7 +141,7 @@ jobs:
         batch: [0, 1]
 
     container:
-      image: drevops/ci-runner:24.10.0
+      image: drevops/ci-runner:24.11.0
       env:
         # Prevent GitHub overriding the Docker config.
         DOCKER_CONFIG: /root/.docker

.vortex/docs/.utils/variables/extra/ci.variables.sh

@@ -15,6 +15,9 @@ VORTEX_CI_HADOLINT_IGNORE_FAILURE=0
 # Ignore `composer validate` failures.
 VORTEX_CI_COMPOSER_VALIDATE_IGNORE_FAILURE=0
 
+# Ignore `composer normalize` failures.
+VORTEX_CI_COMPOSER_NORMALIZE_IGNORE_FAILURE=0
+
 # Ignore PHPCS failures.
 VORTEX_CI_PHPCS_IGNORE_FAILURE=0
 

.vortex/docs/content/drupal/settings.mdx

@@ -50,7 +50,7 @@ Available constants include:
 - `ENVIRONMENT_LOCAL`
 - `ENVIRONMENT_CI`
 - `ENVIRONMENT_PROD`
-- `ENVIRONMENT_TEST`
+- `ENVIRONMENT_STAGE`
 - `ENVIRONMENT_DEV`
 
 These are later used to set `$settings['environment']` variable, which can be

.vortex/docs/content/workflows/variables.mdx

@@ -300,6 +300,14 @@ Default value: `UNDEFINED`
 
 Defined in: `CI config`
 
+### `VORTEX_CI_COMPOSER_NORMALIZE_IGNORE_FAILURE`
+
+Ignore `composer normalize` failures.
+
+Default value: `UNDEFINED`
+
+Defined in: `CI config`
+
 ### `VORTEX_CI_COMPOSER_VALIDATE_IGNORE_FAILURE`
 
 Ignore `composer validate` failures.

.vortex/tests/.yamllint-for-gha.yml

@@ -1,9 +1,12 @@
-# Yamllint configuration file used to check GitHub Actions configuration files. 
+# Yamllint configuration file used to check GitHub Actions configuration files.
 extends: default
 
 rules:
+  comments-indentation: false
   comments:
     min-spaces-from-content: 1
+    # Disable to support Vortex's internal comments like `#;<` and `#;>`.
+    require-starting-space: false
   document-start:
     present: false
   empty-lines:

.vortex/tests/bats/fixtures/docker-compose.env.json

@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",

.vortex/tests/bats/fixtures/docker-compose.env_local.json

@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",

.vortex/tests/bats/fixtures/docker-compose.env_mod.json

@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",

.vortex/tests/bats/fixtures/docker-compose.noenv.json

@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",

composer.json

@@ -20,6 +20,7 @@
         "drupal/redis": "^1.8",
         "drupal/search_api": "^1.35",
         "drupal/search_api_solr": "^4.3",
+        "drupal/seckit": "^2.0",
         "drupal/shield": "^1.8",
         "drupal/stage_file_proxy": "^2.1",
         "drush/drush": "^13",
@@ -36,7 +37,7 @@
         "drupal/core-dev": "~10.3.2",
         "drupal/drupal-extension": "^5",
         "ergebnis/composer-normalize": "^2.43",
-        "mglaman/phpstan-drupal": "^1.2",
+        "mglaman/phpstan-drupal": "^1.3",
         "palantirnet/drupal-rector": "^0.20",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.15",

docker-compose.yml

@@ -155,7 +155,7 @@ services:
       context: .
       dockerfile: .docker/mariadb.dockerfile
       args:
-        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:24.9.0}" # Use custom database image (if defined) or fallback to standard database image.
+        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:24.10.0}" # Use custom database image (if defined) or fallback to standard database image.
     <<: *default-user
     environment:
       <<: *default-environment
@@ -168,7 +168,7 @@ services:
 
   #;< REDIS
   redis:
-    image: uselagoon/redis-6:24.9.0
+    image: uselagoon/redis-6:24.10.0
     #;< LAGOON
     labels:
       lagoon.type: redis # Change to 'none' if dedicated Redis service is used. See https://docs.lagoon.sh/using-lagoon-advanced/service-types/
@@ -201,6 +201,7 @@ services:
     build:
       context: .
       dockerfile: .docker/clamav.dockerfile
+    platform: linux/amd64
     ports:
       - "3310" # Find port on host with `docker compose port clamav 3310`.
     environment:
@@ -217,7 +218,7 @@ services:
 
   # Chrome container, used for browser testing.
   chrome:
-    image: selenium/standalone-chromium:129.0
+    image: selenium/standalone-chromium:130.0
     ports:
       - "7900" # Find port on host with `docker compose port chrome 7900`.
     shm_size: '1gb' # Increase '/dev/shm' partition size to avoid browser crashing.

gherkinlint.json

@@ -1,7 +1,8 @@
 {
     "rules": {
         "indentation": {
-            "width": 2
+            "width": 2,
+            "literalBlock": 3
         },
         "keyword-order": {
             "enabled": false

phpstan.neon

@@ -26,9 +26,6 @@ parameters:
     - ../*/vendor/*
     - ../*/node_modules/*
 
-  drupal:
-    drupal_root: web
-
   ignoreErrors:
     -
       # Since tests and data providers do not have to have parameter docblocks,

scripts/custom/provision-10-example.sh

@@ -34,7 +34,7 @@ if echo "${VORTEX_PROVISION_ENVIRONMENT:-}" | grep -q -e dev -e test -e ci -e lo
   drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect shield stage_file_proxy
 
   #;< REDIS
-  drush pm:install redis
+  drush pm:install redis || true
   #;> REDIS
 
   #;< CLAMAV

scripts/vortex/login.sh

@@ -25,9 +25,9 @@ drush() { ./vendor/bin/drush -y "$@"; }
 
 if [ "${DRUPAL_UNBLOCK_ADMIN:-}" = "1" ]; then
   if drush pm:list --status=enabled | grep -q password_policy; then
-    drush sql:query 'UPDATE `user__field_password_expiration` SET `field_password_expiration_value` = 0 WHERE `bundle` = "user" AND `entity_id` = 1;'
+    drush sql:query 'UPDATE `user__field_password_expiration` SET `field_password_expiration_value` = 0 WHERE `bundle` = "user" AND `entity_id` = 1;' >/dev/null
   fi
-  drush sql:query "SELECT name FROM \`users_field_data\` WHERE \`uid\` = '1';" | head -n 1 | xargs drush -- user:unblock
+  drush sql:query "SELECT name FROM \`users_field_data\` WHERE \`uid\` = '1';" | head -n 1 | xargs drush -- user:unblock 2>/dev/null
 fi
 
 drush user:login