Merge pull request #972 from UN-OCHA/develop

v2.21.0

.docksal/docksal-local.env

@@ -1 +1,3 @@
 MYSQL_PORT_MAPPING='3380:3306'
+XDEBUG_ENABLED=1
+XDEBUG_MODE=coverage

.docksal/docksal.env

@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=html
 DB_IMAGE="docksal/mariadb:10.6"
-CLI_IMAGE='docksal/cli:php8.2-build'
+CLI_IMAGE='docksal/cli:php8.3-build'

.docksal/etc/mysql/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+innodb_force_recovery=0

.docksal/etc/php/php.ini

@@ -1,2 +1 @@
-; Mail settings
-sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025 --read-envelope-from'
+xdebug.mode=coverage

.github/workflows/run-tests.yml

@@ -137,7 +137,7 @@ jobs:
             docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files /srv/www/html/sites/default/private
             docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/build/logs
             docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs
-            docker compose -f tests/docker-compose.yml exec -T -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e DTT_BASE_URL=http://127.0.0.1 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
+            docker compose -f tests/docker-compose.yml exec -T -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e SIMPLETEST_BASE_URL=http://127.0.0.1 -e DTT_BASE_URL=http://127.0.0.1 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
             docker cp "$(docker compose -f tests/docker-compose.yml ps -q drupal)":/srv/www/html/build/logs/clover.xml .
         env:
           fail-fast: true

PATCHES/openid_connect_windows_aad-3346603-5.patch

@@ -1,8 +1,8 @@
 diff --git a/src/Plugin/OpenIDConnectClient/WindowsAad.php b/src/Plugin/OpenIDConnectClient/WindowsAad.php
-index 8845843..6431581 100644
+index 88d4853..ac36baf 100644
 --- a/src/Plugin/OpenIDConnectClient/WindowsAad.php
 +++ b/src/Plugin/OpenIDConnectClient/WindowsAad.php
-@@ -318,7 +318,7 @@ as the mapping between Azure AD accounts and Drupal users.<br/>
+@@ -329,7 +329,7 @@ as the mapping between Azure AD accounts and Drupal users.<br/>
        case 2:
          $v2 = str_contains($endpoints['token'], '/oauth2/v2.0/');
          if (!$v2) {

composer.json

@@ -85,6 +85,7 @@
         "unocha/gtm_barebones": "^1.1",
         "unocha/ocha_ai": "^1.7",
         "unocha/ocha_content_classification": "^1.0",
+        "unocha/ocha_entraid": "^1.0",
         "unocha/ocha_monitoring": "^1.0",
         "webflo/drupal-finder": "^1.2.2"
     },
@@ -109,6 +110,7 @@
     "prefer-stable": true,
     "config": {
         "bin-dir": "vendor/bin/",
+        "discard-changes": true,
         "sort-packages": true,
         "allow-plugins": {
             "composer/installers": true,