AC-7737: Incompatible issues fix for PHP8.2, Encoding and decoding issue in mb_convert_encoding

glo17680 · glo17680 · commit 0e186a4e8906 · 2023-01-19T13:17:44.000+05:30
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -166,7 +166,13 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
 
             $internalErrors = libxml_use_internal_errors(true);
 
-//            $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
+            $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+            $data = mb_encode_numericentity(
+                $data,
+                $convmap,
+                'UTF-8'
+            );
+
             $domDocument->loadHTML(
                 '<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'
             );
@@ -191,8 +197,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                     }
                 }
             }
-
-//            $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
 
             preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -97,7 +97,12 @@ function ($errorNumber, $errorString) {
                     }
                 );
                 $data = $this->prepareUnescapedCharacters($data);
-                $string = $data; //mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
+                $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+                $string = mb_encode_numericentity(
+                    $data,
+                    $convmap,
+                    'UTF-8'
+                );
                 try {
                     $domDocument->loadHTML(
                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
@@ -114,7 +119,6 @@ function ($errorNumber, $errorString) {
                 $this->escapeText($domDocument);
                 $this->escapeAttributeValues($domDocument);
 
-//                $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
                 $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
 
                 preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
@@ -349,6 +353,7 @@ public function escapeCss($string)
      * @param string $quote
      * @return string|array
      * @deprecated 101.0.0
+     * @see MAGETWO-54971
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -369,6 +374,7 @@ public function escapeJsQuote($data, $quote = '\'')
      * @param string $data
      * @return string
      * @deprecated 101.0.0
+     * @see MAGETWO-54971
      */
     public function escapeXssInUrl($data)
     {
@@ -417,6 +423,7 @@ private function escapeScriptIdentifiers(string $data): string
      * @param bool $addSlashes
      * @return string
      * @deprecated 101.0.0
+     * @see MAGETWO-54971
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -431,6 +438,7 @@ public function escapeQuote($data, $addSlashes = false)
      *
      * @return \Magento\Framework\ZendEscaper
      * @deprecated 101.0.0
+     * @see MAGETWO-54971
      */
     private function getEscaper()
     {
@@ -446,6 +454,7 @@ private function getEscaper()
      *
      * @return \Psr\Log\LoggerInterface
      * @deprecated 101.0.0
+     * @see MAGETWO-54971
      */
     private function getLogger()
     {
