Merge remote-tracking branch 'upstream/2.4.3-develop' into MC-40096-2

Author: hwyu@adobe.com

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php

@@ -64,11 +64,11 @@ public function build(Filter $filter): string
                 ->select()
                 ->from(
                     [Collection::MAIN_TABLE_ALIAS => $entityResourceModel->getEntityTable()],
-                    Collection::MAIN_TABLE_ALIAS . '.' . $entityResourceModel->getEntityIdField()
+                    Collection::MAIN_TABLE_ALIAS . '.' . $attribute->getEntityIdField()
                 )->joinLeft(
                     [$tableAlias => $attribute->getBackendTable()],
                     $tableAlias . '.' . $attribute->getEntityIdField() . '=' . Collection::MAIN_TABLE_ALIAS .
-                    '.' . $entityResourceModel->getEntityIdField() . ' AND ' . $tableAlias . '.' .
+                    '.' . $attribute->getEntityIdField() . ' AND ' . $tableAlias . '.' .
                     $attribute->getIdFieldName() . '=' . $attribute->getAttributeId(),
                     ''
                 )->where($tableAlias . '.value is null');

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertRelatedProductOnProductPageActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertRelatedProductOnProductPageActionGroup">
+        <annotations>
+            <description>Validates that the provided Product Name is present on Product details page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string" defaultValue="{{_defaultProduct.name}}"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" stepKey="waitForRelatedProductsList"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="{{productName}}" stepKey="seeRelatedProduct"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml

@@ -18,6 +18,8 @@
             <group value="Catalog"/>
         </annotations>
         <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProducts"/>
             <createData entity="ApiProductWithDescription" stepKey="product"/>
         </before>
         <after>

app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php

@@ -21,6 +21,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -110,7 +111,7 @@ protected function setUp(): void
         $this->groupManagementMock->expects($this->any())->method('getAllCustomersGroup')
             ->willReturn($group);
         $this->tierPriceExtensionFactoryMock = $this->getMockBuilder(ProductTierPriceExtensionFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->model = $this->objectManagerHelper->getObject(
@@ -182,9 +183,7 @@ function () {
             );
 
         // create sample TierPrice objects that would be coming from a REST call
-        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
-            ->setMethods(['getWebsiteId', 'setWebsiteId', 'getPercentageValue', 'setPercentageValue'])
-            ->getMockForAbstractClass();
+        $tierPriceExtensionMock = $this->getProductTierPriceExtensionInterfaceMock();
         $tierPriceExtensionMock->expects($this->any())->method('getWebsiteId')->willReturn($expectedWebsiteId);
         $tierPriceExtensionMock->expects($this->any())->method('getPercentageValue')->willReturn(null);
         $tp1 = $this->objectManagerHelper->getObject(TierPrice::class);
@@ -226,9 +225,7 @@ function () {
             $this->assertEquals($tps[$i]->getQty(), $tpData['price_qty'], 'Qty does not match');
         }
 
-        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
-            ->setMethods(['getWebsiteId', 'setWebsiteId', 'getPercentageValue', 'setPercentageValue'])
-            ->getMockForAbstractClass();
+        $tierPriceExtensionMock = $this->getProductTierPriceExtensionInterfaceMock();
         $tierPriceExtensionMock->expects($this->any())->method('getPercentageValue')->willReturn(50);
         $tierPriceExtensionMock->expects($this->any())->method('setWebsiteId');
         $this->tierPriceExtensionFactoryMock->expects($this->any())
@@ -289,14 +286,30 @@ function () {
                     return $this->objectManagerHelper->getObject(TierPrice::class);
                 }
             );
-        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
-            ->onlyMethods(['getPercentageValue', 'setPercentageValue'])
-            ->getMockForAbstractClass();
+        $tierPriceExtensionMock = $this->getProductTierPriceExtensionInterfaceMock();
         $tierPriceExtensionMock->method('getPercentageValue')
             ->willReturn(50);
         $this->tierPriceExtensionFactoryMock->method('create')
             ->willReturn($tierPriceExtensionMock);
 
         $this->assertInstanceOf(TierPrice::class, $this->model->getTierPrices($this->product)[0]);
     }
+
+    /**
+     * Build ProductTierPriceExtensionInterface mock.
+     *
+     * @return MockObject
+     */
+    private function getProductTierPriceExtensionInterfaceMock(): MockObject
+    {
+        $mockBuilder = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
+            ->disableOriginalConstructor();
+        try {
+            $mockBuilder->addMethods(['getPercentageValue', 'setPercentageValue', 'setWebsiteId', 'getWebsiteId']);
+        } catch (RuntimeException $e) {
+            // ProductTierPriceExtensionInterface already generated and has all necessary methods.
+        }
+
+        return $mockBuilder->getMock();
+    }
 }

app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml

@@ -39,7 +39,7 @@
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value="cataloginventory_stock"/>
+                <argument name="indices" value=""/>
             </actionGroup>
         </before>
         <after>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml

@@ -37,7 +37,7 @@
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value="cataloginventory_stock"/>
+                <argument name="indices" value=""/>
             </actionGroup>
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>

app/code/Magento/Csp/Helper/InlineUtil.php

@@ -9,6 +9,7 @@
 namespace Magento\Csp\Helper;
 
 use Magento\Csp\Api\InlineUtilInterface;
+use Magento\Csp\Model\Collector\ConfigCollector;
 use Magento\Csp\Model\Collector\DynamicCollector;
 use Magento\Csp\Model\Policy\FetchPolicy;
 use Magento\Framework\App\ObjectManager;
@@ -39,6 +40,11 @@ class InlineUtil implements InlineUtilInterface, SecurityProcessorInterface
      */
     private $htmlRenderer;
 
+    /**
+     * @var ConfigCollector
+     */
+    private $configCollector;
+
     private static $tagMeta = [
         'script' => ['id' => 'script-src', 'remote' => ['src'], 'hash' => true],
         'style' => ['id' => 'style-src', 'remote' => [], 'hash' => true],
@@ -60,15 +66,18 @@ class InlineUtil implements InlineUtilInterface, SecurityProcessorInterface
      * @param DynamicCollector $dynamicCollector
      * @param bool $useUnsafeHashes Use 'unsafe-hashes' policy (not supported by CSP v2).
      * @param HtmlRenderer|null $htmlRenderer
+     * @param ConfigCollector|null $configCollector
      */
     public function __construct(
         DynamicCollector $dynamicCollector,
         bool $useUnsafeHashes = false,
-        ?HtmlRenderer $htmlRenderer = null
+        ?HtmlRenderer $htmlRenderer = null,
+        ?ConfigCollector $configCollector = null
     ) {
         $this->dynamicCollector = $dynamicCollector;
         $this->useUnsafeHashes = $useUnsafeHashes;
         $this->htmlRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(HtmlRenderer::class);
+        $this->configCollector = $configCollector ?? ObjectManager::getInstance()->get(ConfigCollector::class);
     }
 
     /**
@@ -187,7 +196,10 @@ public function processTag(TagData $tagData): TagData
                     new FetchPolicy($policyId, false, $remotes)
                 );
             }
-            if ($tagData->getContent() && !empty(self::$tagMeta[$tagData->getTag()]['hash'])) {
+            if ($tagData->getContent()
+                && !empty(self::$tagMeta[$tagData->getTag()]['hash'])
+                && $this->isInlineDisabled(self::$tagMeta[$tagData->getTag()]['id'])
+            ) {
                 $this->dynamicCollector->add(
                     new FetchPolicy(
                         $policyId,
@@ -233,4 +245,21 @@ public function processEventHandler(EventHandlerData $eventHandlerData): EventHa
 
         return $eventHandlerData;
     }
+
+    /**
+     * Check if inline sources are prohibited.
+     *
+     * @param string $policyId
+     * @return bool
+     */
+    private function isInlineDisabled(string $policyId): bool
+    {
+        foreach ($this->configCollector->collect() as $policy) {
+            if ($policy->getId() === $policyId && $policy instanceof FetchPolicy) {
+                return !$policy->isInlineAllowed();
+            }
+        }
+
+        return false;
+    }
 }

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -198,6 +198,9 @@
         </array>
         <data key="state">California</data>
     </entity>
+    <entity name="US_With_Vat_Number" type="address" extends="US_Address_CA">
+        <data key="vat_id">U1234567891</data>
+    </entity>
     <entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
         <data key="default_billing">false</data>
         <data key="default_shipping">true</data>

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -233,6 +233,9 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
     </entity>
+    <entity name="Customer_With_Vat_Number" type="customer" extends="Simple_Customer_Without_Address">
+        <requiredEntity type="address">US_With_Vat_Number</requiredEntity>
+    </entity>
     <entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
         <data key="group_id">1</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>

app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js

@@ -17,7 +17,19 @@ define([
      */
     $.widget('mage.downloadable', {
         options: {
-            priceHolderSelector: '.price-box'
+            priceHolderSelector: '.price-box',
+            linkElement: '',
+            allElements: ''
+        },
+
+        /**
+         * @inheritdoc
+         */
+        _init: function initLinks() {
+            var element = this.element,
+                options = $(this.options.linkElement, element);
+
+            options.trigger('change');
         },
 
         /**