D8UN-2926

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 # Default docker image.
 default_docker_image: &docker_image
   docker:
-    - image: thecodingmachine/php:8.1-v4-apache-node14
+    - image: thecodingmachine/php:8.1-v4-apache
       environment:
         PLATFORM_REGION: "uk-1.platform.sh"
         PROJECT_ROOT: "/home/docker/project"
@@ -12,18 +12,7 @@ default_docker_image: &docker_image
         PHP_INI_MEMORY_LIMIT: -1
         PHP_INI_MAX_EXECUTION_TIME: 60
         PHP_INI_MAX_INPUT_TIME: 60
-custom_npm_docker_image: &custom_npm_docker_image
-  docker:
-    - image: thecodingmachine/php:8.1-v4-apache-node14
-      environment:
-        PLATFORM_REGION: "uk-1.platform.sh"
-        PROJECT_ROOT: "/home/docker/project"
-        PHP_EXTENSIONS: "gd"
-        # git variables to avoid empty committer identity errors
-        EMAIL: "circleci@localhost"
-        GIT_COMMITTER_NAME: "Circle CI"
-        GIT_AUTHOR_NAME: "Circle CI"
-        EDGE_BUILD_BRANCH: "edge"
+        CPPFLAGS: "-DPNG_ARM_NEON_OPT=0"
 
 # Re-usable commands.
 commands:
@@ -68,9 +57,10 @@ commands:
       - run:
           name: Switch dof-dss packages to HEAD on development branch
           command: |
-            composer require dof-dss/nicsdru_unity_theme:dev-development \
-              dof-dss/nicsdru_origins_modules:dev-development \
-                dof-dss/nicsdru_unity_modules:dev-development
+            composer require dof-dss/nicsdru_unity_theme:dev-10.x-dev \
+              dof-dss/nicsdru_origins_modules:dev-10.x-dev \
+              dof-dss/nicsdru_unity_modules:dev-10.x-dev \
+              dof-dss/nicsdru_unity_profile:dev-10.x-dev
   install_psh_cli:
     description: "Install the Platform.sh CLI tool"
     steps:
@@ -132,6 +122,18 @@ jobs:
             CHECK_DIRS="$CHECK_DIRS ${PROJECT_ROOT}/web/modules/origins"
             vendor/bin/drupal-check $CHECK_DIRS
 
+  disallowed_functions:
+    <<: *docker_image
+    steps:
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Check for disallowed function calls
+          command: |
+            CHECK_DIRS="${PROJECT_ROOT}/web/modules/custom"
+            CHECK_DIRS="$CHECK_DIRS ${PROJECT_ROOT}/web/modules/origins"
+            vendor/bin/phpstan analyse $CHECK_DIRS -c .circleci/phpstan.neon
+
   check_illegal_updates:
     <<: *docker_image
     steps:
@@ -160,23 +162,26 @@ jobs:
 
   # Nightly edge build
   edge_build:
-    <<: *custom_npm_docker_image
+    <<: *docker_image
     environment:
       # git variables to avoid empty committer identity errors
       EMAIL: "circleci@localhost"
       GIT_COMMITTER_NAME: "Circle CI"
       GIT_AUTHOR_NAME: "Circle CI"
       EDGE_BUILD_BRANCH: "edge"
       PLATFORM_REGION: "uk-1.platform.sh"
+      CPPFLAGS: "-DPNG_ARM_NEON_OPT=0"
+      NODE_VERSION: 14.21.3
     steps:
       - hosts_keyscan
       - checkout_code
       - run:
           name: Add OS and PHP extensions
           command: |
-            curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+            touch ~/.bashrc
+            curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
             sudo apt update --allow-releaseinfo-change
-            sudo apt install libjpeg-dev make python g++ dh-autoreconf -y
+            sudo apt install libjpeg-dev make python3 g++ dh-autoreconf -y
       - install_psh_cli
       - run:
           name: Switch to edge branch
@@ -187,41 +192,19 @@ jobs:
           command: |
             git add composer.*
             git commit -m "Set dof-dss packages to HEAD development for build"
-      - run:
-          name: Download nvm in order to select legacy node version (using nvm)
-          command: |
-            # Need to re-build site theme with any Unity changes.
-            # Download and configure node and npm.
-            git clone https://github.com/nvm-sh/nvm.git
-            cd nvm
-            chmod +x install.sh
-            ./install.sh
       - run:
           name: Rebuild site themes
           command: |
             export NVM_DIR="$HOME/.nvm"
             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
             [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-            nvm install v15.14.0
-            for site in `ls -l ~/project/project/sites | grep ^d | awk '{print $9}'`
-            do
-              if [[ -d ~/project/project/sites/${site}/themes/${site}_theme ]]; then
-                echo "*** Building theme for ${site} ***"
-                cd ~/project/project/sites/${site}/themes/${site}_theme
-                sed -i -e "s/\"nicsdru_unity_theme.*/\"nicsdru_unity_theme\": \"github:dof-dss\/nicsdru_unity_theme#development\",/" package.json
-                npm install
-                npm rebuild node-sass
-                npm run build
-
-                git add *.css
-                git commit -m "Theme rebuild"
-              else
-                echo "No theme folder detected under ~/project/project/sites/${site}/themes/${site}_theme, skipping."
-              fi
-            done
-
+            cd $PROJECT_ROOT
+            ./build-themes.sh --sites-dir $PROJECT_ROOT/project/sites
             # Push to fixed, non-integrating build branch. GitHub webhook integration will propagate this
             # to platform.sh for later steps to use.
+            cd $PROJECT_ROOT
+            git add *.css
+            git commit -m "Theme rebuild"
             git push -f origin $EDGE_BUILD_BRANCH
 
   # Separate task to allow us to sync data on PSH environments, without pauses in other jobs.
@@ -259,7 +242,7 @@ jobs:
             do
               result=$(platform drush "st -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Drupal bootstrap : Successful" || true) )
               if [[ -n $result ]]; then
-                result2=$(platform drush "pml -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Fastly (fastly)" || true) )
+                result2=$(platform drush "pml --status=enabled -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Fastly (fastly)" || true) )
                 if [[ -n $result2 ]]; then
                   echo "***** Uninstall Fastly - ${site} *****"
                   platform drush "pmu fastly -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
@@ -292,26 +275,6 @@ jobs:
                 platform drush "bulk_update_qa_accounts enable -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
               fi
             done
-      #- run:
-      #    name: Purge and rebuild Solr indexes
-      #    command: |
-      #      for site in `ls -l ~/project/project/sites | grep ^d | awk '!/default/{print $9}'`
-      #      do
-      #        result=$(platform drush "st -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Drupal bootstrap : Successful" || true) )
-      #        if [[ -n $result ]]; then
-      #          result2=$(platform drush "pml --status=enabled -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "solr" || true) )
-      #          if [[ -n $result2 ]]; then
-      #            echo "***** Purge Solr index for - ${site} *****"
-      #            platform ssh -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH \
-      #              "curl http://${site}_solr.internal:8080/solr/${site}_index/update --data '<delete><query>*:*</query></delete>' -H 'Content-type:text/xml; charset=utf-8' \
-      #                && curl http://${site}_solr.internal:8080/solr/${site}_index/update --data '<commit/>' -H 'Content-type:text/xml; charset=utf-8'"
-      #            echo "***** Rebuild the Solr index for - ${site} *****"
-      #            platform drush "sapi-c -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
-      #            platform drush "sapi-r -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
-      #            platform drush "sapi-i -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
-      #          fi
-      #        fi
-      #      done
   # Checks to ensure that Unity Base has not been polluted with project files.
   unity_base_checks:
     <<: *docker_image
@@ -342,9 +305,12 @@ workflows:
       - deprecated_code:
           requires:
             - build
-      - check_illegal_updates:
+      - disallowed_functions:
           requires:
             - build
+#      - check_illegal_updates:
+#          requires:
+#            - build
 
   # A nightly build of the project, using all dof-dss packages at HEAD from development branch.
   nightly-edge-build:

.circleci/phpstan.neon

@@ -0,0 +1,33 @@
+# phpstan.neon
+
+parameters:
+  fileExtensions:
+    - module
+    - theme
+    - inc
+    - install
+    - profile
+    - engine
+  paths:
+    - src
+  disallowedFunctionCalls:
+    - function: var_dump
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: dump
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: kint
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: ksm
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: die
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: exit
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+  customRulesetUsed: true
+  reportUnmatchedIgnoredErrors: false
+  # Ignore phpstan-drupal extension's rules.
+  ignoreErrors:
+    - '#\Drupal calls should be avoided in classes, use dependency injection instead#'
+    - '#Plugin definitions cannot be altered.#'
+    - '#Missing cache backend declaration for performance.#'
+    - '#Plugin manager has cache backend specified but does not declare cache tags.#'

.ddev/.env.sample

@@ -0,0 +1,33 @@
+# SAFE ENV VARS, RELEVANT FOR LOCAL DEVELOPMENT.
+CONFIG_READONLY=0
+DB_HOST=db
+DB_USER=db
+DB_PASS=db
+DB_NAME=db
+DB_PREFIX=
+DB_PORT=3306
+DB_NAMESPACE=Drupal\Core\Database\Driver\mysql
+DB_DRIVER=mysql
+SIMPLEI_ENV_COLOUR=#637C16
+SIMPLEI_ENV_NAME=Local
+
+# SENSITIVE ENV VARS. KEYS ONLY.
+CONFIG_SYNC_DIRECTORY=/var/www/html/project/config
+FILE_PRIVATE_PATH=/private
+HASH_SALT=
+NW_TEST_USER_PREFIX=
+TEST_USER=
+TEST_PASS=
+TEST_D7_URL=
+STAGE_FILE_PROXY_ORIGIN=
+
+# SENSITIVE PLATFORM.SH
+PLATFORM_PROJECT=vnetibjd44moa
+PLATFORM_ENVIRONMENT=main
+# The recommended way to authenticate to Platform.SH is to add your token to the web environment section in your
+# global ddev configuration at USER_ROOT/.ddev/global_config.yaml
+#
+# web_environment:
+#   - PLATFOMRSH_CLI_TOKEN= < Not recommended. See .env.sample for info >
+#
+# Alternatively you can add the token directly to your env vars of this file.

.ddev/addon-metadata/ddev-cron/manifest.yaml

@@ -0,0 +1,10 @@
+name: ddev-cron
+repository: ddev/ddev-cron
+version: 1.8.0
+install_date: "2024-08-21T14:49:07+01:00"
+project_files:
+    - web-build/Dockerfile.ddev-cron
+    - web-build/cron.conf
+    - web-build/time.cron.example
+global_files: []
+removal_actions: []

.ddev/addon-metadata/redis/manifest.yaml

@@ -0,0 +1,16 @@
+name: redis
+repository: ddev/ddev-redis
+version: v1.2.1
+install_date: "2024-07-22T16:01:41+01:00"
+project_files:
+    - docker-compose.redis.yaml
+    - redis/scripts/settings.ddev.redis.php
+    - redis/scripts/setup-drupal-settings.sh
+    - redis/redis.conf
+    - commands/redis/redis-cli
+global_files: []
+removal_actions:
+    - |
+      #ddev-nodisplay
+      #ddev-description:Remove redis settings for Drupal 9+ if applicable
+      rm -f "${DDEV_APPROOT}/${DDEV_DOCROOT}/sites/default/settings.ddev.redis.php"

.ddev/addon-metadata/solr/manifest.yaml

@@ -0,0 +1,10 @@
+name: solr
+repository: ddev/ddev-drupal-solr
+version: v1.2.3
+install_date: "2024-08-21T11:49:40+01:00"
+project_files:
+    - solr/conf
+    - solr/docker-entrypoint-initdb.d/solr-configupdate.sh
+    - docker-compose.solr.yaml
+global_files: []
+removal_actions: []

.ddev/commands/.gitattributes

@@ -0,0 +1,5 @@
+# #ddev-generated
+# Everything in the commands directory needs LF line-endings
+# Not CRLF as from Windows.
+# bash especially just can't cope if it finds CRLF in a script.
+* -text eol=lf

.ddev/commands/db/README.txt

@@ -0,0 +1,5 @@
+#ddev-generated
+Scripts in this directory will be executed inside the db
+container. A number of environment variables are supplied to the scripts.
+
+See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided for a list of environment variables.

.ddev/commands/host/README.txt

@@ -0,0 +1,6 @@
+#ddev-generated
+Scripts in this directory will be executed on the host
+but they can take easily take action on containers by using
+`ddev exec`.
+
+See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided for a list of environment variables that can be used in the scripts.

.ddev/commands/host/solrtail.example

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+## #ddev-generated
+## Description: Tail the main solr log
+## Usage: solrtail
+## Example: ddev solrtail
+
+# This can't work unless you have a solr service,
+# See https://ddev.readthedocs.io/en/stable/users/extend/additional-services/
+
+ddev exec -s solr tail -40lf /opt/solr/server/logs/solr.log

.ddev/commands/redis/redis-cli

@@ -0,0 +1,7 @@
+#!/bin/bash
+#ddev-generated
+## Description: Run redis-cli inside the redis container
+## Usage: redis-cli [flags] [args]
+## Example: "ddev redis-cli KEYS *" or "ddev redis-cli INFO" or "ddev redis-cli --version"
+
+redis-cli -p 6379 -h redis $@

.ddev/commands/solr/README.txt

@@ -0,0 +1,15 @@
+#ddev-generated
+Scripts in this directory will be executed inside the solr
+container (if it exists, of course). This is just an example,
+but any named service can have a directory with commands.
+
+Note that /mnt/ddev_config must be mounted into the 3rd-party service
+with a stanza like this in the docker-compose.solr.yaml:
+
+    volumes:
+      - type: "bind"
+        source: "."
+        target: "/mnt/ddev_config"
+
+
+See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided for a list of environment variables that can be used in the scripts.

.ddev/commands/solr/solr

@@ -0,0 +1,3 @@
+#!/bin/bash
+#ddev-generated
+solr "$@"

.ddev/commands/solr/solr-zk

@@ -0,0 +1,3 @@
+#!/bin/bash
+#ddev-generated
+solr zk -z localhost:9983 "$@"

.ddev/commands/solr/solrtail.example

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+## #ddev-generated
+## Description: Tail the main solr log
+## Usage: solrtail
+## Example: ddev solrtail
+
+# This example runs inside the solr container.
+# Note that this requires that /mnt/ddev_config be mounted
+# into the solr container and of course that you have a container
+# named solr.
+
+tail -f /opt/solr/server/logs/solr.log

.ddev/commands/web/README.txt

@@ -0,0 +1,4 @@
+#ddev-generated
+Scripts in this directory will be executed inside the web container.
+
+See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided for a list of environment variables that can be used in the scripts.

.ddev/commands/web/drupal-check

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+## Description: Run drupal-check in the current directory to detect deprecated code and ensure future compliance.
+## Usage: drupal-check
+## Aliases: drck
+## Example: "ddev <drupal-check|drck>"
+## HostWorkingDir: true
+
+/var/www/html/vendor/bin/drupal-check --memory-limit=256M ./

.ddev/commands/web/phpcs

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+## Description: Execute local PHPCS static analysis checks in the current directory and non contrib modules and themes.
+## Usage: phpcs
+## Example: "ddev phpcs"
+## HostWorkingDir: true
+
+/var/www/html/phpcs.sh ./ "/var/www/html" "/var/www/html/web/modules/origins /var/www/html/web/modules/custom /var/www/html/web/themes/custom"