MAGETWO-63456: [Backport] Wrong address template used for order e-mails - for 2.0

Author: zakdma

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

@@ -16,11 +16,15 @@
 class Renderer
 {
     /**
+     * Addres config instance.
+     *
      * @var AddressConfig
      */
     protected $addressConfig;
 
     /**
+     * Event manager instance.
+     *
      * @var EventManager
      */
     protected $eventManager;
@@ -40,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * Format address in a specific way
+     * Format address in a specific way.
      *
      * @param Address $address
      * @param string $type

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

@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Address;
 
 use Magento\Customer\Block\Address\Renderer\RendererInterface as CustomerAddressBlockRenderer;
@@ -20,36 +21,50 @@
 class RendererTest extends \PHPUnit_Framework_TestCase
 {
     /**
+     * Order address renderer instance.
+     *
      * @var OrderAddressRenderer
      */
     private $orderAddressRenderer;
 
     /**
+     * Object manager helper instance.
+     *
      * @var ObjectManagerHelper
      */
     private $objectManagerHelper;
 
     /**
+     * Customer address config instance mock.
+     *
      * @var CustomerAddressConfig|\PHPUnit_Framework_MockObject_MockObject
      */
     private $customerAddressConfigMock;
 
     /**
+     * Event manager instance mock.
+     *
      * @var EventManager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $eventManagerMock;
 
     /**
+     * Order address instance mock.
+     *
      * @var OrderAddress|\PHPUnit_Framework_MockObject_MockObject
      */
     private $orderAddressMock;
 
     /**
+     * Order instance mock.
+     *
      * @var Order|\PHPUnit_Framework_MockObject_MockObject
      */
     private $orderMock;
 
     /**
+     * Customer address block renderer instance mock.
+     *
      * @var CustomerAddressBlockRenderer|\PHPUnit_Framework_MockObject_MockObject
      */
     private $customerAddressBlockRendererMock;
@@ -88,7 +103,7 @@ protected function setUp()
     }
 
     /**
-     * Run test fromat.
+     * Run test format.
      */
     public function testFormat()
     {

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

@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Address;
 
 use Magento\Config\Model\ResourceModel\Config as ConfigResourceModel;
@@ -20,21 +21,29 @@
 class RendererTest extends \PHPUnit_Framework_TestCase
 {
     /**
+     * Object manager instance.
+     *
      * @var ObjectManagerInterface
      */
     private $objectManager;
 
     /**
+     * Order address renderer instance.
+     *
      * @var OrderAddressRenderer
      */
     private $orderAddressRenderer;
 
     /**
+     * Config resource model instance.
+     *
      * @var ConfigResourceModel
      */
     private $configResourceModel;
 
     /**
+     * Reinitable config instance.
+     *
      * @var ReinitableConfig
      */
     private $reinitableConfig;
@@ -51,6 +60,8 @@ protected function setUp()
     }
 
     /**
+     * Format address test.
+     *
      * @magentoDataFixture Magento/Sales/_files/order_fixture_store.php
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled

dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store_rollback.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */