merge magento/2.3.6-develop into magento-borg/2.3.6-bugfixes-08112020

Author: magento-mts-svc

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

@@ -7,6 +7,7 @@
 
 use Magento\Config\Model\Config\Source\Nooptreq;
 use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -307,6 +308,16 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var RegionFactory
+     */
+    private $regionFactory;
+
+    /**
+     * @var array
+     */
+    private $regionItems;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -340,6 +351,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * @param OrderItemRepositoryInterface $itemRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param ScopeConfigInterface $scopeConfig
+     * @param RegionFactory $regionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -374,7 +386,8 @@ public function __construct(
         ProductOption $productOption = null,
         OrderItemRepositoryInterface $itemRepository = null,
         SearchCriteriaBuilder $searchCriteriaBuilder = null,
-        ScopeConfigInterface $scopeConfig = null
+        ScopeConfigInterface $scopeConfig = null,
+        RegionFactory $regionFactory = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_orderConfig = $orderConfig;
@@ -403,6 +416,8 @@ public function __construct(
         $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
             ->get(SearchCriteriaBuilder::class);
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
+        $this->regionItems = [];
 
         parent::__construct(
             $context,
@@ -1328,6 +1343,7 @@ public function getTrackingNumbers()
      */
     public function getShippingMethod($asObject = false)
     {
+        // phpstan:ignore "Call to an undefined static method"
         $shippingMethod = parent::getShippingMethod();
         if (!$asObject || !$shippingMethod) {
             return $shippingMethod;
@@ -1346,9 +1362,21 @@ public function getShippingMethod($asObject = false)
      */
     public function getAddressesCollection()
     {
+        $region = $this->regionFactory->create();
         $collection = $this->_addressCollectionFactory->create()->setOrderFilter($this);
         if ($this->getId()) {
             foreach ($collection as $address) {
+                if (isset($this->regionItems[$address->getCountryId()][$address->getRegion()])) {
+                    if ($this->regionItems[$address->getCountryId()][$address->getRegion()]) {
+                        $address->setRegion($this->regionItems[$address->getCountryId()][$address->getRegion()]);
+                    }
+                } else {
+                    $region->loadByName($address->getRegion(), $address->getCountryId());
+                    $this->regionItems[$address->getCountryId()][$address->getRegion()] = $region->getName();
+                    if ($region->getName()) {
+                        $address->setRegion($region->getName());
+                    }
+                }
                 $address->setOrder($this);
             }
         }

app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php

@@ -7,15 +7,8 @@
 
 use Magento\Sales\Api\Data\OrderAddressSearchResultInterface;
 use Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Data\Collection\EntityFactoryInterface;
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\App\ObjectManager;
-use Psr\Log\LoggerInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\ResourceModel\Order\Address as AddressResource;
 
 /**
  * Order addresses collection
@@ -36,44 +29,6 @@ class Collection extends AbstractCollection implements OrderAddressSearchResultI
      */
     protected $_eventObject = 'order_address_collection';
 
-    /**
-     * @var ResolverInterface
-     */
-    private $localeResolver;
-
-    /**
-     * @param EntityFactoryInterface $entityFactory
-     * @param LoggerInterface $logger
-     * @param FetchStrategyInterface $fetchStrategy
-     * @param ManagerInterface $eventManager
-     * @param Snapshot $entitySnapshot
-     * @param AdapterInterface|null $connection
-     * @param AbstractDb|null $resource
-     * @param ResolverInterface|null $localeResolver
-     */
-    public function __construct(
-        EntityFactoryInterface $entityFactory,
-        LoggerInterface $logger,
-        FetchStrategyInterface $fetchStrategy,
-        ManagerInterface $eventManager,
-        Snapshot $entitySnapshot,
-        AdapterInterface $connection = null,
-        AbstractDb $resource = null,
-        ResolverInterface $localeResolver = null
-    ) {
-        $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()
-            ->get(ResolverInterface::class);
-        parent::__construct(
-            $entityFactory,
-            $logger,
-            $fetchStrategy,
-            $eventManager,
-            $entitySnapshot,
-            $connection,
-            $resource
-        );
-    }
-
     /**
      * Model initialization
      *
@@ -82,21 +37,11 @@ public function __construct(
     protected function _construct()
     {
         $this->_init(
-            \Magento\Sales\Model\Order\Address::class,
-            \Magento\Sales\Model\ResourceModel\Order\Address::class
+            Address::class,
+            AddressResource::class
         );
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function _initSelect()
-    {
-        parent::_initSelect();
-        $this->joinRegions();
-        return $this;
-    }
-
     /**
      * Redeclare after load method for dispatch event
      *
@@ -110,31 +55,4 @@ protected function _afterLoad()
 
         return $this;
     }
-
-    /**
-     * Join region name table with current locale
-     *
-     * @return $this
-     */
-    private function joinRegions()
-    {
-        $locale = $this->localeResolver->getLocale();
-        $connection = $this->getConnection();
-
-        $defaultNameExpr = $connection->getIfNullSql(
-            $connection->quoteIdentifier('rct.default_name'),
-            $connection->quoteIdentifier('main_table.region')
-        );
-        $expression = $connection->getIfNullSql($connection->quoteIdentifier('rnt.name'), $defaultNameExpr);
-
-        $regionId = $connection->quoteIdentifier('main_table.region_id');
-        $condition = $connection->quoteInto("rnt.locale=?", $locale);
-        $rctTable = $this->getTable('directory_country_region');
-        $rntTable = $this->getTable('directory_country_region_name');
-
-        $this->getSelect()
-            ->joinLeft(['rct' => $rctTable], "rct.region_id={$regionId}", [])
-            ->joinLeft(['rnt' => $rntTable], "rnt.region_id={$regionId} AND {$condition}", ['region' => $expression]);
-        return $this;
-    }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php

@@ -28,7 +28,7 @@ public function testOrderAddressUpdate()
         $order = $objectManager->get(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001');
 
         $address = [
-            OrderAddress::REGION => 'California',
+            OrderAddress::REGION => 'CA',
             OrderAddress::POSTCODE => '11111',
             OrderAddress::LASTNAME => 'lastname',
             OrderAddress::STREET => ['street'],
@@ -75,7 +75,7 @@ public function testOrderAddressUpdate()
         $billingAddress = $actualOrder->getBillingAddress();
 
         $validate = [
-            OrderAddress::REGION => 'California',
+            OrderAddress::REGION => 'CA',
             OrderAddress::POSTCODE => '11111',
             OrderAddress::LASTNAME => 'lastname',
             OrderAddress::STREET => 'street',

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php

@@ -76,7 +76,7 @@ public function testOrderGet(): void
             'city' => 'Los Angeles',
             'email' => 'customer@null.com',
             'postcode' => '11111',
-            'region' => 'California'
+            'region' => 'CA'
         ];
 
         $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);

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

@@ -29,11 +29,6 @@ class CollectionTest extends TestCase
      */
     private $localeResolverMock;
 
-    /**
-     * @var CollectionFactory
-     */
-    private $addressCollectionFactory;
-
     /**
      * @inheritdoc
      */
@@ -78,8 +73,6 @@ protected function setUp()
             ->setStoreId(Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId())
             ->setPayment($payment);
         $order->save();
-
-        $this->addressCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
     }
 
     /**
@@ -93,7 +86,7 @@ public function testCollectionWithJpLocale()
         $order = Bootstrap::getObjectManager()->create(Order::class)
             ->loadByIncrementId('100000001');
 
-        $collection = $this->addressCollectionFactory->create()->setOrderFilter($order);
+        $collection = $order->getAddressesCollection();
         foreach ($collection as $address) {
             $this->assertEquals('アラバマ', $address->getData(OrderAddress::REGION));
         }