From ed5384acffcfdf7e3e9bda0a57c937601147f10b Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Tue, 21 Sep 2021 15:04:09 +1000
Subject: [PATCH] Issue #3233047 by daffie, dww, longwave, Kristen Pol:
Drupal\Core\Routing\RequestContext::fromRequest() should be returning $this
---
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 2092cbe0cf3d..a92c5b9c9654 100644
--- a/core/lib/Drupal/Core/Routing/RequestContext.php
+++ b/core/lib/Drupal/Core/Routing/RequestContext.php
@@ -39,6 +39,8 @@ public function fromRequest(Request $request) {
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 b6852824e143..fdcdf68534a1 100644
--- a/core/lib/Drupal/Core/Routing/UrlMatcher.php
+++ b/core/lib/Drupal/Core/Routing/UrlMatcher.php
@@ -35,9 +35,7 @@ public function __construct(CurrentPathStack $current_path) {
public function finalMatch(RouteCollection $collection, Request $request) {
$this->routes = $collection;
- $context = new RequestContext();
- $context->fromRequest($request);
- $this->setContext($context);
+ $context = (new RequestContext())->fromRequest($request)->setContext($context);
return $this->match($this->currentPath->getPath($request));
}
--
GitLab