AC-7422:Incompatible issues fix for PHP8.2

glo17680 · glo17680 · commit 23022c4ccba5 · 2023-01-06T17:00:42.000+05:30
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -165,8 +165,8 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
             $domDocument = $this->domDocumentFactory->create();
 
             $internalErrors = libxml_use_internal_errors(true);
-
-            $data = html_entity_decode(htmlentities($data, ENT_QUOTES, 'UTF-8'), ENT_QUOTES , 'ISO-8859-1');
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $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/Sales/Helper/AdminTest.php b/dev/tests/integration/testsuite/Magento/Sales/Helper/AdminTest.php
@@ -55,7 +55,7 @@ public function escapeHtmlWithLinksDataProvider(): array
             [
                 // @codingStandardsIgnoreStart
                 'Authorized amount of €30.00. Transaction ID: "<a target="_blank" href="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=123456789QWERTY">123456789QWERTY</a>"',
-                'Authorized amount of €30.00. Transaction ID: &quot;<a href="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&amp;id=123456789QWERTY">123456789QWERTY</a>&quot;',
+                'Authorized amount of &euro;30.00. Transaction ID: &quot;<a href="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&amp;id=123456789QWERTY">123456789QWERTY</a>&quot;',
                 // @codingStandardsIgnoreEnd
                 'allowedTags' => ['b', 'br', 'strong', 'i', 'u', 'a'],
             ],
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -21,6 +21,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -142,6 +143,7 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
             ['additional_option_key' => 'additional_option_value'],
             $newOrderItem->getProductOptionByCode('additional_options')
         );
+        Response::closeOutputBuffers(1, false);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -17,6 +17,7 @@ class Escaper
 {
     /**
      * HTML special characters flag
+     * @var $htmlSpecialCharsFlag
      */
     private $htmlSpecialCharsFlag = ENT_QUOTES | ENT_SUBSTITUTE;
 
@@ -346,6 +347,7 @@ public function escapeCss($string)
      * @param string $quote
      * @return string|array
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -366,6 +368,7 @@ public function escapeJsQuote($data, $quote = '\'')
      * @param string $data
      * @return string
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     public function escapeXssInUrl($data)
     {
@@ -414,6 +417,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 +432,7 @@ public function escapeQuote($data, $addSlashes = false)
      *
      * @return \Magento\Framework\ZendEscaper
      * @deprecated 101.0.0
+     * @see 6729b6e01368248abc33300208eb292c95050203
      */
     private function getEscaper()
     {
@@ -443,6 +448,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
`@@ -55,7 +55,7 @@ public function escapeHtmlWithLinksDataProvider(): array`
`55`	`55`	`[`
`56`	`56`	`// @codingStandardsIgnoreStart`
`57`	`57`	`'Authorized amount of €30.00. Transaction ID: "<a target="_blank" href="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=123456789QWERTY">123456789QWERTY</a>"',`
`58`		`- 'Authorized amount of €30.00. Transaction ID: "<a href="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=123456789QWERTY">123456789QWERTY</a>"',`
	`58`	`+ 'Authorized amount of €30.00. Transaction ID: "<a href="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=123456789QWERTY">123456789QWERTY</a>"',`
`59`	`59`	`// @codingStandardsIgnoreEnd`
`60`	`60`	`'allowedTags' => ['b', 'br', 'strong', 'i', 'u', 'a'],`
`61`	`61`	`],`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ class Escaper`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* HTML special characters flag`
	`20`	`+ * @var $htmlSpecialCharsFlag`
`20`	`21`	`*/`
`21`	`22`	`private $htmlSpecialCharsFlag = ENT_QUOTES \| ENT_SUBSTITUTE;`
`22`	`23`
`@@ -346,6 +347,7 @@ public function escapeCss($string)`
`346`	`347`	`* @param string $quote`
`347`	`348`	`* @return string\|array`
`348`	`349`	`* @deprecated 101.0.0`
	`350`	`+ * @see 6729b6e01368248abc33300208eb292c95050203`
`349`	`351`	`*/`
`350`	`352`	`public function escapeJsQuote($data, $quote = '\'')`
`351`	`353`	`{`
`@@ -366,6 +368,7 @@ public function escapeJsQuote($data, $quote = '\'')`
`366`	`368`	`* @param string $data`
`367`	`369`	`* @return string`
`368`	`370`	`* @deprecated 101.0.0`
	`371`	`+ * @see 6729b6e01368248abc33300208eb292c95050203`
`369`	`372`	`*/`
`370`	`373`	`public function escapeXssInUrl($data)`
`371`	`374`	`{`
`@@ -414,6 +417,7 @@ private function escapeScriptIdentifiers(string $data): string`
`414`	`417`	`* @param bool $addSlashes`
`415`	`418`	`* @return string`
`416`	`419`	`* @deprecated 101.0.0`
	`420`	`+ * @see 6729b6e01368248abc33300208eb292c95050203`
`417`	`421`	`*/`
`418`	`422`	`public function escapeQuote($data, $addSlashes = false)`
`419`	`423`	`{`
`@@ -428,6 +432,7 @@ public function escapeQuote($data, $addSlashes = false)`
`428`	`432`	`*`
`429`	`433`	`* @return \Magento\Framework\ZendEscaper`
`430`	`434`	`* @deprecated 101.0.0`
	`435`	`+ * @see 6729b6e01368248abc33300208eb292c95050203`
`431`	`436`	`*/`
`432`	`437`	`private function getEscaper()`
`433`	`438`	`{`
`@@ -443,6 +448,7 @@ private function getEscaper()`
`443`	`448`	`*`
`444`	`449`	`* @return \Psr\Log\LoggerInterface`
`445`	`450`	`* @deprecated 101.0.0`
	`451`	`+ * @see 6729b6e01368248abc33300208eb292c95050203`
`446`	`452`	`*/`
`447`	`453`	`private function getLogger()`
`448`	`454`	`{`