Merge branch '2.4-develop' into 2.4-develop-fast-lane-prs

Author: sidolov

app/code/Magento/AsynchronousOperations/Model/BulkManagement.php

@@ -104,14 +104,18 @@ public function __construct(
      */
     public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null)
     {
-        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
-        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
-        // save bulk summary and related operations
-        $connection->beginTransaction();
         $userType = $this->userContext->getUserType();
         if ($userType === null) {
             $userType = UserContextInterface::USER_TYPE_ADMIN;
         }
+        if ($userId === null && $userType === UserContextInterface::USER_TYPE_ADMIN) {
+            $userId = $this->userContext->getUserId();
+        }
+
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+        // save bulk summary and related operations
+        $connection->beginTransaction();
         try {
             /** @var BulkSummaryInterface $bulkSummary */
             $bulkSummary = $this->bulkSummaryFactory->create();

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global define*/
 /*global FORM_KEY*/
 define([
     'jquery',

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global define*/
 /*global FORM_KEY*/
 define([
     'jquery',

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js

@@ -5,7 +5,6 @@
 
 /*global FORM_KEY*/
 /*global bSelection*/
-/*global $H*/
 /**
  * @api
  */
@@ -186,7 +185,9 @@ define([
                                 });
                                 bSelection.gridRemoval.each(function (pair) {
                                     $optionBox.find('.col-sku').filter(function () {
-                                        return $(this).text().trim() === pair.key; // find row by SKU
+                                        let text = $(this).text();
+
+                                        return text.trim() === pair.key; // find row by SKU
                                     }).closest('tr').find('button.delete').trigger('click');
                                 });
                                 widget.refreshSortableElements();

app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global alert*/
 define([
     'jquery',
     'ko',

app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Model\Attribute;
 
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -15,7 +17,6 @@
 use Magento\Framework\App\ResourceConnection;
 
 /**
- * Class ScopeOverriddenValue
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ScopeOverriddenValue
@@ -76,7 +77,7 @@ public function __construct(
      * Whether attribute value is overridden in specific store
      *
      * @param string $entityType
-     * @param \Magento\Catalog\Model\AbstractModel $entity
+     * @param AbstractModel $entity
      * @param string $attributeCode
      * @param int|string $storeId
      * @return bool
@@ -86,39 +87,41 @@ public function containsValue($entityType, $entity, $attributeCode, $storeId)
         if ((int)$storeId === Store::DEFAULT_STORE_ID) {
             return false;
         }
-        if (!isset($this->attributesValues[$storeId])) {
+        $values = $this->getAttributesValues($entityType, $entity);
+
+        if (!isset($values[$storeId])) {
             $this->initAttributeValues($entityType, $entity, (int)$storeId);
+            $values = $this->getAttributesValues($entityType, $entity);
         }
 
-        return isset($this->attributesValues[$storeId])
-            && array_key_exists($attributeCode, $this->attributesValues[$storeId]);
+        return isset($values[$storeId]) && array_key_exists($attributeCode, $values[$storeId]);
     }
 
     /**
      * Get attribute default values
      *
      * @param string $entityType
-     * @param \Magento\Catalog\Model\AbstractModel $entity
+     * @param AbstractModel $entity
      * @return array
      *
      * @deprecated 101.0.0
      */
     public function getDefaultValues($entityType, $entity)
     {
-        if ($this->attributesValues === null) {
+        $values = $this->getAttributesValues($entityType, $entity);
+        if (!isset($values[Store::DEFAULT_STORE_ID])) {
             $this->initAttributeValues($entityType, $entity, (int)$entity->getStoreId());
+            $values = $this->getAttributesValues($entityType, $entity);
         }
 
-        return isset($this->attributesValues[Store::DEFAULT_STORE_ID])
-            ? $this->attributesValues[Store::DEFAULT_STORE_ID]
-            : [];
+        return $values[Store::DEFAULT_STORE_ID] ?? [];
     }
 
     /**
      * Init attribute values.
      *
      * @param string $entityType
-     * @param \Magento\Catalog\Model\AbstractModel $entity
+     * @param AbstractModel $entity
      * @param int $storeId
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
@@ -129,6 +132,7 @@ private function initAttributeValues($entityType, $entity, $storeId)
         /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
         $attributeTables = [];
         if ($metadata->getEavEntityType()) {
+            $entityId = $entity->getData($metadata->getLinkField());
             foreach ($this->getAttributes($entityType) as $attribute) {
                 if (!$attribute->isStatic()) {
                     $attributeTables[$attribute->getBackend()->getTable()][] = $attribute->getAttributeId();
@@ -147,7 +151,7 @@ private function initAttributeValues($entityType, $entity, $storeId)
                         'a.attribute_id = t.attribute_id',
                         ['attribute_code' => 'a.attribute_code']
                     )
-                    ->where($metadata->getLinkField() . ' = ?', $entity->getData($metadata->getLinkField()))
+                    ->where($metadata->getLinkField() . ' = ?', $entityId)
                     ->where('t.attribute_id IN (?)', $attributeCodes)
                     ->where('t.store_id IN (?)', $storeIds);
                 $selects[] = $select;
@@ -158,9 +162,12 @@ private function initAttributeValues($entityType, $entity, $storeId)
                 \Magento\Framework\DB\Select::SQL_UNION_ALL
             );
             $attributes = $metadata->getEntityConnection()->fetchAll((string)$unionSelect);
+            $values = array_fill_keys($storeIds, []);
             foreach ($attributes as $attribute) {
-                $this->attributesValues[$attribute['store_id']][$attribute['attribute_code']] = $attribute['value'];
+                $values[$attribute['store_id']][$attribute['attribute_code']] = $attribute['value'];
             }
+            $values += $this->getAttributesValues($entityType, $entity);
+            $this->setAttributesValues($entityType, $entity, $values);
         }
     }
 
@@ -187,4 +194,52 @@ private function getAttributes($entityType)
         );
         return $searchResult->getItems();
     }
+
+    /**
+     * Clear entity attributes values cache
+     *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @return void
+     * @throws \Exception
+     */
+    public function clearAttributesValues(string $entityType, DataObject $entity): void
+    {
+        if (isset($this->attributesValues[$entityType])) {
+            $metadata = $this->metadataPool->getMetadata($entityType);
+            $entityId = $entity->getData($metadata->getLinkField());
+            unset($this->attributesValues[$entityType][$entityId]);
+        }
+    }
+
+    /**
+     * Get entity attributes values from cache
+     *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @return array
+     * @throws \Exception
+     */
+    private function getAttributesValues(string $entityType, DataObject $entity): array
+    {
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $entityId = $entity->getData($metadata->getLinkField());
+        return $this->attributesValues[$entityType][$entityId] ?? [];
+    }
+
+    /**
+     * Set entity attributes values into cache
+     *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @param array $values
+     * @return void
+     * @throws \Exception
+     */
+    private function setAttributesValues(string $entityType, DataObject $entity, array $values): void
+    {
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $entityId = $entity->getData($metadata->getLinkField());
+        $this->attributesValues[$entityType][$entityId] = $values;
+    }
 }

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Framework\App\ObjectManager;
@@ -40,15 +42,11 @@ class Product extends AbstractResource
     protected $_productCategoryTable;
 
     /**
-     * Catalog category
-     *
      * @var Category
      */
     protected $_catalogCategory;
 
     /**
-     * Category collection factory
-     *
      * @var Category\CollectionFactory
      */
     protected $_categoryCollectionFactory;
@@ -105,6 +103,11 @@ class Product extends AbstractResource
      */
     private $mediaImageDeleteProcessor;
 
+    /**
+     * @var ScopeOverriddenValue
+     */
+    private $scopeOverriddenValue;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -120,6 +123,7 @@ class Product extends AbstractResource
      * @param UniqueValidationInterface|null $uniqueValidator
      * @param AttributeManagementInterface|null $eavAttributeManagement
      * @param MediaImageDeleteProcessor|null $mediaImageDeleteProcessor
+     * @param ScopeOverriddenValue|null $scopeOverriddenValue
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -136,7 +140,8 @@ public function __construct(
         TableMaintainer $tableMaintainer = null,
         UniqueValidationInterface $uniqueValidator = null,
         AttributeManagementInterface $eavAttributeManagement = null,
-        ?MediaImageDeleteProcessor $mediaImageDeleteProcessor = null
+        ?MediaImageDeleteProcessor $mediaImageDeleteProcessor = null,
+        ?ScopeOverriddenValue $scopeOverriddenValue = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
@@ -157,6 +162,8 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(AttributeManagementInterface::class);
         $this->mediaImageDeleteProcessor = $mediaImageDeleteProcessor
             ?? ObjectManager::getInstance()->get(MediaImageDeleteProcessor::class);
+        $this->scopeOverriddenValue = $scopeOverriddenValue
+            ?? ObjectManager::getInstance()->get(ScopeOverriddenValue::class);
     }
 
     /**
@@ -316,6 +323,7 @@ protected function _afterSave(DataObject $product)
     {
         $this->removeNotInSetAttributeValues($product);
         $this->_saveWebsiteIds($product)->_saveCategories($product);
+        $this->scopeOverriddenValue->clearAttributesValues(ProductInterface::class, $product);
         return parent::_afterSave($product);
     }
 

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -33,7 +33,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
     /**
      * Price type tier
      */
-    const PRICE_CODE = 'tier_price';
+    public const PRICE_CODE = 'tier_price';
 
     /**
      * @var Session
@@ -176,10 +176,13 @@ public function getTierPriceList()
                 function (&$priceData) {
                     /* convert string value to float */
                     $priceData['price_qty'] *= 1;
-                    if ($this->getConfigTaxDisplayType() === Config::DISPLAY_TYPE_BOTH) {
-                        $exclTaxPrice = $this->calculator->getAmount($priceData['price'], $this->product);
+                    $exclTaxPrice = $this->calculator->getAmount($priceData['price'], $this->product);
+                    if ($this->getConfigTaxDisplayType() === Config::DISPLAY_TYPE_EXCLUDING_TAX) {
                         $priceData['excl_tax_price'] = $exclTaxPrice;
                     }
+                    if ($this->getConfigTaxDisplayType() === Config::DISPLAY_TYPE_BOTH) {
+                        $priceData['incl_excl_tax_price'] = $exclTaxPrice;
+                    }
                     $priceData['price'] = $this->applyAdjustment($priceData['price']);
                 }
             );

app/code/Magento/Catalog/Test/Fixture/MultiselectAttribute.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Fixture;
+
+use Magento\Framework\DataObject;
+
+class MultiselectAttribute extends SelectAttribute
+{
+    private const DEFAULT_DATA = [
+        'frontend_input' => 'multiselect',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        $data = $this->prepareData($data);
+
+        return parent::apply($data);
+    }
+
+    /**
+     * Prepare attribute data
+     *
+     * @param array $data
+     * @return array
+     */
+    private function prepareData(array $data): array
+    {
+        $data = array_merge(self::DEFAULT_DATA, $data);
+
+        return $data;
+    }
+}