diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 59e12d72ded6c6cd4de5aaf323acd5f1ffbbd122..fd2ceaf09695bfb4a413bc6f680f254ca4edca4c 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -72,6 +72,7 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
) {
$metadataForm = $this->getMetadataForm($entityType, $formCode, $scope);
$formData = $metadataForm->extractData($this->getRequest(), $scope);
+ $formData = $metadataForm->compactData($formData);
// Initialize additional attributes
/** @var \Magento\Framework\DataObject $object */
@@ -81,11 +82,6 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
$formData[$attributeCode] = isset($requestData[$attributeCode]) ? $requestData[$attributeCode] : false;
}
- $result = $metadataForm->compactData($formData);
-
- // Re-initialize additional attributes
- $formData = array_replace($result, $formData);
-
// Unset unused attributes
$formAttributes = $metadataForm->getAttributes();
foreach ($formAttributes as $attribute) {
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index 8fb48fe9f87e76dcf4f5d489a830bb15bf910c79..11fd1b5a7fc3356f54cc1e72b76e111b22446383 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
@@ -304,33 +304,28 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'entity_id' => $customerId,
'code' => 'value',
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
+ $compactedData = [
'entity_id' => $customerId,
'code' => 'value',
'coolness' => false,
'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
+ CustomerInterface::DEFAULT_BILLING => 2,
+ CustomerInterface::DEFAULT_SHIPPING => 2
];
- $addressFilteredData = [
+ $addressExtractedData = [
'entity_id' => $addressId,
- 'default_billing' => 'true',
- 'default_shipping' => 'true',
'code' => 'value',
'coolness' => false,
'region' => 'region',
'region_id' => 'region_id',
];
- $addressDataToCompact = [
+ $addressCompactedData = [
'entity_id' => $addressId,
'default_billing' => 'true',
'default_shipping' => 'true',
@@ -430,11 +425,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($compactedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -445,11 +440,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerAddressFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'address/' . $addressId)
- ->willReturn($addressFilteredData);
+ ->willReturn($addressExtractedData);
$customerAddressFormMock->expects($this->once())
->method('compactData')
- ->with($addressDataToCompact)
- ->willReturn($addressFilteredData);
+ ->with($addressExtractedData)
+ ->willReturn($addressCompactedData);
$customerAddressFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -625,8 +620,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
'_template_' => '_template_',
$addressId => [
'entity_id' => $addressId,
- 'default_billing' => 'false',
- 'default_shipping' => 'false',
'code' => 'value',
'coolness' => false,
'region' => 'region',
@@ -635,32 +628,12 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
- ];
- $addressFilteredData = [
+ $addressExtractedData = [
'entity_id' => $addressId,
- 'default_billing' => 'false',
- 'default_shipping' => 'false',
- 'code' => 'value',
- 'coolness' => false,
- 'region' => 'region',
- 'region_id' => 'region_id',
- ];
- $addressDataToCompact = [
- 'entity_id' => $addressId,
- 'default_billing' => 'false',
- 'default_shipping' => 'false',
'code' => 'value',
'coolness' => false,
'region' => 'region',
@@ -739,11 +712,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -754,11 +727,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerAddressFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'address/' . $addressId)
- ->willReturn($addressFilteredData);
+ ->willReturn($addressExtractedData);
$customerAddressFormMock->expects($this->once())
->method('compactData')
- ->with($addressDataToCompact)
- ->willReturn($addressFilteredData);
+ ->with($addressExtractedData)
+ ->willReturn($addressExtractedData);
$customerAddressFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -910,19 +883,10 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
- ];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
$attributeMock = $this->getMockBuilder(
@@ -971,11 +935,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -1062,19 +1026,10 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
];
- $dataToCompact = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
- ];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
$attributeMock = $this->getMockBuilder(
@@ -1124,11 +1079,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);
@@ -1214,18 +1169,9 @@ class SaveTest extends \PHPUnit_Framework_TestCase
],
'subscription' => $subscription,
];
- $filteredData = [
- 'coolness' => false,
- 'disable_auto_group_change' => 'false',
- ];
- $dataToCompact = [
+ $extractedData = [
'coolness' => false,
'disable_auto_group_change' => 'false',
- CustomerInterface::DEFAULT_BILLING => false,
- CustomerInterface::DEFAULT_SHIPPING => false,
- 'confirmation' => false,
- 'sendemail_store_id' => false,
- 'extension_attributes' => false,
];
/** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
@@ -1275,11 +1221,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
$customerFormMock->expects($this->once())
->method('extractData')
->with($this->requestMock, 'customer')
- ->willReturn($filteredData);
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('compactData')
- ->with($dataToCompact)
- ->willReturn($filteredData);
+ ->with($extractedData)
+ ->willReturn($extractedData);
$customerFormMock->expects($this->once())
->method('getAttributes')
->willReturn($attributes);