Merge branch 'develop' into release-versions/v3.5.0

Author: berliner

.docksal/docksal.yml

@@ -1,4 +1,4 @@
-version: "2.1"
+version: "3.9"
 
 services:
   cli:
@@ -23,13 +23,16 @@ services:
 
   browser:
     hostname: browser
-    image: seleniarm/standalone-chromium:latest
+    # image: seleniarm/standalone-chromium:latest
+    image: seleniarm/standalone-chromium:103.0
     volumes:
       # Workaround to avoid the browser crashing inside a docker container
       # See https://github.com/SeleniumHQ/docker-selenium#quick-start
       - /tmp:/dev/shm
     environment:
       - JAVA_OPTS=-Dwebdriver.chrome.whitelistedIps=
+    ports:
+      - 5903:5903
 
   snap:
     image: public.ecr.aws/unocha/tools-snap-service:v3.0.4

.github/tests/docker-compose.yml

@@ -58,6 +58,8 @@ services:
       - ENVIRONMENT=dev
       - NGINX_SERVERNAME=ghi-test-site,localhost,127.0.0.1
       - NGINX_OVERRIDE_PROTOCOL=HTTP,ghi-test-site,localhost,127.0.0.1
+      - NGINX_LIMIT_BOTS=2000r/m
+      - NGINX_LIMIT_HUMANS=2000r/s
       - DRUSH_OPTIONS_URI=http://ghi-test-site
       - DRUPAL_DB_DATABASE=ghi
       - DRUPAL_DB_USERNAME=ghi
@@ -71,6 +73,23 @@ services:
       - DTT_BASE_URL=http://127.0.0.1
       - SYMFONY_DEPRECATIONS_HELPER=disabled
     ports:
-    - "8081:80"
+      - "8081:80"
     networks:
       - default
+
+  browser:
+    hostname: ghi-test-browser
+    container_name: ghi-test-browser
+    # image: seleniarm/standalone-chromium:103.0
+    image: selenium/standalone-chrome:103.0
+    shm_size: 2gb
+    volumes:
+      # Workaround to avoid the browser crashing inside a docker container
+      # See https://github.com/SeleniumHQ/docker-selenium#quick-start
+      - /tmp:/dev/shm
+    environment:
+      - JAVA_OPTS=-Dwebdriver.chrome.whitelistedIps=
+    ports:
+      - "7900:7900"
+    networks:
+      - default

.github/tests/test.sh

@@ -34,12 +34,12 @@ docker-compose -f .github/tests/docker-compose.yml exec -T drupal mkdir -p /srv/
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/simpletest/browser_output
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/simpletest/browser_output
-docker-compose -f .github/tests/docker-compose.yml exec -T -u appuser -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/tmp -e BROWSERTEST_OUTPUT_BASE_URL=http://127.0.0.1:8081 -e DTT_BASE_URL=http://127.0.0.1 -e SIMPLETEST_BASE_URL=http://127.0.0.1 -e SIMPLETEST_DB=mysql://ghi:ghi@mysql/ghi drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug -c /srv/www
+docker-compose -f .github/tests/docker-compose.yml exec -T -u appuser -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/tmp -e BROWSERTEST_OUTPUT_BASE_URL=http://ghi-test-site:8081 -e DTT_BASE_URL=http://ghi-test-site -e SIMPLETEST_BASE_URL=http://ghi-test-site -e SIMPLETEST_DB=mysql://ghi:ghi@mysql/ghi drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug -c /srv/www
 
 # Show logs.
 echo "Show logs."
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal drush watchdog:show
 
-# # Remove the image.
+# Remove the image.
 echo "Remove the test image"
 docker-compose -f .github/tests/docker-compose.yml down -v

composer.json

@@ -76,6 +76,7 @@
         "drupal/core-recommended": "^10",
         "drupal/ctools": "^3.7",
         "drupal/editor_advanced_link": "^2.2",
+        "drupal/entity_access_password": "^1.0",
         "drupal/field_group": "^3.1",
         "drupal/fpa": "^4.0.0",
         "drupal/gin": "^3.0-beta5",
@@ -162,7 +163,8 @@
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
             "oomphinc/composer-installers-extender": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {