Merge branch 'ACP2E-3367' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-14-10-2024

Author: chittima

app/code/Magento/Customer/Helper/View.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Helper;
 
@@ -68,6 +68,6 @@ public function getCustomerName(CustomerInterface $customerData)
             $name .= ' ' . __($customerData->getSuffix());
         }
 
-        return $this->escaper->escapeHtml($name);
+        return $name;
     }
 }

app/code/Magento/Customer/Test/Unit/Helper/ViewTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -54,9 +54,7 @@ protected function setUp(): void
      */
     public function testGetCustomerName($prefix, $firstName, $middleName, $lastName, $suffix, $result)
     {
-        $customerData = $this->getMockBuilder(CustomerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $customerData = $this->createMock(CustomerInterface::class);
         $customerData->expects($this->any())
             ->method('getPrefix')->willReturn($prefix);
         $customerData->expects($this->any())
@@ -67,7 +65,7 @@ public function testGetCustomerName($prefix, $firstName, $middleName, $lastName,
             ->method('getLastname')->willReturn($lastName);
         $customerData->expects($this->any())
             ->method('getSuffix')->willReturn($suffix);
-        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($result)->willReturn($result);
+        $this->escaperMock->expects(self::never())->method('escapeHtml');
         $this->assertEquals($result, $this->object->getCustomerName($customerData));
     }
 

dev/tests/integration/testsuite/Magento/Customer/Helper/ViewTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Helper;
 
@@ -132,7 +132,7 @@ public static function getCustomerNameDataProvider()
                 )->setLastname(
                     '<strong>LastName</strong>'
                 ),
-                '&lt;h1&gt;FirstName&lt;/h1&gt; &lt;strong&gt;LastName&lt;/strong&gt;',
+                '<h1>FirstName</h1> <strong>LastName</strong>',
             ],
         ];
     }