From 45a503ab79fefb113ef1a828e11c0a2b18a99af7 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Tue, 21 Sep 2021 15:46:53 +1000
Subject: [PATCH] Revert "Issue #3233047 by daffie, dww, longwave, Kristen Pol:
 Drupal\Core\Routing\RequestContext::fromRequest() should be returning $this"

This reverts commit ed5384acffcfdf7e3e9bda0a57c937601147f10b.
---
 core/lib/Drupal/Core/Routing/RequestContext.php | 2 --
 core/lib/Drupal/Core/Routing/UrlMatcher.php     | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/lib/Drupal/Core/Routing/RequestContext.php b/core/lib/Drupal/Core/Routing/RequestContext.php
index a92c5b9c9654..2092cbe0cf3d 100644
--- a/core/lib/Drupal/Core/Routing/RequestContext.php
+++ b/core/lib/Drupal/Core/Routing/RequestContext.php
@@ -39,8 +39,6 @@ class RequestContext extends SymfonyRequestContext {
     if (isset($GLOBALS['base_url'])) {
       $this->setCompleteBaseUrl($GLOBALS['base_url']);
     }
-
-    return $this;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Routing/UrlMatcher.php b/core/lib/Drupal/Core/Routing/UrlMatcher.php
index fdcdf68534a1..b6852824e143 100644
--- a/core/lib/Drupal/Core/Routing/UrlMatcher.php
+++ b/core/lib/Drupal/Core/Routing/UrlMatcher.php
@@ -35,7 +35,9 @@ class UrlMatcher extends BaseUrlMatcher {
 
   public function finalMatch(RouteCollection $collection, Request $request) {
     $this->routes = $collection;
-    $context = (new RequestContext())->fromRequest($request)->setContext($context);
+    $context = new RequestContext();
+    $context->fromRequest($request);
+    $this->setContext($context);
 
     return $this->match($this->currentPath->getPath($request));
   }