ACP2E-4281: Validation errors on deleted customer attributes when changing customer data.

alzota · alzota · commit 75b223258a40 · 2025-10-23T11:43:52.000+03:00
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address.php b/app/code/Magento/Customer/Model/ResourceModel/Address.php
@@ -34,6 +34,16 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
      */
     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
@@ -42,6 +52,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
      * @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,
@@ -50,12 +62,18 @@ public function __construct(
         \Magento\Framework\Validator\Factory $validatorFactory,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         $data = [],
-        ?OrphanedMultiselectCleaner $orphanedMultiselectCleaner = null
+        ?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);
     }
 
@@ -135,30 +153,6 @@ public function delete($object)
         return $result;
     }
 
-    /**
-     * Get instance of DeleteRelation class
-     *
-     * @deprecated 101.0.0 Use dependency injection instead.
-     * @see DeleteRelation
-     * @return DeleteRelation
-     */
-    private function getDeleteRelation()
-    {
-        return ObjectManager::getInstance()->get(DeleteRelation::class);
-    }
-
-    /**
-     * Get instance of CustomerRegistry class
-     *
-     * @deprecated 101.0.0 Use dependency injection instead.
-     * @see CustomerRegistry
-     * @return CustomerRegistry
-     */
-    private function getCustomerRegistry()
-    {
-        return ObjectManager::getInstance()->get(CustomerRegistry::class);
-    }
-
     /**
      * Clean up orphaned multiselect attribute values before validation
      *
@@ -178,9 +172,8 @@ private function cleanOrphanedMultiselectValues(DataObject $address): void
      */
     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);
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
@@ -7,22 +7,32 @@
 
 namespace Magento\Customer\Test\Unit\Model\ResourceModel;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Address;
 use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\ResourceModel\Address\DeleteRelation;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
 use Magento\Eav\Model\Entity\AttributeLoaderInterface;
+use Magento\Eav\Model\Entity\Context;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\ResourceModel\Helper;
+use Magento\Eav\Model\ResourceModel\OrphanedMultiselectCleaner;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
+use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Validator;
 use Magento\Framework\Validator\Factory;
+use Magento\Framework\Validator\UniversalFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -31,7 +41,7 @@
  */
 class AddressTest extends TestCase
 {
-    /** @var \Magento\Customer\Test\Unit\Model\ResourceModel\SubResourceModelAddress */
+    /** @var SubResourceModelAddress */
     protected $addressResource;
 
     /** @var CustomerFactory|MockObject */
@@ -46,6 +56,15 @@ class AddressTest extends TestCase
     /** @var  RelationComposite|MockObject */
     protected $entityRelationCompositeMock;
 
+    /** @var OrphanedMultiselectCleaner|MockObject */
+    protected $orphanedMultiselectCleanerMock;
+
+    /** @var DeleteRelation|MockObject */
+    protected $deleteRelationMock;
+
+    /** @var CustomerRegistry|MockObject */
+    protected $customerRegistryMock;
+
     protected function setUp(): void
     {
         $this->entitySnapshotMock = $this->createMock(
@@ -56,16 +75,35 @@ protected function setUp(): void
             RelationComposite::class
         );
 
-        $this->addressResource = (new ObjectManagerHelper($this))->getObject(
-            \Magento\Customer\Test\Unit\Model\ResourceModel\SubResourceModelAddress::class,
-            [
-                'resource' => $this->prepareResource(),
-                'entitySnapshot' => $this->entitySnapshotMock,
-                'entityRelationComposite' => $this->entityRelationCompositeMock,
-                'eavConfig' => $this->prepareEavConfig(),
-                'validatorFactory' => $this->prepareValidatorFactory(),
-                'customerFactory' => $this->prepareCustomerFactory()
-            ]
+        $this->orphanedMultiselectCleanerMock = $this->createMock(
+            OrphanedMultiselectCleaner::class
+        );
+
+        $this->deleteRelationMock = $this->createMock(
+            DeleteRelation::class
+        );
+
+        $this->customerRegistryMock = $this->createMock(
+            CustomerRegistry::class
+        );
+
+        $contextMock = $this->prepareContext();
+
+        $uniqueValidatorMock = $this->createMock(UniqueValidationInterface::class);
+        $attributeLoaderMock = $this->createMock(AttributeLoaderInterface::class);
+
+        $this->addressResource = new SubResourceModelAddress(
+            $contextMock,
+            $this->entitySnapshotMock,
+            $this->entityRelationCompositeMock,
+            $this->prepareValidatorFactory(),
+            $this->prepareCustomerRepository(),
+            [],
+            $this->orphanedMultiselectCleanerMock,
+            $this->deleteRelationMock,
+            $this->customerRegistryMock,
+            $uniqueValidatorMock,
+            $attributeLoaderMock
         );
     }
 
@@ -131,6 +169,52 @@ public static function getSaveDataProvider()
         ];
     }
 
+    /**
+     * Prepare context mock object
+     *
+     * @return Context|MockObject
+     */
+    protected function prepareContext()
+    {
+        $contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $contextMock->expects($this->any())
+            ->method('getEavConfig')
+            ->willReturn($this->prepareEavConfig());
+
+        $contextMock->expects($this->any())
+            ->method('getResource')
+            ->willReturn($this->prepareResource());
+
+        $contextMock->expects($this->any())
+            ->method('getAttributeSetEntity')
+            ->willReturn(null);
+
+        $contextMock->expects($this->any())
+            ->method('getLocaleFormat')
+            ->willReturn($this->createMock(FormatInterface::class));
+
+        $contextMock->expects($this->any())
+            ->method('getResourceHelper')
+            ->willReturn($this->createMock(Helper::class));
+
+        $contextMock->expects($this->any())
+            ->method('getUniversalFactory')
+            ->willReturn($this->createMock(UniversalFactory::class));
+
+        $contextMock->expects($this->any())
+            ->method('getTransactionManager')
+            ->willReturn($this->createMock(TransactionManagerInterface::class));
+
+        $contextMock->expects($this->any())
+            ->method('getObjectRelationProcessor')
+            ->willReturn($this->createMock(ObjectRelationProcessor::class));
+
+        return $contextMock;
+    }
+
     /**
      * Prepare resource mock object
      *
@@ -270,6 +354,17 @@ protected function prepareCustomerFactory()
         return $this->customerFactory;
     }
 
+    /**
+     * @return CustomerRepositoryInterface|MockObject
+     */
+    protected function prepareCustomerRepository()
+    {
+        $customerRepositoryMock = $this->getMockBuilder(CustomerRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        return $customerRepositoryMock;
+    }
+
     public function testGetType()
     {
         $this->assertSame($this->eavConfigType, $this->addressResource->getEntityType());
@@ -284,9 +379,117 @@ class SubResourceModelAddress extends \Magento\Customer\Model\ResourceModel\Addr
 {
     protected $attributeLoader;
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Context                     $context,
+        Snapshot                    $entitySnapshot,
+        RelationComposite           $entityRelationComposite,
+        Factory                     $validatorFactory,
+        CustomerRepositoryInterface $customerRepository,
+                                    $data = [],
+        ?OrphanedMultiselectCleaner $orphanedMultiselectCleaner = null,
+        ?DeleteRelation             $deleteRelation = null,
+        ?CustomerRegistry           $customerRegistry = null,
+        ?UniqueValidationInterface  $uniqueValidator = null,
+        ?AttributeLoaderInterface   $attributeLoader = null
+    ) {
+        $this->attributeLoader = $attributeLoader;
+
+        $this->initializeParentProperties(
+            $context,
+            $entitySnapshot,
+            $entityRelationComposite,
+            $validatorFactory,
+            $customerRepository,
+            $orphanedMultiselectCleaner,
+            $deleteRelation,
+            $customerRegistry,
+            $uniqueValidator,
+            $attributeLoader
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    private function initializeParentProperties(
+        $context,
+        $entitySnapshot,
+        $entityRelationComposite,
+        $validatorFactory,
+        $customerRepository,
+        $orphanedMultiselectCleaner,
+        $deleteRelation,
+        $customerRegistry,
+        $uniqueValidator,
+        $attributeLoader
+    ) {
+        $reflection = new \ReflectionClass(\Magento\Customer\Model\ResourceModel\Address::class);
+
+        $prop = $reflection->getProperty('customerRepository');
+        $prop->setValue($this, $customerRepository);
+
+        $prop = $reflection->getProperty('_validatorFactory');
+        $prop->setValue($this, $validatorFactory);
+
+        $prop = $reflection->getProperty('orphanedMultiselectCleaner');
+        $prop->setValue($this, $orphanedMultiselectCleaner);
+
+        $prop = $reflection->getProperty('deleteRelation');
+        $prop->setValue($this, $deleteRelation);
+
+        $prop = $reflection->getProperty('customerRegistry');
+        $prop->setValue($this, $customerRegistry);
+
+        $reflection = new \ReflectionClass(\Magento\Eav\Model\Entity\VersionControl\AbstractEntity::class);
+
+        $prop = $reflection->getProperty('entitySnapshot');
+        $prop->setValue($this, $entitySnapshot);
+
+        $prop = $reflection->getProperty('entityRelationComposite');
+        $prop->setValue($this, $entityRelationComposite);
+
+        $reflection = new \ReflectionClass(AbstractEntity::class);
+
+        $prop = $reflection->getProperty('_eavConfig');
+        $prop->setValue($this, $context->getEavConfig());
+
+        $prop = $reflection->getProperty('_resource');
+        $prop->setValue($this, $context->getResource());
+
+        $prop = $reflection->getProperty('_localeFormat');
+        $prop->setValue($this, $context->getLocaleFormat());
+
+        $prop = $reflection->getProperty('_resourceHelper');
+        $prop->setValue($this, $context->getResourceHelper());
+
+        $prop = $reflection->getProperty('_universalFactory');
+        $prop->setValue($this, $context->getUniversalFactory());
+
+        $prop = $reflection->getProperty('transactionManager');
+        $prop->setValue($this, $context->getTransactionManager());
+
+        $prop = $reflection->getProperty('objectRelationProcessor');
+        $prop->setValue($this, $context->getObjectRelationProcessor());
+
+        $prop = $reflection->getProperty('uniqueValidator');
+        $prop->setValue($this, $uniqueValidator);
+
+        $prop = $reflection->getProperty('attributeLoader');
+        $prop->setValue($this, $attributeLoader);
+
+        $prop = $reflection->getProperty('_type');
+        $prop->setValue($this, null);
+
+        $this->connectionName = 'customer';
+    }
+
     /**
      * @param null $object
-     * @return \Magento\Customer\Model\ResourceModel\Address|AbstractEntity
+     * @return AbstractEntity
      */
     public function loadAllAttributes($object = null)
     {
