Merge branch 'dev' of github.com:City-of-Helsinki/drupal-helfi-etusivu into UHF-12387_tests

Author: khalima

.deprecation-ignore.txt

@@ -0,0 +1,3 @@
+# This file contains patterns to be ignored while testing for use of
+# deprecated code.
+# See https://www.drupal.org/node/3285162 for more details.

.gitattributes

@@ -48,6 +48,7 @@ core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-sp
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."
+*.avif    -text diff
 *.eot     -text diff
 *.exe     -text diff
 *.gif     -text diff

.gitignore

@@ -14,6 +14,9 @@ public/sites/backstop/
 # Ignore the folder created by PhpStorm
 .idea/*
 
+# Ignore the folder created by VS Code
+.vscode/*
+
 # Ignore local settings
 public/sites/default/local.settings.php
 public/sites/default/local.services.yml

.platform/schema

@@ -1 +1 @@
-24
+25

compose.ci.yaml

@@ -2,5 +2,5 @@ services:
   app:
     user: "1001:1001"
     environment:
-      SYMFONY_DEPRECATIONS_HELPER: disabled
+      COMPOSER_MIRROR_PATH_REPOS: 1
       BROWSERTEST_OUTPUT_DIRECTORY: /app/results

compose.yaml

@@ -6,7 +6,8 @@ services:
     volumes:
       - .:/app:delegated
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     environment:
       WEBROOT: /app/public
       STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}"
@@ -57,12 +58,17 @@ services:
       - --max_allowed_packet=512M
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_swedish_ci
+      - --skip-log-bin
     environment:
       MYSQL_DATABASE: drupal
       MYSQL_USER: drupal
       MYSQL_PASSWORD: drupal
       MYSQL_INITDB_SKIP_TZINFO: 1
       MYSQL_RANDOM_ROOT_PASSWORD: 1
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      timeout: 1s
+      retries: 30
     volumes:
       - db_volume:/var/lib/mysql
     ports:
@@ -71,10 +77,13 @@ services:
       - internal
   varnish:
     container_name: "${COMPOSE_PROJECT_NAME}-varnish"
-    image: druidfi/varnish:6-drupal
+    image: wodby/varnish:6.0
     environment:
       VARNISH_BACKEND_HOST: "${COMPOSE_PROJECT_NAME}-app"
+      VARNISH_BACKEND_PORT: 8080
       VARNISH_CACHE_STATIC_FILES: "1"
+      VARNISH_ALLOW_UNRESTRICTED_PURGE: "1"
+      VARNISH_CONFIG_PRESET: "drupal"
     depends_on:
       - app
     networks:

composer.json

@@ -11,14 +11,14 @@
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
         "drupal/consumer_image_styles": "^4.0",
-        "drupal/core-composer-scaffold": "^10|^11",
+        "drupal/core-composer-scaffold": "^11",
         "drupal/draggableviews": "^2.0",
         "drupal/hdbt": "^6.0",
         "drupal/hdbt_admin": "^3.0",
         "drupal/helfi_azure_fs": "^2.0",
         "drupal/helfi_drupal_tools": "dev-main",
         "drupal/helfi_navigation": "^2.0",
-        "drupal/helfi_platform_config": "^4.0",
+        "drupal/helfi_platform_config": "^5.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tunnistamo": "^3.0",
         "drupal/json_field": "^1.0@RC",
@@ -71,9 +71,6 @@
         "patches": {
             "drupal/draggableviews": {
                 "Save langcode as part of draggableviews data in order to sort by by weight and language": "patches/draggableviews_language.patch"
-            },
-            "drupal/scheduler": {
-                "[#UHF-12387] https://www.drupal.org/i/3458578: Fixes Uncaught TypeError: Cannot read property 'value' of null": "https://www.drupal.org/files/issues/2024-07-02/scheduler-uncaught_type_error_reading_null_on_value-3458578-2.patch"
             }
         },
         "composer-exit-on-patch-failure": true,