ACP2E-751: Unable to save customer account after editing "Street address" attribute

Build failures fixed

Author: rajan-adobe

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

@@ -218,6 +218,7 @@ private function getDefaultData(): array
      * @param Type $entityType
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function getAttributesMeta(Type $entityType): array
     {
@@ -226,25 +227,17 @@ private function getAttributesMeta(Type $entityType): array
         $attributes = $entityType->getAttributeCollection();
         $customerId = $this->context->getRequestParam('parent_id');
         $entityId = $this->context->getRequestParam('entity_id');
-
+        $customerStreetAddressLines = 0;
         if (!$customerId && $entityId) {
             $customerId = $this->addressRegistry->retrieve($entityId)->getParentId();
+            $customerStreetAddress = $this->addressRegistry->retrieve($entityId)->getStreet();
+            $customerStreetAddressLines = count($customerStreetAddress);
         }
 
         if ($customerId) {
             $customer = $this->customerRepository->getById($customerId);
             $attributes->setWebsite($customer->getWebsiteId());
         }
-        $customerAddress = $customer->getAddresses()[0];
-
-        $customerStreetAddressLines = 0;
-        if($customerAddress !== null){
-            $customerStreetAddress = $customerAddress->getStreet();
-            if($customerStreetAddress !== null){
-                $customerStreetAddressLines = count($customerStreetAddress);
-            }
-        }
-
         /* @var AbstractAttribute $attribute */
         foreach ($attributes as $attribute) {
             if (\in_array($attribute->getFrontendInput(), $this->bannedInputTypes, true)) {
@@ -253,16 +246,16 @@ private function getAttributesMeta(Type $entityType): array
             if (\in_array($attribute->getAttributeCode(), self::$attributesToEliminate, true)) {
                 continue;
             }
-
-            $attributeCode = $attribute->getAttributeCode();
-            $meta[$attributeCode] = $this->attributeMetadataResolver->getAttributesMeta(
+            $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
                 $attribute,
                 $entityType,
                 $this->allowToShowHiddenAttributes
             );
-            if($attributeCode === 'street' && $customerStreetAddressLines !== 0){
-                $meta[$attributeCode]["arguments"]["data"]["config"]["size"] = max(
-                    $meta[$attributeCode]["arguments"]["data"]["config"]["size"],$customerStreetAddressLines);
+            if ($attribute->getAttributeCode() === 'street' && $customerStreetAddressLines !== 0) {
+                $meta[$attribute->getAttributeCode()]["arguments"]["data"]["config"]["size"] = max(
+                    $meta[$attribute->getAttributeCode()]["arguments"]["data"]["config"]["size"],
+                    $customerStreetAddressLines
+                );
             }
         }
         $this->attributeMetadataResolver->processWebsiteMeta($meta);

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

@@ -343,7 +343,7 @@ protected function getAttributeMock(array $options = []): array
             $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
         }
 
-        $attributeMock->expects($this->exactly(2))
+        $attributeMock->expects($this->atLeast(2))
             ->method('getAttributeCode')
             ->willReturn($attributeCode);
 
@@ -367,7 +367,7 @@ protected function getAttributeMock(array $options = []): array
             $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
         }
 
-        $attributeBooleanMock->expects($this->exactly(2))
+        $attributeBooleanMock->expects($this->atleast(2))
             ->method('getAttributeCode')
             ->willReturn($booleanAttributeCode);