Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into ACQE-4268

Author: NeeloferAnsari

.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/AwsS3/Driver/AwsS3.php

@@ -893,16 +893,24 @@ public function fileClose($resource): bool
      */
     public function fileOpen($path, $mode)
     {
+        $_mode = str_replace(['b', '+'], '', strtolower($mode));
+        if (!in_array($_mode, ['r', 'w', 'a'], true)) {
+            throw new FileSystemException(new Phrase('Invalid file open mode "%1".', [$mode]));
+        }
         $path = $this->normalizeRelativePath($path, true);
 
         if (!isset($this->streams[$path])) {
             $this->streams[$path] = tmpfile();
             try {
                 if ($this->adapter->fileExists($path)) {
-                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
-                    fwrite($this->streams[$path], $this->adapter->read($path));
-                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
-                    rewind($this->streams[$path]);
+                    if ($_mode !== 'w') {
+                        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                        fwrite($this->streams[$path], $this->adapter->read($path));
+                        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                        if ($_mode !== 'a') {
+                            rewind($this->streams[$path]);
+                        }
+                    }
                 }
             } catch (FlysystemFilesystemException $e) {
                 $this->logger->error($e->getMessage());

app/code/Magento/AwsS3/Test/Mftf/test-dependency-allowlist

@@ -0,0 +1,99 @@
+AdminExportTaxRatesTest
+ImportProduct_Bundle
+ImportProductSimple1_Bundle
+ImportProductSimple2_Bundle
+ImportProductSimple3_Bundle
+CliCacheFlushActionGroup
+AdminFillImportFormActionGroup
+ImportProduct_Downloadable_FileLinks
+ImportProduct_Downloadable_UrlLinks
+ImportProduct_Grouped
+ImportProductSimple1_Grouped
+ImportProductSimple2_Grouped
+ImportProductSimple3_Grouped
+ImportProduct_Configurable
+ImportProductSimple1_Configurable
+ImportProductSimple2_Configurable
+ImportProductSimple3_Configurable
+placeholderBaseImage
+placeholderSmallImage
+placeholderThumbnailImage
+AdminImportTaxRatesTest
+AdminMediaGalleryFolderData
+AdminMediaGalleryFolder2Data
+ImageUpload
+AdminLoginActionGroup
+AdminOpenStandaloneMediaGalleryActionGroup
+ResetAdminDataGridToDefaultViewActionGroup
+AdminMediaGalleryFolderSelectActionGroup
+AdminMediaGalleryOpenNewFolderFormActionGroup
+AdminMediaGalleryCreateNewFolderActionGroup
+AdminEnhancedMediaGalleryUploadImageActionGroup
+AdminExpandMediaGalleryFolderActionGroup
+AdminMediaGalleryFolderDeleteActionGroup
+AdminLogoutActionGroup
+NavigateToCreatedCMSPageActionGroup
+AdminOpenMediaGalleryFromPageNoEditorActionGroup
+AdminMediaGalleryClickImageInGridActionGroup
+AdminMediaGalleryClickAddSelectedActionGroup
+AdminSaveAndContinueEditCmsPageActionGroup
+NavigateToStorefrontForCreatedPageActionGroup
+AdminMediaGalleryAssertFolderDoesNotExistActionGroup
+AdminEnhancedMediaGalleryImageDeleteActionGroup
+AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup
+StorefrontProductMediaSection
+RedPngImageContent
+BluePngImageContent
+MagentoPlaceHolderImageContent
+StorefrontOpenProductEntityPageActionGroup
+AdminGoToCacheManagementPageActionGroup
+AdminClickFlushCatalogImagesCacheActionGroup
+placeholderBaseImageLongName
+AdminAddImageForCategoryTest
+AdminAddImageToWYSIWYGBlockTest
+AdminAddImageToWYSIWYGCMSTest
+AdminAddImageToWYSIWYGNewsletterTest
+AdminAddRemoveDefaultVideoSimpleProductTest
+AdminProductFormSection
+AdminProductDownloadableSection
+downloadableData
+StorefrontProductInfoMainSection
+DownloadableProduct
+StorefrontDownloadableProductSection
+StorefrontDownloadableLinkSection
+CheckoutCartProductSection
+StorefrontCustomerDownloadableProductsSection
+downloadableLinkWithMaxDownloads
+downloadableLink
+downloadableSampleFile
+StorefrontCustomerLogoutActionGroup
+DeleteProductUsingProductGridActionGroup
+AdminOpenProductIndexPageActionGroup
+GoToSpecifiedCreateProductPageActionGroup
+FillMainProductFormNoWeightActionGroup
+AddDownloadableProductLinkWithMaxDownloadsActionGroup
+AddDownloadableProductLinkActionGroup
+AddDownloadableSampleFileActionGroup
+SaveProductFormActionGroup
+CliIndexerReindexActionGroup
+LoginToStorefrontActionGroup
+StorefrontCheckProductPriceInCategoryActionGroup
+AssertProductNameAndSkuInStorefrontProductPageActionGroup
+AssertStorefrontSeeElementActionGroup
+StorefrontAddProductToCartActionGroup
+StorefrontCartPageOpenActionGroup
+StorefrontOpenCheckoutPageActionGroup
+CheckoutSelectCheckMoneyOrderPaymentActionGroup
+ClickPlaceOrderActionGroup
+StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup
+AdminOpenOrderByEntityIdActionGroup
+StartCreateInvoiceFromOrderPageActionGroup
+SubmitInvoiceActionGroup
+StorefrontAssertDownloadableProductIsPresentInCustomerAccount
+AdminMarketingCreateSitemapEntityTest
+AdminMarketingSiteMapCreateNewTest
+CheckingRMAPrintTest
+ConfigurableProductChildImageShouldBeShownOnWishListTest
+StorefrontCaptchaOnCustomerLoginTest
+StorefrontPrintOrderGuestTest
+UpdateImageFileCustomerAttributeTest