AC-7422: Incompatible issues fix for PHP8.2

sidolov · sidolov · commit 8d58014bd76e · 2023-01-10T14:22:48.000-06:00
--revert escaper changes
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -165,9 +165,8 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
             $domDocument = $this->domDocumentFactory->create();
 
             $internalErrors = libxml_use_internal_errors(true);
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            $data = html_entity_decode(htmlentities($data, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'ISO-8859-1');
 
+            $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
             $domDocument->loadHTML(
                 '<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'
             );
@@ -193,7 +192,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                 }
             }
 
-            $result = htmlspecialchars_decode($domDocument->saveHTML(), ENT_QUOTES);
+            $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
             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
@@ -17,7 +17,7 @@ class Escaper
 {
     /**
      * HTML special characters flag
-     * @var $htmlSpecialCharsFlag
+     * @var int
      */
     private $htmlSpecialCharsFlag = ENT_QUOTES | ENT_SUBSTITUTE;
 
@@ -97,7 +97,7 @@ function ($errorNumber, $errorString) {
                     }
                 );
                 $data = $this->prepareUnescapedCharacters($data);
-                $string = @iconv("UTF-8", "ISO-8859-1//IGNORE", $data);
+                $string = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
                 try {
                     $domDocument->loadHTML(
                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
@@ -114,7 +114,7 @@ function ($errorNumber, $errorString) {
                 $this->escapeText($domDocument);
                 $this->escapeAttributeValues($domDocument);
 
-                $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
+                $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
                 preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
                 return !empty($matches) ? $matches[1] : '';
             } else {
@@ -347,7 +347,6 @@ public function escapeCss($string)
      * @param string $quote
      * @return string|array
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -368,7 +367,6 @@ public function escapeJsQuote($data, $quote = '\'')
      * @param string $data
      * @return string
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeXssInUrl($data)
     {
@@ -417,7 +415,6 @@ private function escapeScriptIdentifiers(string $data): string
      * @param bool $addSlashes
      * @return string
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -432,7 +429,6 @@ public function escapeQuote($data, $addSlashes = false)
      *
      * @return \Magento\Framework\ZendEscaper
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     private function getEscaper()
     {
@@ -448,7 +444,6 @@ 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
`@@ -165,9 +165,8 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`165`	`165`	`$domDocument = $this->domDocumentFactory->create();`
`166`	`166`
`167`	`167`	`$internalErrors = libxml_use_internal_errors(true);`
`168`		`- // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`169`		`- $data = html_entity_decode(htmlentities($data, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'ISO-8859-1');`
`170`	`168`
	`169`	`+ $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');`
`171`	`170`	`$domDocument->loadHTML(`
`172`	`171`	`'<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'`
`173`	`172`	`);`
`@@ -193,7 +192,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`193`	`192`	`}`
`194`	`193`	`}`
`195`	`194`
`196`		`- $result = htmlspecialchars_decode($domDocument->saveHTML(), ENT_QUOTES);`
	`195`	`+ $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');`
`197`	`196`	`preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);`
`198`	`197`	`$data = !empty($matches) ? $matches[1] : '';`
`199`	`198`	`}`