Skip to content

Commit 29fa2b7

Browse files
DuttonMaDuttonMa
authored
Merge pull request #99 from dof-dss/uat
Production Release
2 parents 9ebeacd + a07e121 commit 29fa2b7

File tree

281 files changed

+6758
-1007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+6758
-1007
lines changed

‎.circleci/config.yml‎

Lines changed: 43 additions & 361 deletions
Large diffs are not rendered by default.

‎.circleci/phpstan.neon‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# phpstan.neon
2+
3+
parameters:
4+
fileExtensions:
5+
- module
6+
- theme
7+
- inc
8+
- install
9+
- profile
10+
- engine
11+
paths:
12+
- src
13+
disallowedFunctionCalls:
14+
- function: var_dump
15+
message: 'This is likely not intended to be used outside of local development, please remove it.'
16+
- function: dump
17+
message: 'This is likely not intended to be used outside of local development, please remove it.'
18+
- function: kint
19+
message: 'This is likely not intended to be used outside of local development, please remove it.'
20+
- function: ksm
21+
message: 'This is likely not intended to be used outside of local development, please remove it.'
22+
- function: die
23+
message: 'This is likely not intended to be used outside of local development, please remove it.'
24+
- function: exit
25+
message: 'This is likely not intended to be used outside of local development, please remove it.'
26+
customRulesetUsed: true
27+
reportUnmatchedIgnoredErrors: false
28+
# Ignore phpstan-drupal extension's rules.
29+
ignoreErrors:
30+
- '#\Drupal calls should be avoided in classes, use dependency injection instead#'
31+
- '#Plugin definitions cannot be altered.#'
32+
- '#Missing cache backend declaration for performance.#'
33+
- '#Plugin manager has cache backend specified but does not declare cache tags.#'

‎.circleci/workflow-config.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
version: 2.1
2+
3+
workflows:
4+
build-test:
5+
when:
6+
and:
7+
- not:
8+
equal: [ development, << pipeline.git.branch >> ]
9+
- not:
10+
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
11+
- not:
12+
equal: [ api, << pipeline.trigger_source >> ]
13+
jobs:
14+
- build:
15+
php_version: << pipeline.parameters.php_version >>
16+
ssh_fingerprint: << pipeline.parameters.ssh_fingerprint >>
17+
- coding_standards:
18+
requires:
19+
- build
20+
php_version: << pipeline.parameters.php_version >>
21+
coding_standards_dirs: << pipeline.parameters.coding_standards_dirs >>
22+
ignore_dirs: << pipeline.parameters.ignore_dirs >>
23+
- deprecated_code:
24+
requires:
25+
- build
26+
php_version: << pipeline.parameters.php_version >>
27+
deprecated_code_dirs: << pipeline.parameters.deprecated_code_dirs >>
28+
- disallowed_functions:
29+
requires:
30+
- build
31+
php_version: << pipeline.parameters.php_version >>
32+
custom_code_dirs: << pipeline.parameters.custom_code_dirs >>
33+
build-edge:
34+
when:
35+
and:
36+
- equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
37+
- equal: [ edge_build, << pipeline.schedule.name >> ]
38+
jobs:
39+
- unity_edge_build:
40+
edge_branch: << pipeline.parameters.edge_branch >>
41+
edge_build_dofdss_packages: << pipeline.parameters.edge_build_dofdss_packages >>
42+
node_version: << pipeline.parameters.node_version >>
43+
php_version: << pipeline.parameters.php_version >>
44+
build-edge-finalise:
45+
when:
46+
and:
47+
- equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
48+
- equal: [ edge_build_finalise, << pipeline.schedule.name >> ]
49+
jobs:
50+
- unity_sync_data:
51+
edge_branch: << pipeline.parameters.edge_branch >>
52+
php_version: << pipeline.parameters.php_version >>

‎.ddev/commands/web/phpcs‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
#!/usr/bin/env bash
22

3-
## Description: Execute local PHPCS static analysis checks in the current directory and non contrib modules and themes.
4-
## Usage: phpcs
5-
## Example: "ddev phpcs"
3+
## Description: Execute local PHPCS static analysis checks.
4+
## Usage: phpcs [directory]
5+
## Example: "ddev phpcs" or "ddev phpcs web/modules/custom"
66
## HostWorkingDir: true
77

8-
/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"
8+
DRUPAL_DEPLOY_PATH="/var/www/html"
9+
IGNORE="/web/themes/origins/node_modules,/web/themes/custom/nicsdru_unity_theme/node_modules"
10+
11+
# If an argument is provided, use it; otherwise, use the current working directory
12+
if [ -n "$1" ]; then
13+
PHPCS_CHECK_DIR="$1"
14+
else
15+
PHPCS_CHECK_DIR="."
16+
fi
17+
18+
${DRUPAL_DEPLOY_PATH}/phpcs.sh "${DRUPAL_DEPLOY_PATH}" "${PHPCS_CHECK_DIR}" "${IGNORE}"

‎.platform/routes.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# original repository.Any changes here will be overwritten when the project #
66
# is built. #
77
#############################################################################
8-
'https://www.legalcommissioner-ni.org.uk.{default}/':
8+
'https://www.legalcommissioner-ni.org.uk/':
99
type: upstream
1010
upstream: 'unity_svr_4:http'
1111
cache:
1212
enabled: 'false'
13-
'https://legalcommissioner-ni.org.uk.{default}/':
13+
'https://legalcommissioner-ni.org.uk/':
1414
type: redirect
15-
to: 'https://www.legalcommissioner-ni.org.uk.{default}/'
15+
to: 'https://www.legalcommissioner-ni.org.uk/'
1616
'https://www.nicswell.co.uk/':
1717
type: upstream
1818
upstream: 'unity_svr_4:http'
@@ -21,14 +21,14 @@
2121
'https://nicswell.co.uk/':
2222
type: redirect
2323
to: 'https://www.nicswell.co.uk/'
24-
'https://www.autismreviewer-ni.org.uk/':
24+
'https://www.autismreviewer-ni.org.uk.{default}/':
2525
type: upstream
2626
upstream: 'unity_svr_4:http'
2727
cache:
2828
enabled: 'false'
29-
'https://autismreviewer-ni.org.uk/':
29+
'https://autismreviewer-ni.org.uk.{default}/':
3030
type: redirect
31-
to: 'https://www.autismreviewer-ni.org.uk/'
31+
to: 'https://www.autismreviewer-ni.org.uk.{default}/'
3232
'https://www.{all}/':
3333
type: upstream
3434
upstream: 'unity_svr_4:http'

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
| Site | ID | URL | Status | Default |
44
| --- | --- | --- | --- | --- |
5-
| Legal Commissioner NI | legalcommissionerni | legalcommissioner-ni.org.uk | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) | ![#e8f5e9](https://placehold.co/80x30/c8e6c9/1b5e20.png?text=Yes&font=source-sans-pro) |
5+
| Legal Commissioner NI | legalcommissionerni | legalcommissioner-ni.org.uk | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) | |
66
| NICSwell | nicswell | nicswell.co.uk | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) | |
7-
| NI | autismreviewerni | autismreviewer-ni.org.uk | ![#fff3e0](https://placehold.co/140x30/ffe0b2/e65100.png?text=Development&font=source-sans-pro) | |
8-
Last updated: 03/07/2025 13:28
7+
| Autism Reviewer NI | autismreviewerni | autismreviewer-ni.org.uk | ![#e8f5e9](https://placehold.co/140x30/c8e6c9/1b5e20.png?text=Production&font=source-sans-pro) | ![#e8f5e9](https://placehold.co/80x30/c8e6c9/1b5e20.png?text=Yes&font=source-sans-pro) |
8+
Last updated: 18/08/2025 13:18

‎composer.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
"drupal/seven": "^1.0",
140140
"drupal/shs": "^2.0@RC",
141141
"drupal/simplei": "^2.1",
142+
"drupal/sitemap": "^2.0",
142143
"drupal/slick": "2.9.0",
143144
"drupal/slick_views": "2.7.0",
144145
"drupal/smart_date": "^4.1",
@@ -204,7 +205,8 @@
204205
"Fix getSetting() error on translated migrations": "https://www.drupal.org/files/issues/2018-07-08/2984460-3.patch",
205206
"Fix for reference error on unpublished nodes on Entity Queue": "https://www.drupal.org/files/issues/2024-04-16/2845144-95.patch",
206207
"Menu revision langcode bug fix": "https://www.drupal.org/files/issues/2024-05-13/menu_revision_langcode-3446877.patch",
207-
"Fix to $form.ajaxSubmit is not a function": "https://git.drupalcode.org/project/drupal/-/merge_requests/6052.diff"
208+
"Fix to $form.ajaxSubmit is not a function": "https://git.drupalcode.org/project/drupal/-/merge_requests/6052.diff",
209+
"DateList and date range inline form errors are repeated": "https://www.drupal.org/files/issues/2020-01-30/2827034-35.patch"
208210
},
209211
"drupal/easy_install": {
210212
"Handle missing core version": "https://www.drupal.org/files/issues/2019-12-19/easy_install_core_version-3101883-0.patch",

‎composer.lock‎

Lines changed: 91 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)