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

Issue #3436478 by longwave: Use regex instead of DOM parsing in BigPipe::getPlaceholderOrder()

merge-requests/7242/head
catch 2024-03-28 21:18:11 +00:00
parent 8f28c48da1
commit f21fe22563
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/big_pipe/src/Render/BigPipe.php
View File

@ -700,7 +700,9 @@ EOF;
/**
* Gets the BigPipe placeholder order.
*
* Determines the order in which BigPipe placeholders are executed.
* Determines the order in which BigPipe placeholders are executed. It is
* safe to use a regular expression here as the HTML is statically created in
* \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy::createBigPipeJsPlaceholder().
*
* @param string $html
* HTML markup.
@ -718,13 +720,10 @@ EOF;
* first occurrence.
*/
protected function getPlaceholderOrder($html, $placeholders) {
$placeholder_ids = [];
$dom = Html::load($html);
$xpath = new \DOMXPath($dom);
foreach ($xpath->query('//span[@data-big-pipe-placeholder-id]') as $node) {
$placeholder_ids[] = Html::escape($node->getAttribute('data-big-pipe-placeholder-id'));
if (preg_match_all('/<span data-big-pipe-placeholder-id="([^"]*)">/', $html, $matches)) {
return array_unique($matches[1]);
}
return array_unique($placeholder_ids);
return [];
}
/**