Merge remote-tracking branch 'origin/MC-18250' into 2.3-develop-pr29

Author: serhii-balko

app/code/Magento/Customer/Block/Address/Edit.php

@@ -5,7 +5,8 @@
  */
 namespace Magento\Customer\Block\Address;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
@@ -48,7 +49,7 @@ class Edit extends \Magento\Directory\Block\Data
     protected $dataObjectHelper;
 
     /**
-     * @var \Magento\Customer\Api\AddressMetadataInterface
+     * @var AddressMetadataInterface
      */
     private $addressMetadata;
 
@@ -67,7 +68,7 @@ class Edit extends \Magento\Directory\Block\Data
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param array $data
-     * @param \Magento\Customer\Api\AddressMetadataInterface|null $addressMetadata
+     * @param AddressMetadataInterface|null $addressMetadata
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -84,14 +85,14 @@ public function __construct(
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         array $data = [],
-        \Magento\Customer\Api\AddressMetadataInterface $addressMetadata = null
+        AddressMetadataInterface $addressMetadata = null
     ) {
         $this->_customerSession = $customerSession;
         $this->_addressRepository = $addressRepository;
         $this->addressDataFactory = $addressDataFactory;
         $this->currentCustomer = $currentCustomer;
         $this->dataObjectHelper = $dataObjectHelper;
-        $this->addressMetadata = $addressMetadata;
+        $this->addressMetadata = $addressMetadata ?: ObjectManager::getInstance()->get(AddressMetadataInterface::class);
         parent::__construct(
             $context,
             $directoryHelper,