Skip to content

Avoid lots of uncessary exceptions during layout XML merge loading #37570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 26, 2025
Merged

Avoid lots of uncessary exceptions during layout XML merge loading #37570

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ae5dba
Avoid lots of uncessary exceptions during layout XML merge loading
amenk Jun 2, 2023
7f92f20
Merge branch '2.4-develop' into avoid-xml-exceptions
engcom-Hotel Apr 25, 2025
f53a5a5
Merge branch '2.4-develop' into avoid-xml-exceptions
engcom-Dash Apr 30, 2025
155eb2c
Fixed Static Test Failures
engcom-Dash Apr 30, 2025
75d8a6c
Merge branch 'avoid-xml-exceptions' of https://github.com/amenk/magen…
engcom-Dash Apr 30, 2025
c485c1f
Added Strict Type Declaration & return type
engcom-Dash May 2, 2025
31b66a5
Merge branch '2.4-develop' into avoid-xml-exceptions
engcom-Hotel May 5, 2025
89c1980
Merge branch '2.4-develop' into avoid-xml-exceptions
engcom-Charlie Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions lib/internal/Magento/Framework/View/Model/Layout/Merge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,17 @@ protected function _loadXmlString($xmlString)
return simplexml_load_string($xmlString, \Magento\Framework\View\Layout\Element::class);
}

/**
* Return object representation of XML string, or false, if XML was invalid
*
* @param string $xmlString
* @return \SimpleXMLElement
*/
protected function _safeLoadXmlString($xmlString)
{
return simplexml_load_string($xmlString, \Magento\Framework\View\Layout\Element::class, LIBXML_NOWARNING | LIBXML_NOERROR);
}

/**
* Merge layout update by handle
*
Expand Down Expand Up @@ -988,15 +999,7 @@ public function getCacheId()
private function extractHandlers(): void
{
foreach ($this->updates as $update) {
$updateXml = null;

try {
$updateXml = is_string($update) ? $this->_loadXmlString($update) : false;
// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
} catch (\Exception $exception) {
// ignore invalid
}

$updateXml = is_string($update) ? $this->_safeLoadXmlString($update) : false;
if ($updateXml && strtolower($updateXml->getName()) == 'update' && isset($updateXml['handle'])) {
$this->addHandle((string)$updateXml['handle']);
}
Expand Down