Merge remote-tracking branch 'origin/MC-42280' into 2.4-develop-pr60

Author: Serhii Balko

app/code/Magento/Sales/Helper/Guest.php

@@ -276,9 +276,20 @@ private function compareStoredBillingDataWithInput(Order $order, array $postData
         $lastName = $postData['oar_billing_lastname'];
         $zip = $postData['oar_zip'];
         $billingAddress = $order->getBillingAddress();
-        return strtolower($lastName) === strtolower($billingAddress->getLastname()) &&
-            ($type === 'email' && strtolower($email) === strtolower($billingAddress->getEmail()) ||
-                $type === 'zip' && strtolower($zip) === strtolower($billingAddress->getPostcode()));
+        return $this->normalizeStr($lastName) === $this->normalizeStr($billingAddress->getLastname()) &&
+            ($type === 'email' && $this->normalizeStr($email) === $this->normalizeStr($billingAddress->getEmail()) ||
+                $type === 'zip' && $this->normalizeStr($zip) === $this->normalizeStr($billingAddress->getPostcode()));
+    }
+
+    /**
+     * Trim and convert to lower case
+     *
+     * @param string $str
+     * @return string
+     */
+    private function normalizeStr(string $str): string
+    {
+        return trim(strtolower($str));
     }
 
     /**

app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php

@@ -183,9 +183,9 @@ public function testLoadValidOrderNotEmptyPost($post)
             ['getLastname', 'getEmail', 'getPostcode']
         );
         $billingAddressMock->expects($this->once())->method('getLastname')
-            ->willReturn(trim($post['oar_billing_lastname']));
-        $billingAddressMock->expects($this->any())->method('getEmail')->willReturn(trim($post['oar_email']));
-        $billingAddressMock->expects($this->any())->method('getPostcode')->willReturn(trim($post['oar_zip']));
+            ->willReturn($post['oar_billing_lastname']);
+        $billingAddressMock->expects($this->any())->method('getEmail')->willReturn($post['oar_email']);
+        $billingAddressMock->expects($this->any())->method('getPostcode')->willReturn($post['oar_zip']);
         $this->salesOrderMock->expects($this->once())->method('getBillingAddress')->willReturn($billingAddressMock);
         $this->salesOrderMock->expects($this->once())->method('getProtectCode')->willReturn($protectedCode);
         $metaDataMock = $this->createMock(PublicCookieMetadata::class);