Merge branch 'ACP2E-381' of https://github.com/magento-l3/magento2ce into PR-2021-12-21

Author: chittima

app/code/Magento/Customer/Model/Validator/Name.php

@@ -15,7 +15,7 @@
  */
 class Name extends AbstractValidator
 {
-    private const PATTERN_NAME = '/(?:[\p{L}\p{M}\,\-\_\.\'\s\d]){1,255}+/u';
+    private const PATTERN_NAME = '/(?:[\p{L}\p{M}\,\-\_\.\'’\s\d]){1,255}+/u';
 
     /**
      * Validate name fields.

app/code/Magento/Customer/Test/Unit/Model/Validator/NameTest.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model\Validator;
+
+use Magento\Customer\Model\Validator\Name;
+use Magento\Customer\Model\Customer;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Customer name validator tests
+ */
+class NameTest extends TestCase
+{
+    /**
+     * @var Name
+     */
+    private Name $nameValidator;
+
+    /**
+     * @var Customer|MockObject
+     */
+    private MockObject $customerMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->nameValidator = new Name;
+        $this->customerMock = $this
+            ->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getFirstname', 'getLastname', 'getMiddlename'])
+            ->getMock();
+    }
+
+    /**
+     * Test for allowed apostrophe and other punctuation characters in customer names
+     *
+     * @param string $firstName
+     * @param string $middleName
+     * @param string $lastName
+     * @param string $message
+     * @return void
+     * @dataProvider expectedPunctuationInNamesDataProvider
+     */
+    public function testValidateCorrectPunctuationInNames(
+        string $firstName,
+        string $middleName,
+        string $lastName,
+        string $message
+    ) {
+        $this->customerMock->expects($this->once())->method('getFirstname')->willReturn($firstName);
+        $this->customerMock->expects($this->once())->method('getMiddlename')->willReturn($middleName);
+        $this->customerMock->expects($this->once())->method('getLastname')->willReturn($lastName);
+
+        $isValid = $this->nameValidator->isValid($this->customerMock);
+        $this->assertTrue($isValid, $message);
+    }
+
+    /**
+     * @return array
+     */
+    public function expectedPunctuationInNamesDataProvider(): array
+    {
+        return [
+            [
+                'firstName' => 'John',
+                'middleName' => '',
+                'lastNameName' => 'O’Doe',
+                'message' => 'Inclined apostrophe must be allowed in names (iOS Smart Punctuation compatibility)'
+            ],
+            [
+                'firstName' => 'John',
+                'middleName' => '',
+                'lastNameName' => 'O\'Doe',
+                'message' => 'Legacy straight apostrophe must be allowed in names'
+            ]
+        ];
+    }
+}