Merge branch '2.4-develop' into develop

Author: GrassH

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
 This contribution model has contributors maintaining their own fork of the Magento 2 repository.
-The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
+The forked repository is then used to submit a request to the base repository to "pull" a set of changes.
 For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
@@ -19,11 +19,11 @@ For more detailed information on contribution please read our [beginners guide](
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
-3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage
-* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
-4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
-5. All automated tests must pass.
+5. PRs which include new logic or new features must be submitted along with:
+   * Unit/integration test coverage
+   * Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
+6. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+7. All automated tests must pass.
 
 ## Contribution process
 

README.md

@@ -26,7 +26,7 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad
 
 ## Contribute
 
-Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
+Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://experienceleague.adobe.com/docs/commerce-admin/user-guides/home.html), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
 
 - [Contribute to the code](https://developer.adobe.com/commerce/contributor/guides/code-contributions/)
 - [Report an issue](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report)

app/code/Magento/Analytics/etc/config.xml

@@ -15,7 +15,7 @@
                 <otp>https://advancedreporting.rjmetrics.com/otp</otp>
                 <report>https://advancedreporting.rjmetrics.com/report</report>
                 <notify_data_changed>https://advancedreporting.rjmetrics.com/report</notify_data_changed>
-                <documentation>https://docs.magento.com/user-guide/reports/advanced-reporting.html</documentation>
+                <documentation>https://experienceleague.adobe.com/docs/commerce-admin/start/reporting/business-intelligence.html#advanced-reporting</documentation>
             </url>
             <integration_name>Magento Analytics user</integration_name>
             <general>

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -20,7 +20,7 @@ class Switcher extends \Magento\Backend\Block\Template
     /**
      * URL for store switcher hint
      */
-    public const HINT_URL = 'https://docs.magento.com/user-guide/configuration/scope.html';
+    public const HINT_URL = 'https://experienceleague.adobe.com/docs/commerce-admin/start/setup/websites-stores-views.html#scope-settings'; // @codingStandardsIgnoreLine
 
     /**
      * Name of website variable

app/code/Magento/Backup/README.md

@@ -4,7 +4,7 @@ The Magento_Backup module allows administrators to perform backups and rollbacks
 
 The Magento_Backup module does not affect the storefront.
 
-For more information about this module, see [Magento Backups](https://docs.magento.com/user-guide/system/backups.html)
+For more information about this module, see [Backups](https://experienceleague.adobe.com/docs/commerce-admin/systems/tools/backups.html)
 
 ## Extensibility
 

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/Helper/Product/View.php

@@ -130,14 +130,7 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
             $pageConfig->setKeywords($product->getName());
         }
 
-        $description = $product->getMetaDescription();
-        if ($description) {
-            $pageConfig->setDescription($description);
-        } else {
-            $productDescription = is_string($product->getDescription()) ?
-                $this->string->substr(strip_tags($product->getDescription()), 0, 255) : '';
-            $pageConfig->setDescription($productDescription);
-        }
+        $pageConfig->setDescription($product->getMetaDescription());
 
         if ($this->_catalogProduct->canUseCanonicalTag()) {
             $pageConfig->addRemotePageAsset(

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

@@ -20,8 +20,8 @@
         <click selector="{{AdminNewWidgetSection.selectCategory}}" stepKey="clickOnSelectCategory"/>
         <waitForPageLoad stepKey="waitForCategoryTreeLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandRootCategoryByName(DefaultCategory.name)}}" stepKey="clickToExpandDefaultCategory"/>
-        <waitForElementVisible selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="waitForCategoryVisible"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="selectCategory"/>
+        <waitForElementVisible selector="{{WidgetSection.CreateCategory(categoryName)}}" stepKey="waitForCategoryVisible"/>
+        <click selector="{{WidgetSection.CreateCategory(categoryName)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForWidgetPageLoaded"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>