ACPT-1552

* Fixing AbstractAddress to properly use its new cache classes
* Updating its unit tests and subclasses
* Fix static test failure in LoggerProxy

Author: JacobBrownAustin

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

@@ -9,6 +9,8 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Customer\Model\Address\AbstractAddress\CountryModelsCache;
+use Magento\Customer\Model\Address\AbstractAddress\RegionModelsCache;
 use Magento\Framework\Indexer\StateInterface;
 
 /**
@@ -74,6 +76,8 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param CountryModelsCache|null $countryModelsCache
+     * @param RegionModelsCache|null $regionModelsCache
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -96,7 +100,9 @@ public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        ?CountryModelsCache $countryModelsCache = null,
+        ?RegionModelsCache $regionModelsCache = null,
     ) {
         $this->dataProcessor = $dataProcessor;
         $this->_customerFactory = $customerFactory;
@@ -117,7 +123,9 @@ public function __construct(
             $dataObjectHelper,
             $resource,
             $resourceCollection,
-            $data
+            $data,
+            $countryModelsCache,
+            $regionModelsCache,
         );
     }
 

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

@@ -522,7 +522,7 @@ public function getCountry()
      */
     public function getCountryModel()
     {
-        if ($country = $this->countryModelsCache->get($this->getCountryId())) {
+        if (!($country = $this->countryModelsCache->get($this->getCountryId()))) {
             $country = $this->_createCountryInstance();
             $country->load($this->getCountryId());
             $this->countryModelsCache->add($this->getCountryId(), $country);
@@ -541,7 +541,7 @@ public function getRegionModel($regionId = null)
         if ($regionId === null) {
             $regionId = $this->getRegionId();
         }
-        if ($region = $this->regionModelsCache->get($regionId)) {
+        if (!($region = $this->regionModelsCache->get($regionId))) {
             $region = $this->_createRegionInstance();
             $region->load($regionId);
             $this->regionModelsCache->add($regionId, $region);

app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php

@@ -24,6 +24,8 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Customer\Model\Address\AbstractAddress\RegionModelsCache;
+use Magento\Customer\Model\Address\AbstractAddress\CountryModelsCache;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -109,6 +111,8 @@ protected function setUp(): void
                 'resource' => $this->resourceMock,
                 'resourceCollection' => $this->resourceCollectionMock,
                 'compositeValidator' => $this->compositeValidatorMock,
+                'countryModelsCache' => new CountryModelsCache,
+                'regionModelsCache' => new RegionModelsCache,
             ]
         );
     }

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

@@ -10,6 +10,8 @@
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Customer\Model\Address\AbstractAddress;
+use Magento\Customer\Model\Address\AbstractAddress\CountryModelsCache;
+use Magento\Customer\Model\Address\AbstractAddress\RegionModelsCache;
 use Magento\Customer\Model\Address\Mapper;
 use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\CountryFactory;
@@ -335,6 +337,8 @@ class Address extends AbstractAddress implements
      * @param array $data
      * @param Json $serializer
      * @param StoreManagerInterface $storeManager
+     * @param CountryModelsCache|null $countryModelsCache
+     * @param RegionModelsCache|null $regionModelsCache
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -372,7 +376,9 @@ public function __construct(
         AbstractDb $resourceCollection = null,
         array $data = [],
         Json $serializer = null,
-        StoreManagerInterface $storeManager = null
+        StoreManagerInterface $storeManager = null,
+        ?CountryModelsCache $countryModelsCache = null,
+        ?RegionModelsCache $regionModelsCache = null,
     ) {
         $this->_scopeConfig = $scopeConfig;
         $this->_addressItemFactory = $addressItemFactory;
@@ -409,7 +415,9 @@ public function __construct(
             $dataObjectHelper,
             $resource,
             $resourceCollection,
-            $data
+            $data,
+            $countryModelsCache,
+            $regionModelsCache,
         );
     }
 

lib/internal/Magento/Framework/Logger/LoggerProxy.php

@@ -40,6 +40,9 @@ public function __construct(
         $this->objectManager = $objectManager;
     }
 
+    /**
+     * @inheritDoc
+     */
     public function _resetState(): void
     {
         $this->logger = null;