AC-7422::Incompatible issues fix for PHP8.2

glo71317 · glo71317 · commit da3fa892326c · 2023-01-03T15:54:17.000+05:30
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -166,7 +166,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
 
             $internalErrors = libxml_use_internal_errors(true);
 
-            $data = html_entity_decode($data, ENT_QUOTES, 'UTF-8');
+            $data = htmlentities($data, ENT_QUOTES | ENT_IGNORE, 'UTF-8', false);
             $domDocument->loadHTML(
                 '<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'
             );
@@ -192,7 +192,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                 }
             }
 
-            $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+            $result = htmlspecialchars_decode($domDocument->saveHTML(), ENT_QUOTES);
             preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
             $data = !empty($matches) ? $matches[1] : '';
         }
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -113,7 +113,7 @@ 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);
                 return !empty($matches) ? $matches[1] : '';
             } else {
@@ -346,6 +346,7 @@ public function escapeCss($string)
      * @param string $quote
      * @return string|array
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -366,6 +367,7 @@ public function escapeJsQuote($data, $quote = '\'')
      * @param string $data
      * @return string
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeXssInUrl($data)
     {
@@ -414,6 +416,7 @@ private function escapeScriptIdentifiers(string $data): string
      * @param bool $addSlashes
      * @return string
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -428,6 +431,7 @@ public function escapeQuote($data, $addSlashes = false)
      *
      * @return \Magento\Framework\ZendEscaper
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     private function getEscaper()
     {
@@ -443,6 +447,7 @@ private function getEscaper()
      *
      * @return \Psr\Log\LoggerInterface
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     private function getLogger()
     {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`166`	`166`
`167`	`167`	`$internalErrors = libxml_use_internal_errors(true);`
`168`	`168`
`169`		`- $data = html_entity_decode($data, ENT_QUOTES, 'UTF-8');`
	`169`	`+ $data = htmlentities($data, ENT_QUOTES \| ENT_IGNORE, 'UTF-8', false);`
`170`	`170`	`$domDocument->loadHTML(`
`171`	`171`	`'<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'`
`172`	`172`	`);`
`@@ -192,7 +192,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`- $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');`
	`195`	`+ $result = htmlspecialchars_decode($domDocument->saveHTML(), ENT_QUOTES);`
`196`	`196`	`preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);`
`197`	`197`	`$data = !empty($matches) ? $matches[1] : '';`
`198`	`198`	`}`