Skip to content

Commit cdefb91

Browse files
committed
Fix layout xml and page layout caching issue on redis cluster under high load
-Fixed static tests
1 parent b65ff72 commit cdefb91

File tree

1 file changed

+5
-1
lines changed
  • lib/internal/Magento/Framework/View/Model/Layout

1 file changed

+5
-1
lines changed

lib/internal/Magento/Framework/View/Model/Layout/Merge.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ public function getHandles()
293293

294294
/**
295295
* Add the first existing (declared in layout updates) page handle along with all parents to the update.
296+
*
296297
* Return whether any page handles have been added or not.
297298
*
298299
* @param string[] $handlesToTry
@@ -325,6 +326,8 @@ public function pageHandleExists($handleName)
325326
}
326327

327328
/**
329+
* Page layout type
330+
*
328331
* @return string|null
329332
*/
330333
public function getPageLayout()
@@ -617,7 +620,7 @@ protected function _fetchDbLayoutUpdates($handle)
617620
*/
618621
public function validateUpdate($handle, $updateXml)
619622
{
620-
return;
623+
return null;
621624
}
622625

623626
/**
@@ -945,6 +948,7 @@ public function getScope()
945948
public function getCacheId()
946949
{
947950
$layoutCacheKeys = $this->layoutCacheKey->getCacheKeys();
951+
// phpcs:ignore Magento2.Security.InsecureFunction
948952
return $this->generateCacheId(md5(implode('|', array_merge($this->getHandles(), $layoutCacheKeys))));
949953
}
950954
}

0 commit comments

Comments
 (0)