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

@@ -66,14 +66,14 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
     private $subscriptionManager;
 
     /**
-     * @var AddressRegistry
+     * @var SetCustomerStore
      */
-    private $addressRegistry;
+    private $customerStore;
 
     /**
-     * @var SetCustomerStore|null
+     * @var AddressRegistry
      */
-    private $customerStore;
+    private $addressRegistry;
 
     /**
      * Constructor
@@ -104,8 +104,8 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
      * @param ForwardFactory $resultForwardFactory
      * @param JsonFactory $resultJsonFactory
      * @param SubscriptionManagerInterface $subscriptionManager
+     * @param SetCustomerStore $customerStore
      * @param AddressRegistry|null $addressRegistry
-     * @param SetCustomerStore|null $customerStore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -135,8 +135,8 @@ public function __construct(
         ForwardFactory $resultForwardFactory,
         JsonFactory $resultJsonFactory,
         SubscriptionManagerInterface $subscriptionManager,
-        AddressRegistry $addressRegistry = null,
-        ?SetCustomerStore $customerStore = null
+        SetCustomerStore $customerStore,
+        AddressRegistry $addressRegistry = null
     ) {
         parent::__construct(
             $context,
@@ -166,8 +166,8 @@ public function __construct(
             $resultJsonFactory
         );
         $this->subscriptionManager = $subscriptionManager;
+        $this->customerStore = $customerStore;
         $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
-        $this->customerStore = $customerStore ?? ObjectManager::getInstance()->get(SetCustomerStore::class);
     }
 
     /**

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

@@ -17,7 +17,6 @@
 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;
@@ -30,7 +29,7 @@
 class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
-     * @var SetCustomerStore|null
+     * @var SetCustomerStore
      */
     private $customerStore;
 
@@ -60,7 +59,7 @@ 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|null $customerStore
+     * @param SetCustomerStore $customerStore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -89,7 +88,7 @@ public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        ?SetCustomerStore $customerStore = null
+        SetCustomerStore $customerStore
     ) {
         parent::__construct(
             $context,
@@ -118,7 +117,7 @@ public function __construct(
             $resultForwardFactory,
             $resultJsonFactory
         );
-        $this->customerStore = $customerStore ?? ObjectManager::getInstance()->get(SetCustomerStore::class);
+        $this->customerStore = $customerStore;
     }
 
     /**

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

@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  *
- * Copyright 2023 Adobe
+ * Copyright 2024 Adobe
  * All Rights Reserved.
  *
  * NOTICE: All information contained herein is, and remains

app/code/Magento/Customer/Test/Unit/Model/SetCustomerStoreTest.php

@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  *
- * Copyright 2023 Adobe
+ * Copyright 2024 Adobe
  * All Rights Reserved.
  *
  * NOTICE: All information contained herein is, and remains