Merge branch 'ACP2E-3453' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-11-27-CE

Author: vkolesny

app/code/Magento/Eav/Model/Entity/Attribute/UniqueValidator.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Eav\Model\Entity\Attribute;
 
@@ -23,8 +23,9 @@ public function validate(
         $entityLinkField,
         array $entityIds
     ) {
-        if (isset($entityIds[0])) {
-            return $entityIds[0] == $object->getData($entityLinkField);
+        if ($entityIds) {
+            // check for current and future updates
+            return in_array($object->getData($entityLinkField), $entityIds);
         }
         return true;
     }

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/UniqueValidatorTest.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Test\Unit\Model\Entity\Attribute;
+
+use PHPUnit\Framework\TestCase;
+use Magento\Eav\Model\Entity\Attribute\UniqueValidator;
+use Magento\Framework\DataObject;
+use Magento\Eav\Model\Entity\AbstractEntity;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+
+class UniqueValidatorTest extends TestCase
+{
+    /**
+     * @var UniqueValidator
+     */
+    private $uniqueValidator;
+
+    protected function setUp(): void
+    {
+        $this->uniqueValidator = new UniqueValidator();
+    }
+
+    public function testValidate()
+    {
+        $attribute = $this->createMock(AbstractAttribute::class);
+        $object = $this->createMock(DataObject::class);
+        $entity = $this->createMock(AbstractEntity::class);
+        $entityLinkField = 'entityLinkField';
+        $entityIds = [1, 2, 3];
+
+        $object->expects($this->once())
+            ->method('getData')
+            ->with($entityLinkField)
+            ->willReturn(2);
+
+        $this->assertTrue($this->uniqueValidator->validate($attribute, $object, $entity, $entityLinkField, $entityIds));
+    }
+}