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.

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

Open
wants to merge 7 commits into
base: 2.4-develop
Choose a base branch
from
Open
Changes from all commits
Commits
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
29 changes: 18 additions & 11 deletions lib/internal/Magento/Framework/View/Model/Layout/Merge.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/
namespace Magento\Framework\View\Model\Layout;

Expand Down Expand Up @@ -564,6 +564,21 @@ 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|false
*/
protected function _safeLoadXmlString(string $xmlString): \SimpleXMLElement|false
{
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 +1003,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