Merge remote-tracking branch '37932/patch-16' into community_prs_march

Author: Indrani Sonawane

app/code/Magento/Sales/Model/Order/Address/Renderer.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Model\Order\Address;
 
@@ -71,16 +72,22 @@ public function __construct(
     public function format(Address $address, $type)
     {
         $orderStore = $address->getOrder()->getStore();
+        $originalStore = $this->storeManager->getStore();
         $this->storeManager->setCurrentStore($orderStore);
+        $this->addressConfig->setStore($orderStore);
         $formatType = $this->addressConfig->getFormatByCode($type);
         if (!$formatType || !$formatType->getRenderer()) {
             return null;
         }
         $this->eventManager->dispatch('customer_address_format', ['type' => $formatType, 'address' => $address]);
         $addressData = $address->getData();
         $addressData['locale'] = $this->getLocaleByStoreId((int) $orderStore->getId());
+        $rendered = $formatType->getRenderer()->renderArray($addressData);
 
-        return $formatType->getRenderer()->renderArray($addressData);
+        $this->addressConfig->setStore($originalStore);
+        $this->storeManager->setCurrentStore($originalStore);
+
+        return $rendered;
     }
 
     /**

app/code/Magento/Sales/Test/Unit/Model/Order/Address/RendererTest.php

@@ -9,15 +9,16 @@
 
 use Magento\Customer\Block\Address\Renderer\RendererInterface as CustomerAddressBlockRenderer;
 use Magento\Customer\Model\Address\Config as CustomerAddressConfig;
+use Magento\Directory\Helper\Data;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Address as OrderAddress;
 use Magento\Sales\Model\Order\Address\Renderer as OrderAddressRenderer;
-use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -96,7 +97,7 @@ protected function setUp(): void
 
         $this->storeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->storeManagerMck = $this->getMockBuilder(StoreManagerInterface::class)
-            ->onlyMethods(['setCurrentStore'])
+            ->onlyMethods(['setCurrentStore', 'getStore'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -106,7 +107,7 @@ protected function setUp(): void
                 'addressConfig' => $this->customerAddressConfigMock,
                 'eventManager' => $this->eventManagerMock,
                 'scopeConfig' => $this->storeConfigMock,
-                'storeManager' => $this->storeManagerMck,
+                'storeManager' => $this->storeManagerMck
             ]
         );
     }
@@ -131,7 +132,7 @@ public function testFormat(): void
             ->willReturn($addressData);
         $this->storeConfigMock->expects($this->once())
             ->method('getValue')
-            ->willReturn(1);
+            ->willReturn('1');
         $this->customerAddressBlockRendererMock->expects(static::once())
             ->method('renderArray')
             ->with($addressData, null)
@@ -162,11 +163,34 @@ public function testFormatNoRenderer(): void
      */
     private function setStoreExpectations(): void
     {
-        $storeMock = $this->getMockBuilder(StoreInterface::class)
+        $originalStoreMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getId'])
             ->getMockForAbstractClass();
+        $storeMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getId'])
+            ->getMockForAbstractClass();
+
         $this->orderMock->expects(self::once())->method('getStore')->willReturn($storeMock);
-        $this->storeManagerMck->expects(self::once())->method('setCurrentStore')->with($storeMock);
+
+        // One call to setup the store from the order, and an other one to rollback to the original store value
+        $expected = [$storeMock, $originalStoreMock];
+        $matcher = $this->exactly(count($expected));
+        $this->storeManagerMck->expects(self::once())->method('getStore')->willReturn($originalStoreMock);
+        $this->storeManagerMck->expects(self::any())->method('setCurrentStore')->with(
+            $this->callback(function ($store) use ($matcher, $expected) {
+                $this->assertEquals($store, $expected[$matcher->getInvocationCount()]);
+                return true;
+            })
+        );
+
+        // One call to setup the store from the order, and an other one to rollback to the original store value
+        $this->customerAddressConfigMock->expects(self::any())->method('setStore')->with(
+            $this->callback(function ($store) use ($matcher, $expected) {
+                $this->assertEquals($store, $expected[$matcher->getInvocationCount()]);
+                return true;
+            })
+        );
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php

@@ -124,11 +124,10 @@ public function testFormat()
      */
     public function testFormatNonDisplayedCompanyField()
     {
-        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
-        $website = $storeManager->getWebsites(false, true)['test'];
+        $orderFixtureStore = $this->objectManager->create(Order::class)->loadByIncrementId('100000001');
         $configData = [
             'section' => 'customer',
-            'website' => $website->getId(),
+            'website' => $orderFixtureStore->getStore()->getWebsite()->getId(),
             'store' => null,
             'groups' => [
                 'address' => [
@@ -141,7 +140,6 @@ public function testFormatNonDisplayedCompanyField()
         $configFactory = $this->objectManager->get(Factory::class);
         $config = $configFactory->create(['data' => $configData]);
         $config->save();
-        $orderFixtureStore = $this->objectManager->create(Order::class)->loadByIncrementId('100000001');
         $address = $orderFixtureStore->getBillingAddress();
         self::assertStringNotContainsString('Test Company', $this->orderAddressRenderer->format($address, 'html'));
     }