From 6210a5caafd6aae1ada063dca9a40ce52be850df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 24 Jun 2024 13:11:56 +0300
Subject: [PATCH 1/2] UHF-9493: Removed Language negotiation patch from D10.3.

---
 composer.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 68b0093..825f954 100644
--- 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",

From 8ddea06b5088815b5a4b9a5c38a70f0127daf8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 24 Jun 2024 13:52:14 +0300
Subject: [PATCH 2/2] UHF-9493: Removed the patch file as well.

---
 patches/3385550.patch | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 patches/3385550.patch

diff --git a/patches/3385550.patch b/patches/3385550.patch
deleted file mode 100644
index 57d6f3e..0000000
--- a/patches/3385550.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
-index 133604df1b314ef54d054fbddaf81b2fe0e4b220..917e591171fb61076e8b3236bbb77855b54ebe31 100644
---- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
-+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
-@@ -130,10 +130,7 @@ public function processOutbound($path, &$options = [], Request $request = NULL,
-     }
-     $languages = array_flip(array_keys($this->languageManager->getLanguages()));
-     // Language can be passed as an option, or we go for current URL language.
--    if (!isset($options['language']) || ($options['language'] instanceof LanguageInterface && in_array($options['language']->getId(), [
--      LanguageInterface::LANGCODE_NOT_SPECIFIED,
--      LanguageInterface::LANGCODE_NOT_APPLICABLE,
--    ]))) {
-+    if (!isset($options['language']) || ($options['language'] instanceof LanguageInterface && $options['language']->getId() == LanguageInterface::LANGCODE_NOT_SPECIFIED)) {
-       $language_url = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_URL);
-       $options['language'] = $language_url;
-     }