ACP2E-2791: Not able to Save Customer attribute information in Admin Edit customer section;

Author: pradeep1819

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -47,6 +47,7 @@
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Save customer action.
@@ -70,6 +71,11 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
      */
     private $addressRegistry;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @var SetCustomerStore|null
      */
@@ -105,8 +111,10 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
      * @param JsonFactory $resultJsonFactory
      * @param SubscriptionManagerInterface $subscriptionManager
      * @param AddressRegistry|null $addressRegistry
+     * @param StoreManagerInterface|null $storeManager
      * @param SetCustomerStore|null $customerStore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
@@ -136,6 +144,7 @@ public function __construct(
         JsonFactory $resultJsonFactory,
         SubscriptionManagerInterface $subscriptionManager,
         AddressRegistry $addressRegistry = null,
+        ?StoreManagerInterface $storeManager = null,
         ?SetCustomerStore $customerStore = null
     ) {
         parent::__construct(
@@ -167,7 +176,8 @@ public function __construct(
         );
         $this->subscriptionManager = $subscriptionManager;
         $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
-        $this->customerStore = $customerStore ?: ObjectManager::getInstance()->get(SetCustomerStore::class);
+        $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->customerStore = $customerStore ?? ObjectManager::getInstance()->get(SetCustomerStore::class);
     }
 
     /**

app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php

@@ -17,9 +17,11 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObjectFactory as ObjectFactory;
 use Magento\Framework\Message\Error;
 use Magento\Customer\Controller\Adminhtml\Index as CustomerAction;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class for validation of customer
@@ -29,7 +31,12 @@
 class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
-     * @var SetCustomerStore
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var SetCustomerStore|null
      */
     private $customerStore;
 
@@ -59,8 +66,10 @@ class Validate extends CustomerAction implements HttpPostActionInterface, HttpGe
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param SetCustomerStore $customerStore
+     * @param StoreManagerInterface|null $storeManager
+     * @param SetCustomerStore|null $customerStore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -88,7 +97,8 @@ public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        SetCustomerStore $customerStore
+        ?StoreManagerInterface $storeManager = null,
+        ?SetCustomerStore $customerStore = null
     ) {
         parent::__construct(
             $context,
@@ -117,7 +127,8 @@ public function __construct(
             $resultForwardFactory,
             $resultJsonFactory
         );
-        $this->customerStore = $customerStore;
+        $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->customerStore = $customerStore ?? ObjectManager::getInstance()->get(SetCustomerStore::class);
     }
 
     /**