Merge pull request #8611 from magento-l3/Tier4-PR-10-30-2023

Tier4 PR Delivery 10.30.23

Author: dhorytskyi

app/code/Magento/Bundle/Model/LinkManagement.php

@@ -235,6 +235,7 @@ private function processLinkedProduct(
         }
 
         $selectionModel = $this->bundleSelection->create();
+        $selectionModel->load($linkedProduct->getId());
         $selectionModel = $this->mapProductLinkToBundleSelectionModel(
             $selectionModel,
             $linkedProduct,

app/code/Magento/Bundle/Model/Selection.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Bundle\Model;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Bundle Selection Model
  *
@@ -36,8 +38,6 @@
 class Selection extends \Magento\Framework\Model\AbstractModel
 {
     /**
-     * Catalog data
-     *
      * @var \Magento\Catalog\Helper\Data
      */
     protected $_catalogData;
@@ -82,7 +82,9 @@ public function beforeSave()
     {
         if (!$this->_catalogData->isPriceGlobal() && $this->getWebsiteId()) {
             $this->setData('tmp_selection_price_value', $this->getSelectionPriceValue());
+            $this->setData('tmp_selection_price_type', $this->getSelectionPriceType());
             $this->setSelectionPriceValue($this->getOrigData('selection_price_value'));
+            $this->setSelectionPriceType($this->getOrigData('selection_price_type'));
         }
         parent::beforeSave();
     }
@@ -98,6 +100,9 @@ public function afterSave()
             if (null !== $this->getData('tmp_selection_price_value')) {
                 $this->setSelectionPriceValue($this->getData('tmp_selection_price_value'));
             }
+            if (null !== $this->getData('tmp_selection_price_type')) {
+                $this->setSelectionPriceType($this->getData('tmp_selection_price_type'));
+            }
             $this->getResource()->saveSelectionPrice($this);
 
             if (!$this->getDefaultPriceScope()) {

app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php

@@ -621,7 +621,7 @@ public function testAddChildCouldNotSave(): void
             ->method('create')
             ->willReturn($bundle);
 
-        $selection = $this->createPartialMock(Selection::class, ['save']);
+        $selection = $this->createPartialMock(Selection::class, ['save', 'load']);
         $selection->expects($this->once())->method('save')
             ->willReturnCallback(
                 static function () {
@@ -696,7 +696,7 @@ public function testAddChild(): void
             ->willReturn($selections);
         $this->bundleFactoryMock->expects($this->once())->method('create')->willReturn($bundle);
 
-        $selection = $this->createPartialMock(Selection::class, ['save', 'getId']);
+        $selection = $this->createPartialMock(Selection::class, ['save', 'getId', 'load']);
         $selection->expects($this->once())->method('save');
         $selection->expects($this->once())->method('getId')->willReturn(42);
         $this->bundleSelectionMock->expects($this->once())->method('create')->willReturn($selection);

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

@@ -10,12 +10,13 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertSeeProductDetailsOnStorefrontRecentlyViewedWidgetActionGroup">
         <annotations>
-            <description>Goes to the home Page Recently VIewed Product and Grab the Prdouct name and Position from it.</description>
+            <description>Goes to the home Page Recently Viewed Product and Grab the Product name and Position from it.</description>
         </annotations>
         <arguments>
             <argument name="productName" type="string"/>
             <argument name="productPosition" type="string"/>
         </arguments>
+        <waitForElementVisible selector="{{StoreFrontRecentlyViewedProductSection.ProductName(productPosition)}}" stepKey="waitForProductToShowAtPosition"/>
         <grabTextFrom selector="{{StoreFrontRecentlyViewedProductSection.ProductName(productPosition)}}" stepKey="grabRelatedProductPosition"/>
         <assertStringContainsString stepKey="assertRelatedProductName">
 			<actualResult type="const">$grabRelatedProductPosition</actualResult>

app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml

@@ -39,6 +39,7 @@ $mainImageData = $mainImage ?
         <?= $imageWidth ? 'width="'. $escaper->escapeHtmlAttr($imageWidth) .'"' : '' ?>
         <?= $imageHeight ? 'height="'. $escaper->escapeHtmlAttr($imageHeight) .'"' : '' ?>
     />
+    <link itemprop="image" href="<?= /* @noEscape */ $mainImageData ?>">
 </div>
 <?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
 <script type="text/x-magento-init">

app/code/Magento/Catalog/view/frontend/web/js/product/provider.js

@@ -98,17 +98,15 @@ define([
                 return;
             }
 
+            // Filter initial ids to remove "out of scope" and "outdated" data
+            this.ids(
+                this.filterIds(this.ids())
+            );
             this.initIdsListener();
             this.idsMerger(
                 this.idsStorage.get(),
                 this.prepareDataFromCustomerData(customerData.get(this.identifiersConfig.namespace)())
             );
-
-            if (!_.isEmpty(this.productStorage.data())) {
-                this.dataCollectionHandler(this.productStorage.data());
-            } else {
-                this.productStorage.setIds(this.data.currency, this.data.store, this.ids());
-            }
         },
 
         /**
@@ -176,7 +174,7 @@ define([
 
             if (!_.isEmpty(data)) {
                 this.ids(
-                    this.filterIds(_.extend(this.ids(), data))
+                    this.filterIds(_.extend(utils.copy(this.ids()), data))
                 );
             }
         },

app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js

@@ -149,7 +149,7 @@ define([
             if (data.items && ids.length) {
                 //we can extend only items
                 data = data.items;
-                this.data(_.extend(data, currentData));
+                this.data(_.extend(currentData, data));
             }
         },
 
@@ -271,13 +271,9 @@ define([
                 sentDataIds = _.keys(this.request.data);
                 currentDataIds = _.keys(ids);
 
-                _.each(currentDataIds, function (id) {
-                    if (_.lastIndexOf(sentDataIds, id) === -1) {
-                        return false;
-                    }
+                return _.every(currentDataIds, function (id) {
+                    return _.lastIndexOf(sentDataIds, id) !== -1;
                 });
-
-                return true;
             }
 
             return false;

app/code/Magento/Config/Model/Config/Backend/Email/Sender.php

@@ -30,6 +30,12 @@ public function beforeSave()
             );
         }
 
+        if (str_contains($value, ":")) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('The sender name "%1" is not valid. The colon character is not allowed.', $value)
+            );
+        }
+
         if (strlen($value) > 255) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Maximum sender name length is 255. Please correct your settings.')

app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php

@@ -51,6 +51,7 @@ public function beforeSaveDataProvider()
     {
         return [
             ['Mr. Real Name', 'Mr. Real Name'],
+            ['No colons:', false],
             [str_repeat('a', 256), false],
             [null, false],
             ['', false],

app/code/Magento/Config/i18n/en_US.csv

@@ -38,6 +38,7 @@ System,System
 "Sorry, the default display currency you selected is not available in allowed currencies.","Sorry, the default display currency you selected is not available in allowed currencies."
 "The ""%1"" email address is incorrect. Verify the email address and try again.","The ""%1"" email address is incorrect. Verify the email address and try again."
 "The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"The sender name ""%1"" is not valid. The colon character is not allowed.","The sender name ""%1"" is not valid. The colon character is not allowed."
 "Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
 "The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
 "The base directory to upload file is not specified.","The base directory to upload file is not specified."