Merge remote-tracking branch 'origin/MC-30544' into 2.4-develop-pr11

Author: serhii-balko

app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 
 /**
@@ -14,6 +15,32 @@
  */
 class Action extends \Magento\Catalog\Model\ResourceModel\AbstractResource
 {
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @param \Magento\Eav\Model\Entity\Context $context
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Catalog\Model\Factory $modelFactory
+     * @param \Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface $uniqueValidator
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Eav\Model\Entity\Context $context,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Model\Factory $modelFactory,
+        \Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface $uniqueValidator,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        $data = []
+    ) {
+        parent::__construct($context, $storeManager, $modelFactory, $data, $uniqueValidator);
+
+        $this->dateTime = $dateTime;
+    }
+
     /**
      * Initialize connection
      *
@@ -43,6 +70,7 @@ public function updateAttributes($entityIds, $attrData, $storeId)
         $object = new \Magento\Framework\DataObject();
         $object->setStoreId($storeId);
 
+        $attrData[ProductInterface::UPDATED_AT] = $this->dateTime->gmtDate();
         $this->getConnection()->beginTransaction();
         try {
             foreach ($attrData as $attrCode => $value) {
@@ -95,7 +123,7 @@ protected function _saveAttributeValue($object, $attribute, $value)
          * for default store id
          * In this case we clear all not default values
          */
-        if ($this->_storeManager->hasSingleStore()) {
+        if ($this->_storeManager->hasSingleStore() && !$attribute->isStatic()) {
             $storeId = $this->getDefaultStoreId();
             $connection->delete(
                 $table,
@@ -107,17 +135,24 @@ protected function _saveAttributeValue($object, $attribute, $value)
             );
         }
 
-        $data = new \Magento\Framework\DataObject(
-            [
-                'attribute_id' => $attribute->getAttributeId(),
-                'store_id' => $storeId,
-                $this->getLinkField() => $entityId,
-                'value' => $this->_prepareValueForSave($value, $attribute),
-            ]
-        );
+        $data = $attribute->isStatic()
+            ? new \Magento\Framework\DataObject(
+                [
+                    $this->getLinkField() => $entityId,
+                    $attribute->getAttributeCode() => $this->_prepareValueForSave($value, $attribute),
+                ]
+            )
+            : new \Magento\Framework\DataObject(
+                [
+                    'attribute_id' => $attribute->getAttributeId(),
+                    'store_id' => $storeId,
+                    $this->getLinkField() => $entityId,
+                    'value' => $this->_prepareValueForSave($value, $attribute),
+                ]
+            );
         $bind = $this->_prepareDataForTable($data, $table);
 
-        if ($attribute->isScopeStore()) {
+        if ($attribute->isScopeStore() || $attribute->isStatic()) {
             /**
              * Update attribute value for store
              */
@@ -143,6 +178,8 @@ protected function _saveAttributeValue($object, $attribute, $value)
     }
 
     /**
+     * Resolve entity id
+     *
      * @param int $entityId
      * @return int
      */

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

@@ -1021,6 +1021,8 @@ public function load($object, $entityId, $attributes = [])
     protected function loadAttributesMetadata($attributes)
     {
         $this->loadAttributesForObject($attributes);
+
+        return $this;
     }
 
     /**
@@ -1433,8 +1435,10 @@ protected function _processSaveData($saveData)
         $insertEntity = true;
         $entityTable = $this->getEntityTable();
         $entityIdField = $this->getEntityIdField();
+        // phpstan:ignore "Undefined variable"
         $entityId = $newObject->getId();
 
+        // phpstan:ignore "Undefined variable"
         unset($entityRow[$entityIdField]);
         if (!empty($entityId) && is_numeric($entityId)) {
             $bind = ['entity_id' => $entityId];
@@ -1450,6 +1454,7 @@ protected function _processSaveData($saveData)
         /**
          * Process base row
          */
+        // phpstan:ignore "Undefined variable"
         $entityObject = new DataObject($entityRow);
         $entityRow = $this->_prepareDataForTable($entityObject, $entityTable);
         if ($insertEntity) {
@@ -1460,6 +1465,7 @@ protected function _processSaveData($saveData)
                 $connection->insert($entityTable, $entityRow);
                 $entityId = $connection->lastInsertId($entityTable);
             }
+            // phpstan:ignore "Undefined variable"
             $newObject->setId($entityId);
         } else {
             $where = sprintf('%s=%d', $connection->quoteIdentifier($entityIdField), $entityId);
@@ -1472,6 +1478,7 @@ protected function _processSaveData($saveData)
         if (!empty($insert)) {
             foreach ($insert as $attributeId => $value) {
                 $attribute = $this->getAttribute($attributeId);
+                // phpstan:ignore "Undefined variable"
                 $this->_insertAttribute($newObject, $attribute, $value);
             }
         }
@@ -1482,6 +1489,7 @@ protected function _processSaveData($saveData)
         if (!empty($update)) {
             foreach ($update as $attributeId => $v) {
                 $attribute = $this->getAttribute($attributeId);
+                // phpstan:ignore "Undefined variable"
                 $this->_updateAttribute($newObject, $attribute, $v['value_id'], $v['value']);
             }
         }
@@ -1491,12 +1499,14 @@ protected function _processSaveData($saveData)
          */
         if (!empty($delete)) {
             foreach ($delete as $table => $values) {
+                // phpstan:ignore "Undefined variable"
                 $this->_deleteAttributes($newObject, $table, $values);
             }
         }
 
         $this->_processAttributeValues();
 
+        // phpstan:ignore "Undefined variable"
         $newObject->isObjectNew(false);
 
         return $this;
@@ -1573,7 +1583,7 @@ protected function _processAttributeValues()
     {
         $connection = $this->getConnection();
         foreach ($this->_attributeValuesToSave as $table => $data) {
-            $connection->insertOnDuplicate($table, $data, ['value']);
+            $connection->insertOnDuplicate($table, $data, array_keys($data[0]));
         }
 
         foreach ($this->_attributeValuesToDelete as $table => $valueIds) {
@@ -1607,7 +1617,9 @@ protected function _prepareValueForSave($value, AbstractAttribute $attribute)
             self::$_attributeBackendTables[$backendTable] = $this->getConnection()->describeTable($backendTable);
         }
         $describe = self::$_attributeBackendTables[$backendTable];
-        return $this->getConnection()->prepareColumnValue($describe['value'], $value);
+        $columnName = $attribute->isStatic() ? $attribute->getAttributeCode() : 'value';
+
+        return $this->getConnection()->prepareColumnValue($describe[$columnName], $value);
     }
 
     /**