Merge branch 'release/drupal-11'

Author: martinyde

.docker/templates/default.conf.template

@@ -89,7 +89,7 @@ server {
     # Define which paths to protect
     location ~ ^/(flag/flag|admin|user/login) {
         # Block bots on these paths only
-        if ($http_user_agent ~* (bot|crawler|spider|scraper)) {
+        if ($http_user_agent ~* (bot|crawl|crawler|spider|scraper)) {
             return 403;
         }
 

CHANGELOG.md

@@ -6,6 +6,15 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [4.16.2] - 2026-04-16
+
+* [PR-629](https://github.com/itk-dev/deltag.aarhus.dk/pull/629)
+  * Update drupal core to 11.3
+  * Update additional modules
+  * Update config to match d11
+* [PR-638](https://github.com/itk-dev/deltag.aarhus.dk/pull/638)
+  Changed flags templates to use html button instead of anchor tag.
+
 ## [4.16.1] - 2026-03-23
 
 * [PR-640](https://github.com/itk-dev/deltag.aarhus.dk/pull/640)
@@ -700,6 +709,7 @@ Updated drupal core 8.6.16
 Initial release
 
 [Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.16.1...HEAD
+[4.16.1]: https://github.com/itk-dev/hoeringsportal/compare/4.16.1...4.16.2
 [4.16.1]: https://github.com/itk-dev/hoeringsportal/compare/4.16.0...4.16.1
 [4.16.0]: https://github.com/itk-dev/hoeringsportal/compare/4.15.2...4.16.0
 [4.15.2]: https://github.com/itk-dev/hoeringsportal/compare/4.15.1...4.15.2

composer.json

@@ -25,10 +25,9 @@
         "drupal/color_field": "^3.0",
         "drupal/config_ignore": "^3.2",
         "drupal/config_import_locale": "^2.0",
-        "drupal/core": "^10.0",
-        "drupal/core-composer-scaffold": "^10.0",
-        "drupal/core-project-message": "^10.0",
-        "drupal/core-recommended": "^10.0",
+        "drupal/core-composer-scaffold": "^11.1",
+        "drupal/core-project-message": "^11.1",
+        "drupal/core-recommended": "^11.1",
         "drupal/csv_serialization": "^4.0",
         "drupal/ds": "^3.1",
         "drupal/editor_advanced_link": "^2.2",
@@ -61,12 +60,12 @@
         "drupal/redirect": "^1.6",
         "drupal/search_api": "^1.37",
         "drupal/search_autocomplete": "^4.0",
-        "drupal/site_status_message": "^2.0",
+        "drupal/site_status_message": "^2.1",
         "drupal/svg_image": "^3.2",
         "drupal/svg_sanitizer": "^2.0",
         "drupal/textfield_counter": "^2.5",
         "drupal/token_filter": "^2.1",
-        "drupal/toolbar_visibility": "dev-3435073-automated-drupal-11#2b0a7e687bdef04e80a0a765a8e6eb8f7b846d03",
+        "drupal/toolbar_visibility": "dev-project-update-bot-only",
         "drupal/twig_extensions": "^2.5",
         "drupal/twig_tweak": "^3.2",
         "drupal/upgrade_status": "^4.3",
@@ -92,132 +91,140 @@
     },
     "require-dev": {
         "drupal/content_fixtures": "^3.2",
-        "drupal/core-dev": "^10.0",
+        "drupal/core-dev": "^11.1",
         "drupal/masquerade": "^2.0",
-        "drupal/webprofiler": "^10.3",
+        "drupal/webprofiler": "^11.1",
         "ergebnis/composer-normalize": "^2.44",
         "itk-dev/drupal_translation_extractor": "^1.0",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan-deprecation-rules": "^1.1",
-        "vincentlanglet/twig-cs-fixer": "^2.6"
+        "vincentlanglet/twig-cs-fixer": "^3.13"
     },
     "conflict": {
         "drupal/drupal": "*"
     },
     "repositories": {
         "drupal": {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8",
             "exclude": [
                 "drupal/pluginformalter",
                 "drupal/toolbar_visibility"
-            ]
+            ],
+            "type": "composer",
+            "url": "https://packages.drupal.org/8"
         },
         "asset-packagist": {
             "type": "composer",
             "url": "https://asset-packagist.org"
         },
+        "itk-dev/serviceplatformen": {
+            "type": "vcs",
+            "url": "https://github.com/itk-dev/serviceplatformen.git"
+        },
+        "itk-dev/itk_pretix": {
+            "type": "vcs",
+            "url": "https://github.com/itk-dev/itk_pretix.git"
+        },
         "drupal/hoeringsportal_data": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_data",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_data": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_data"
         },
         "drupal/hoeringsportal_deskpro": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_deskpro",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_deskpro": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_deskpro"
         },
         "drupal/hoeringsportal_dialogue": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_dialogue",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_dialogue": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_dialogue"
         },
         "drupal/hoeringsportal_audit_log": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_audit_log",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_audit_log": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_audit_log"
         },
         "drupal/hoeringsportal_openid_connect": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_openid_connect",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_openid_connect": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_openid_connect"
         },
         "drupal/hoeringsportal_citizen_proposal": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_citizen_proposal",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_citizen_proposal": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_citizen_proposal"
         },
         "drupal/hoeringsportal_citizen_proposal_archiving": {
-            "type": "path",
-            "url": "web/modules/custom/hoeringsportal_citizen_proposal_archiving",
             "options": {
                 "symlink": false,
                 "versions": {
                     "drupal/hoeringsportal_citizen_proposal_archiving": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/modules/custom/hoeringsportal_citizen_proposal_archiving"
         },
         "// @see web/modules/contrib/search_autocomplete/readme.md": {
-            "type": "package",
             "package": {
                 "name": "cure53/dompurify",
-                "type": "drupal-library",
-                "version": "3.0.3",
                 "source": {
+                    "reference": "3.0.3",
                     "type": "git",
-                    "url": "https://github.com/cure53/DOMPurify.git",
-                    "reference": "3.0.3"
-                }
-            }
+                    "url": "https://github.com/cure53/DOMPurify.git"
+                },
+                "type": "drupal-library",
+                "version": "3.0.3"
+            },
+            "type": "package"
         },
         "deskpro/deskpro-api-client-php": {
-            "type": "package",
             "package": {
-                "name": "deskpro/deskpro-api-client-php",
-                "type": "library",
-                "version": "4.1.0",
                 "autoload": {
                     "psr-0": {
                         "Deskpro\\": "src/"
                     }
                 },
+                "name": "deskpro/deskpro-api-client-php",
                 "source": {
+                    "reference": "hotfix/change-psr-log-dependency",
                     "type": "git",
-                    "url": "https://github.com/itk-dev/deskpro-api-client-php.git",
-                    "reference": "hotfix/change-psr-log-dependency"
-                }
-            }
+                    "url": "https://github.com/itk-dev/deskpro-api-client-php.git"
+                },
+                "type": "library",
+                "version": "4.1.0"
+            },
+            "type": "package"
         },
         "0": {
             "type": "git",
@@ -313,12 +320,8 @@
             },
             "drupal/core": {
                 "Text format wrapper does not take description_display into account (https://www.drupal.org/project/drupal/issues/2421445#comment-14328645)": "https://www.drupal.org/files/issues/2021-12-03/2421445-18_0.patch",
-                "Fix validation bug https://www.drupal.org/project/drupal/issues/3210319": "https://www.drupal.org/files/issues/2021-04-23/validate-reference-constraint-3210319-3.patch",
                 "Add an Autowire trait for plugins (https://www.drupal.org/project/drupal/issues/3294266)": "https://www.drupal.org/files/issues/2023-08-18/3294266-24.patch"
             },
-            "drupal/site_status_message": {
-                "Add cache support (https://www.drupal.org/project/site_status_message/issues/3497218)": "https://git.drupalcode.org/project/site_status_message/-/merge_requests/8.diff"
-            },
             "vincentlanglet/twig-cs-fixer": {
                 "Drupal's trans tag has an optional plural tag which conflicts with the trans tag from Symfony's Twig bridge (cf. https://github.com/VincentLanglet/Twig-CS-Fixer/pull/134#issuecomment-1756924889)": "patches/vincentlanglet/twig-cs-fixer/token-parser.patch"
             }