Merge pull request #209 from magento-gl/2.4.6-develop-sync

2.4.6 develop sync

Author: sidolov

app/code/Magento/PageBuilder/Model/Dom/Element.php

@@ -145,7 +145,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface
     public function removeStyle(string $styleProperty): string
     {
         $style = $this->getAttribute('style');
-        $this->setAttribute('style', preg_replace("/${styleProperty}:(.*?);/", '', $style ?? ''));
+        $this->setAttribute('style', preg_replace("/{$styleProperty}:(.*?);/", '', $style ?? ''));
         return $this->getAttribute('style') ?? '';
     }
 
@@ -155,7 +155,7 @@ public function removeStyle(string $styleProperty): string
     public function addStyle(string $styleProperty, string $value): string
     {
         $this->removeStyle($styleProperty);
-        $this->setAttribute('style', "${styleProperty}: $value; " . $this->getAttribute('style') ?? '');
+        $this->setAttribute('style', "{$styleProperty}: $value; " . $this->getAttribute('style') ?? '');
         return $this->getAttribute('style') ?? '';
     }
 }

app/code/Magento/PageBuilder/Model/Filter/Template.php

@@ -170,7 +170,12 @@ function ($errorNumber, $errorString) {
                 throw new DOMException($errorString, $errorNumber);
             }
         );
-        $string = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8');
+        $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+        $string = mb_encode_numericentity(
+            $html,
+            $convmap,
+            'UTF-8'
+        );
         try {
             libxml_use_internal_errors(true);
             // LIBXML_SCHEMA_CREATE option added according to this message

app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

@@ -41,11 +41,17 @@ public function __construct(
     public function filterHtml(string $content): string
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
+        $previous = '';
         try {
             //this code is required because of https://bugs.php.net/bug.php?id=60021
             $previous = libxml_use_internal_errors(true);
             $content = '<div>' . $content . '</div>';
-            $string = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+            $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+            $string = mb_encode_numericentity(
+                $content,
+                $convmap,
+                'UTF-8'
+            );
             $dom->loadHTML($string, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
         } catch (\Exception $e) {
             $this->loggerInterface->critical($e->getMessage());

app/code/Magento/PageBuilder/composer.json

@@ -22,7 +22,7 @@
         "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
         "php": "~8.1.0||~8.2.0",
-        "phpgt/dom": "2.2.3"
+        "phpgt/dom": "^2.2"
     },
     "suggest": {
         "magento/module-review": "*"