From 26182e85db668de5f27a9ef058c9abd1dfcb9adb Mon Sep 17 00:00:00 2001
From: catch <catch56@gmail.com>
Date: Fri, 21 Oct 2022 08:07:59 +0100
Subject: [PATCH] Issue #3256356 by mstrelan, tstoeckler: Update browser test
 Xdebug integration for Xdebug 3

(cherry picked from commit 428d60ecad066000f92f0f8dcdfcc6e51164975e)
---
 core/tests/Drupal/Tests/XdebugRequestTrait.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/tests/Drupal/Tests/XdebugRequestTrait.php b/core/tests/Drupal/Tests/XdebugRequestTrait.php
index 48c19a6c7c26..f56a47f2e52c 100644
--- a/core/tests/Drupal/Tests/XdebugRequestTrait.php
+++ b/core/tests/Drupal/Tests/XdebugRequestTrait.php
@@ -31,7 +31,10 @@ protected function extractCookiesFromRequest(Request $request) {
     }
     // For CLI requests, the information is stored in $_SERVER.
     $server = $request->server;
-    if ($server->has('XDEBUG_CONFIG')) {
+    if ($server->has('XDEBUG_SESSION')) {
+      $cookies['XDEBUG_SESSION'][] = $server->get('XDEBUG_SESSION');
+    }
+    elseif ($server->has('XDEBUG_CONFIG')) {
       // $_SERVER['XDEBUG_CONFIG'] has the form "key1=value1 key2=value2 ...".
       $pairs = explode(' ', $server->get('XDEBUG_CONFIG'));
       foreach ($pairs as $pair) {
-- 
GitLab