Add addressHelper object into child classes

Author: ProxiBlue

app/code/Magento/Customer/Model/Address.php

@@ -13,6 +13,7 @@
 use Magento\Customer\Model\Address\AbstractAddress\RegionModelsCache;
 use Magento\Customer\Model\Address\CompositeValidator;
 use Magento\Framework\Indexer\StateInterface;
+use Magento\Customer\Helper\Address as AddressHelper;
 
 /**
  * Customer address model
@@ -80,6 +81,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
      * @param CompositeValidator|null $compositeValidator
      * @param CountryModelsCache|null $countryModelsCache
      * @param RegionModelsCache|null $regionModelsCache
+     * @param AddressHelper|null $addressHelper
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -106,6 +108,7 @@ public function __construct(
         ?CompositeValidator $compositeValidator = null,
         ?CountryModelsCache $countryModelsCache = null,
         ?RegionModelsCache $regionModelsCache = null,
+        ?AddressHelper $addressHelper = null
     ) {
         $this->dataProcessor = $dataProcessor;
         $this->_customerFactory = $customerFactory;
@@ -130,6 +133,7 @@ public function __construct(
             $compositeValidator,
             $countryModelsCache,
             $regionModelsCache,
+            $addressHelper
         );
     }
 

app/code/Magento/Customer/etc/di.xml

@@ -88,6 +88,7 @@
     <type name="Magento\Customer\Helper\Address">
         <arguments>
             <argument name="addressConfig" xsi:type="object">Magento\Customer\Model\Address\Config\Proxy</argument>
+            <argument name="addressHelper" xsi:type="object">Magento\Customer\Helper\Address</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\App\Http\Context">

app/code/Magento/Quote/Model/Quote/Address.php

@@ -46,6 +46,7 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Helper\Address as AddressHelper;
 
 /**
  * Sales Quote address model
@@ -341,6 +342,7 @@ class Address extends AbstractAddress implements
      * @param CompositeValidator|null $compositeValidator
      * @param CountryModelsCache|null $countryModelsCache
      * @param RegionModelsCache|null $regionModelsCache
+     * @param AddressHelper|null $addressHelper
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -382,6 +384,7 @@ public function __construct(
         ?CompositeValidator $compositeValidator = null,
         ?CountryModelsCache $countryModelsCache = null,
         ?RegionModelsCache $regionModelsCache = null,
+        ?AddressHelper $addressHelper = null
     ) {
         $this->_scopeConfig = $scopeConfig;
         $this->_addressItemFactory = $addressItemFactory;
@@ -422,6 +425,7 @@ public function __construct(
             $compositeValidator,
             $countryModelsCache,
             $regionModelsCache,
+            $addressHelper
         );
     }
 

app/code/Magento/Quote/etc/di.xml

@@ -63,6 +63,7 @@
     <type name="Magento\Quote\Model\Quote\Address">
         <arguments>
             <argument name="addressConfig" xsi:type="object">Magento\Customer\Model\Address\Config\Proxy</argument>
+            <argument name="addressHelper" xsi:type="object">Magento\Customer\Helper\Address</argument>
         </arguments>
     </type>
     <virtualType name="QuoteAddressRelationsComposite" type="Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite">