Skip to content
Snippets Groups Projects
Verified Commit 8749104b authored by Jess's avatar Jess
Browse files

Issue #3226334 by albertosilva, pauger, xjm, smustgrave, K3vin_nl, krisahil:...

Issue #3226334 by albertosilva, pauger, xjm, smustgrave, K3vin_nl, krisahil: PathAliasManager could not find the alias by the internal path

(cherry picked from commit 9cc7cfaa)
parent 7447663e
Branches
Tags
14 merge requests!8506Draft: Issue #3456536 by ibrahim tameme,!5646Issue #3350972 by nod_: [random test failure]...,!5600Issue #3350972 by nod_: [random test failure]...,!5343Issue #3305066 by quietone, Rename RedirectLeadingSlashesSubscriber,!3603#ISSUE 3346218 Add a different message on edit comment,!3555Issue #2473873: Views entity operations lack cacheability support, resulting in incorrect dropbuttons,!3494Issue #3327018 by Spokje, longwave, xjm, mondrake: Update PHPStan to 1.9.3 and...,!3410Issue #3340128: UserLoginForm::submitForm has some dead code,!3389Issue #3325184 by Spokje, andypost, xjm, smustgrave: $this->configFactory is...,!3381Issue #3332363: Refactor Claro's menus-and-lists stylesheet,!3307Issue #3326193: CKEditor 5 can grow past the viewport when there is a lot of content,!3236Issue #3332419: Refactor Claro's messages stylesheet,!3231Draft: Issue #3049525 by longwave, fougere, larowlan, kim.pepper, AaronBauman, Wim...,!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28
...@@ -221,7 +221,7 @@ public function getAliasByPath($path, $langcode = NULL) { ...@@ -221,7 +221,7 @@ public function getAliasByPath($path, $langcode = NULL) {
if (!empty($this->preloadedPathLookups[$langcode])) { if (!empty($this->preloadedPathLookups[$langcode])) {
$this->lookupMap[$langcode] = $this->pathAliasRepository->preloadPathAlias($this->preloadedPathLookups[$langcode], $langcode); $this->lookupMap[$langcode] = $this->pathAliasRepository->preloadPathAlias($this->preloadedPathLookups[$langcode], $langcode);
// Keep a record of paths with no alias to avoid querying twice. // Keep a record of paths with no alias to avoid querying twice.
$this->noAlias[$langcode] = array_flip(array_diff_key($this->preloadedPathLookups[$langcode], array_keys($this->lookupMap[$langcode]))); $this->noAlias[$langcode] = array_flip(array_diff($this->preloadedPathLookups[$langcode], array_keys($this->lookupMap[$langcode])));
} }
} }
......
...@@ -259,7 +259,14 @@ public function testGetAliasByPathCachedMatch() { ...@@ -259,7 +259,14 @@ public function testGetAliasByPathCachedMatch() {
$language = $this->setUpCurrentLanguage(); $language = $this->setUpCurrentLanguage();
$cached_paths = [$language->getId() => [$path]]; // Use a set of cached paths where the tested path is in any position, not
// only in the first one.
$cached_paths = [
$language->getId() => [
'/another/path',
$path,
],
];
$this->cache->expects($this->once()) $this->cache->expects($this->once())
->method('get') ->method('get')
->with($this->cacheKey) ->with($this->cacheKey)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment