AC-7422:Incompatible issues fix for PHP8.2

glo17680 · glo17680 · commit fcd19290e7fa · 2023-01-05T20:22:16.000+05:30
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -166,7 +166,8 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
 
             $internalErrors = libxml_use_internal_errors(true);
 
-            $data = htmlentities($data, ENT_QUOTES | ENT_IGNORE, 'UTF-8', false);
+            $data = html_entity_decode(htmlentities($data, ENT_QUOTES, 'UTF-8'), ENT_QUOTES , 'ISO-8859-1');
+
             $domDocument->loadHTML(
                 '<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'
             );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/MultiStoreCurrencyTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/MultiStoreCurrencyTest.php
@@ -56,7 +56,7 @@ public function testMultiStoreRenderPrice(): void
 
         $this->reloadProductPriceInfo();
         $this->localeResolver->setLocale('uk_UA');
-        $this->assertProductStorePrice('simple2', '240,00 ₴', 'fixturestore');
+        $this->assertProductStorePrice('simple2', '240,00 ', 'fixturestore');
     }
 
     /**
@@ -80,7 +80,7 @@ public function testMultiStoreRenderSpecialPrice(): void
 
         $this->reloadProductPriceInfo();
         $this->localeResolver->setLocale('uk_UA');
-        $this->assertProductStorePrice('simple', 'Special Price 143,76 ₴ Regular Price 240,00 ₴', 'fixturestore');
+        $this->assertProductStorePrice('simple', 'Special Price 143,76  Regular Price 240,00 ', 'fixturestore');
     }
 
     /**
@@ -111,7 +111,7 @@ public function testMultiStoreRenderTierPrice(): void
         $this->localeResolver->setLocale('uk_UA');
         $this->assertProductStorePrice(
             'simple-product-tax-none',
-            'Buy 2 for 960,00 ₴ each and save 80%',
+            'Buy 2 for 960,00  each and save 80%',
             'fixturestore',
             self::TIER_PRICE_BLOCK_NAME
         );
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -16,7 +16,7 @@
 class Escaper
 {
     /**
-     * @var ENT_QUOTES | ENT_SUBSTITUTE
+     * HTML special characters flag
      */
     private $htmlSpecialCharsFlag = ENT_QUOTES | ENT_SUBSTITUTE;
 
@@ -96,7 +96,7 @@ function ($errorNumber, $errorString) {
                     }
                 );
                 $data = $this->prepareUnescapedCharacters($data);
-                $string = html_entity_decode($data, ENT_QUOTES, 'UTF-8');
+                $string = @iconv("UTF-8","ISO-8859-1//IGNORE", $data);
                 try {
                     $domDocument->loadHTML(
                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
@@ -346,7 +346,6 @@ public function escapeCss($string)
      * @param string $quote
      * @return string|array
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -367,7 +366,6 @@ public function escapeJsQuote($data, $quote = '\'')
      * @param string $data
      * @return string
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeXssInUrl($data)
     {
@@ -416,7 +414,6 @@ private function escapeScriptIdentifiers(string $data): string
      * @param bool $addSlashes
      * @return string
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -431,7 +428,6 @@ public function escapeQuote($data, $addSlashes = false)
      *
      * @return \Magento\Framework\ZendEscaper
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     private function getEscaper()
     {
@@ -447,7 +443,6 @@ private function getEscaper()
      *
      * @return \Psr\Log\LoggerInterface
      * @deprecated 101.0.0
-     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     private function getLogger()
     {
