Merge branch 'ACP2E-1358' of https://github.com/magento-l3/magento2ce into PR-L3-2023-01-31

Author: aplapana

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -1019,6 +1019,7 @@ public function load($object, $entityId, $attributes = [])
      * Loads attributes metadata.
      *
      * @deprecated 101.0.0 Use self::loadAttributesForObject instead
+     * @see \Magento\Eav\Model\Entity\AbstractEntity::loadAttributesForObject
      * @param array|null $attributes
      * @return $this
      * @since 100.1.0
@@ -1544,7 +1545,15 @@ protected function _insertAttribute($object, $attribute, $value)
      */
     protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
-        return $this->_saveAttribute($object, $attribute, $value);
+        $table = $attribute->getBackend()->getTable();
+        $connection = $this->getConnection();
+        $connection->update(
+            $table,
+            ['value' => $this->_prepareValueForSave($value, $attribute)],
+            sprintf('%s=%d', $connection->quoteIdentifier('value_id'), $valueId)
+        );
+
+        return $this;
     }
 
     /**
@@ -1926,6 +1935,7 @@ protected function _isAttributeValueEmpty(AbstractAttribute $attribute, $value)
      * @return AttributeLoaderInterface
      *
      * @deprecated 100.1.0
+     * @see $attributeLoader
      * @since 100.1.0
      */
     protected function getAttributeLoader()

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php

@@ -8,26 +8,30 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
-use Magento\Framework\Api\ExtensibleDataObjectConverter;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Api\SortOrderBuilder;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Model\Customer;
+use Magento\TestFramework\Fixture\Config as ConfigFixture;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 
 /**
  * Checks Customer insert, update, search with repository
@@ -244,6 +248,37 @@ public function testUpdateCustomer($defaultBilling, $defaultShipping)
         $this->assertNotContains('password_hash', array_keys($inAfterOnly));
     }
 
+    /**
+     * Test update customer custom attributes
+     *
+     * @magentoDataFixture Magento/Customer/_files/attribute_user_defined_custom_attribute.php
+     * @return void
+     */
+    #[
+        DataFixture(\Magento\Customer\Test\Fixture\Customer::class, ['email' => 'customer@mail.com'])
+    ]
+
+    public function testUpdateCustomerAttributesAutoIncrement()
+    {
+        $newAttributeValue = 'value1';
+        $updateAttributeValue = 'value2';
+        $customer = $this->customerRepository->get('customer@mail.com');
+        $customer->setCustomAttribute('custom_attribute1', $newAttributeValue);
+        $savedCustomer = $this->customerRepository->save($customer);
+        $savedCustomer->setCustomAttribute('custom_attribute1', $updateAttributeValue);
+        $this->customerRepository->save($savedCustomer);
+        $customer = $this->customerRepository->get('customer@mail.com');
+
+        $this->assertSame(
+            $customer->getCustomAttribute('custom_attribute1')->getValue(),
+            $updateAttributeValue
+        );
+        $resource = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $tableStatus = $connection->showTableStatus('customer_entity_varchar');
+        $this->assertSame($tableStatus['Auto_increment'], '2');
+    }
+
     /**
      * Test update customer address
      *