From 1052cac609b2cb30c385c90240a70a35e6c2be6e Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Mon, 27 Sep 2021 09:38:44 +1000
Subject: [PATCH] Issue #3239285 by alexpott: Passing request headers to string
functions causes deprecations in PHP 8.1
---
core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php | 2 +-
.../src/Controller/AggregatorTestRssController.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
index 55fb7b64ac82..bd61dab1dc7e 100644
--- a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
+++ b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
@@ -58,7 +58,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $install_
}
asort($select_options);
$request = Request::createFromGlobals();
- $browser_langcode = UserAgent::getBestMatchingLangcode($request->server->get('HTTP_ACCEPT_LANGUAGE'), $browser_options);
+ $browser_langcode = UserAgent::getBestMatchingLangcode($request->server->get('HTTP_ACCEPT_LANGUAGE', ''), $browser_options);
$form['langcode'] = [
'#type' => 'select',
'#title' => 'Choose language',
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php
index af53a43ea068..d7903ec5f091 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php
@@ -32,8 +32,8 @@ public function testFeed($use_last_modified, $use_etag, Request $request) {
$last_modified = strtotime('Sun, 19 Nov 1978 05:00:00 GMT');
$etag = Crypt::hashBase64($last_modified);
- $if_modified_since = strtotime($request->server->get('HTTP_IF_MODIFIED_SINCE'));
- $if_none_match = stripslashes($request->server->get('HTTP_IF_NONE_MATCH'));
+ $if_modified_since = strtotime($request->server->get('HTTP_IF_MODIFIED_SINCE', ''));
+ $if_none_match = stripslashes($request->server->get('HTTP_IF_NONE_MATCH', ''));
// Send appropriate response. We respond with a 304 not modified on either
// etag or on last modified.
--
GitLab