Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #3233047 by daffie, dww, longwave, Kristen Pol: Drupal\Core\Routing\RequestContext::fromRequest() should be returning $this" 

This reverts commit ed5384acff.
merge-requests/1158/merge
Lee Rowlands 2021-09-21 15:46:53 +10:00
parent ed5384acff
commit 45a503ab79
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Routing/RequestContext.php
View File

@ -39,8 +39,6 @@ class RequestContext extends SymfonyRequestContext {
if (isset($GLOBALS['base_url'])) {
$this->setCompleteBaseUrl($GLOBALS['base_url']);
}
return $this;
}
/**

4
core/lib/Drupal/Core/Routing/UrlMatcher.php
View File

@ -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));
}