Merge remote-tracking branch 'origin/MC-35152' into 2.4-develop-pr32

Author: serhii-balko

app/code/Magento/Payment/Block/Transparent/Redirect.php

@@ -53,10 +53,21 @@ public function getRedirectUrl(): string
     /**
      * Returns params to be redirected.
      *
+     * Encodes invalid UTF-8 values to UTF-8 to prevent character escape error.
+     * Some payment methods like PayPal, send data in merchant defined language encoding
+     * which can be different from the system character encoding (UTF-8).
+     *
      * @return array
      */
     public function getPostParams(): array
     {
-        return (array)$this->_request->getPostValue();
+        $params = [];
+        foreach ($this->_request->getPostValue() as $name => $value) {
+            if (!empty($value) && mb_detect_encoding($value, 'UTF-8', true) === false) {
+                $value = utf8_encode($value);
+            }
+            $params[$name] = $value;
+        }
+        return $params;
     }
 }

app/code/Magento/Payment/Test/Unit/Block/Transparent/RedirectTest.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Test\Unit\Block\Transparent;
+
+use Magento\Payment\Block\Transparent\Redirect;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class RedirectTest extends TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\Context|MockObject
+     */
+    private $context;
+    /**
+     * @var \Magento\Framework\UrlInterface|MockObject
+     */
+    private $url;
+    /**
+     * @var Redirect
+     */
+    private $model;
+    /**
+     * @var \Magento\Framework\App\RequestInterface|MockObject
+     */
+    private $request;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
+        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->context->method('getRequest')
+            ->willReturn($this->request);
+        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->model = new Redirect(
+            $this->context,
+            $this->url
+        );
+    }
+
+    /**
+     * @param array $postData
+     * @param array $expected
+     * @dataProvider getPostParamsDataProvider
+     */
+    public function testGetPostParams(array $postData, array $expected): void
+    {
+        $this->request->method('getPostValue')
+            ->willReturn($postData);
+        $this->assertEquals($expected, $this->model->getPostParams());
+    }
+
+    /**
+     * @return array
+     */
+    public function getPostParamsDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'BILLTOEMAIL' => '[email protected]',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => 'Ãtienne',
+                    'BILLTOFIRSTNAME' => 'Ãillin',
+                ],
+                [
+                    'BILLTOEMAIL' => '[email protected]',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => 'Ãtienne',
+                    'BILLTOFIRSTNAME' => 'Ãillin',
+                ]
+            ],
+            [
+                [
+                    'BILLTOEMAIL' => '[email protected]',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => mb_convert_encoding('Ãtienne', 'ISO-8859-1'),
+                    'BILLTOFIRSTNAME' => mb_convert_encoding('Ãillin', 'ISO-8859-1'),
+                ],
+                [
+                    'BILLTOEMAIL' => '[email protected]',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => 'Ãtienne',
+                    'BILLTOFIRSTNAME' => 'Ãillin',
+                ]
+            ]
+        ];
+    }
+}