Merge remote-tracking branch 'origin/ACP2E-4281' into PR_2025_10_24_muntianu

Author: katmoon

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

@@ -1,19 +1,20 @@
 <?php
 /**
- * Copyright 2015 Adobe
+ * Copyright 2011 Adobe
  * All Rights Reserved.
  */
+
 namespace Magento\Customer\Model\ResourceModel;
 
-use Magento\Customer\Controller\Adminhtml\Group\Delete;
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Customer\Model\ResourceModel\Address\DeleteRelation;
+use Magento\Eav\Model\ResourceModel\OrphanedMultiselectCleaner;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 
 /**
- * Class Address
+ * Customer address entity resource model
  *
- * @package Magento\Customer\Model\ResourceModel
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
@@ -28,24 +29,51 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
      */
     protected $customerRepository;
 
+    /**
+     * @var OrphanedMultiselectCleaner
+     */
+    private $orphanedMultiselectCleaner;
+
+    /**
+     * @var DeleteRelation
+     */
+    private $deleteRelation;
+
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Framework\Validator\Factory $validatorFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
+     * @param OrphanedMultiselectCleaner|null $orphanedMultiselectCleaner
+     * @param DeleteRelation|null $deleteRelation
+     * @param CustomerRegistry|null $customerRegistry
      */
     public function __construct(
         \Magento\Eav\Model\Entity\Context $context,
         \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
         \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite,
         \Magento\Framework\Validator\Factory $validatorFactory,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
-        $data = []
+        $data = [],
+        ?OrphanedMultiselectCleaner $orphanedMultiselectCleaner = null,
+        ?DeleteRelation $deleteRelation = null,
+        ?CustomerRegistry $customerRegistry = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->_validatorFactory = $validatorFactory;
+        $this->orphanedMultiselectCleaner = $orphanedMultiselectCleaner
+            ?? ObjectManager::getInstance()->get(OrphanedMultiselectCleaner::class);
+        $this->deleteRelation = $deleteRelation
+            ?? ObjectManager::getInstance()->get(DeleteRelation::class);
+        $this->customerRegistry = $customerRegistry
+            ?? ObjectManager::getInstance()->get(CustomerRegistry::class);
         parent::__construct($context, $entitySnapshot, $entityRelationComposite, $data);
     }
 
@@ -76,11 +104,15 @@ public function getEntityType()
     /**
      * Check customer address before saving
      *
-     * @param \Magento\Framework\DataObject $address
+     * @param DataObject $address
      * @return $this
      */
-    protected function _beforeSave(\Magento\Framework\DataObject $address)
+    protected function _beforeSave(DataObject $address)
     {
+        if ($address->getId()) {
+            $this->cleanOrphanedMultiselectValues($address);
+        }
+
         parent::_beforeSave($address);
 
         $this->_validate($address);
@@ -91,7 +123,7 @@ protected function _beforeSave(\Magento\Framework\DataObject $address)
     /**
      * Validate customer address entity
      *
-     * @param \Magento\Framework\DataObject $address
+     * @param DataObject $address
      * @return void
      * @throws \Magento\Framework\Validator\Exception When validation failed
      */
@@ -122,25 +154,14 @@ public function delete($object)
     }
 
     /**
-     * Get instance of DeleteRelation class
-     *
-     * @deprecated 101.0.0
-     * @return DeleteRelation
-     */
-    private function getDeleteRelation()
-    {
-        return ObjectManager::getInstance()->get(DeleteRelation::class);
-    }
-
-    /**
-     * Get instance of CustomerRegistry class
+     * Clean up orphaned multiselect attribute values before validation
      *
-     * @deprecated 101.0.0
-     * @return CustomerRegistry
+     * @param DataObject $address
+     * @return void
      */
-    private function getCustomerRegistry()
+    private function cleanOrphanedMultiselectValues(DataObject $address): void
     {
-        return ObjectManager::getInstance()->get(CustomerRegistry::class);
+        $this->orphanedMultiselectCleaner->cleanEntity($this, $address);
     }
 
     /**
@@ -149,11 +170,10 @@ private function getCustomerRegistry()
      * @param \Magento\Customer\Model\Address $address
      * @return $this
      */
-    protected function _afterDelete(\Magento\Framework\DataObject $address)
+    protected function _afterDelete(DataObject $address)
     {
-        $customer = $this->getCustomerRegistry()->retrieve($address->getCustomerId());
-
-        $this->getDeleteRelation()->deleteRelation($address, $customer);
+        $customer = $this->customerRegistry->retrieve($address->getCustomerId());
+        $this->deleteRelation->deleteRelation($address, $customer);
         return parent::_afterDelete($address);
     }
 }

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Adobe
+ * Copyright 2011 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -12,6 +12,7 @@
 use Magento\Customer\Model\Customer\NotificationStorage;
 use Magento\Eav\Model\Entity\Context;
 use Magento\Eav\Model\Entity\VersionControl\AbstractEntity;
+use Magento\Eav\Model\ResourceModel\OrphanedMultiselectCleaner;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
@@ -73,6 +74,11 @@ class Customer extends AbstractEntity
      */
     private $encryptor;
 
+    /**
+     * @var OrphanedMultiselectCleaner
+     */
+    private $orphanedMultiselectCleaner;
+
     /**
      * Customer constructor.
      *
@@ -86,6 +92,7 @@ class Customer extends AbstractEntity
      * @param array $data
      * @param AccountConfirmation|null $accountConfirmation
      * @param EncryptorInterface|null $encryptor
+     * @param OrphanedMultiselectCleaner|null $orphanedMultiselectCleaner
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -98,7 +105,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         $data = [],
         ?AccountConfirmation $accountConfirmation = null,
-        ?EncryptorInterface $encryptor = null
+        ?EncryptorInterface $encryptor = null,
+        ?OrphanedMultiselectCleaner $orphanedMultiselectCleaner = null
     ) {
         parent::__construct($context, $entitySnapshot, $entityRelationComposite, $data);
 
@@ -107,6 +115,8 @@ public function __construct(
         $this->dateTime = $dateTime;
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
+        $this->orphanedMultiselectCleaner = $orphanedMultiselectCleaner
+            ?? ObjectManager::getInstance()->get(OrphanedMultiselectCleaner::class);
         $this->setType('customer');
         $this->setConnection('customer_read');
         $this->storeManager = $storeManager;
@@ -151,6 +161,10 @@ protected function _beforeSave(DataObject $customer)
         }
         $customer->getGroupId();
 
+        if ($customer->getId()) {
+            $this->cleanOrphanedMultiselectValues($customer);
+        }
+
         parent::_beforeSave($customer);
 
         if (!$customer->getEmail()) {
@@ -519,6 +533,17 @@ public function updateSessionCutOff(int $customerId, int $timestamp): void
         );
     }
 
+    /**
+     * Clean up orphaned multiselect attribute values before validation
+     *
+     * @param DataObject $customer
+     * @return void
+     */
+    private function cleanOrphanedMultiselectValues(DataObject $customer): void
+    {
+        $this->orphanedMultiselectCleaner->cleanEntity($this, $customer);
+    }
+
     /**
      * @inheritDoc
      */