From 784ee657e6de64f9eb4b0d748c23c754c8778137 Mon Sep 17 00:00:00 2001
From: catch <catch56@gmail.com>
Date: Fri, 28 Oct 2022 10:35:59 +0100
Subject: [PATCH] Issue #3279289 by rizzie, claudiu.cristea, Berdir, cilefen:
file_requirements() can trigger a PHP 8.1 deprecation notice when called
without a SERVER_SOFTWARE server env variable
---
core/modules/file/file.install | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index a975eed34b43..e2e4ce61a7c7 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -69,7 +69,9 @@ function file_requirements($phase) {
if ($phase == 'runtime') {
$description = NULL;
$implementation = file_progress_implementation();
- $server_software = \Drupal::request()->server->get('SERVER_SOFTWARE');
+ // The environment variable might be missing. Fallback to an empty string to
+ // prevent passing NULL to preg_match(), a few lines later.
+ $server_software = \Drupal::request()->server->get('SERVER_SOFTWARE', '');
// Test the web server identity.
if (preg_match("/Nginx/i", $server_software)) {
--
GitLab