Merge pull request #73 from City-of-Helsinki/UHF-9493

UHF-9493: Drupal 10.3 compatibility
City-of-Helsinki · Jun 26, 2024 · efdf8d4 · efdf8d4
2 parents 7da4688 + 8ddea06
commit efdf8d4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -14,14 +14,7 @@
     },
     "conflict": {
         "drupal/helfi_tunnistamo": "<=2.2.1",
-        "drupal/core": "<10.1"
-    },
-    "extra": {
-        "patches": {
-            "drupal/core": {
-                "[#3385550] Language negotiation breaks updating Drupal 9 to 10": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-proxy/ffbde3654e0011e237a17ea1cb3a7291685e0c30/patches/3385550.patch"
-            }
-        }
+        "drupal/core": "<10.3"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",

diff --git a/patches/3385550.patch b/patches/3385550.patch